变更为执行人关于托福赏金的判断,支持追加赏金操作

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -505,7 +505,12 @@ public class XmTaskExecuserController {
 			}
 
 			xmTaskService.updateSomeFieldByPk(xmTaskUpdate);
+			if("1".equals(xmTaskDb.getOshare()) && xmTaskDb.getShareFee()!=null && xmTaskDb.getShareFee().compareTo(BigDecimal.ZERO)>0){
+				 mkClient.pushAfterTaskAcceptanceSuccess(xmTaskDb.getExecutorUserid(),xmTaskDb.getExecutorUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());
+			}
 			if(needPay){
+				sysClient.pushPayAtAfterTaskAcceptanceSuccess(xmTaskDb.getExecutorUserid(),xmTaskDb.getId(),xmTaskDb.getQuoteFinalAt());
+
 				notifyMsgService.pushMsg(user, xmTaskDb.getExecutorUserid(), xmTaskDb.getExecutorUsername(), "2", xmTaskDb.getProjectId(), xmTaskDb.getId(), "您执行的任务【" + xmTaskDb.getName() + "】已验收通过，已发放佣金【"+xmTaskDb.getEfunds()+"】。");
 				xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-验收任务", "验收任务【"+xmTaskDb.getName()+"】，验收通过。已发放佣金【"+xmTaskDb.getEfunds()+"】元");
 			}else{

xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java

@@ -8,12 +8,14 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskExecuser;
+import com.xm.core.service.client.MkClient;
 import com.xm.core.service.push.XmPushMsgService;
 import com.xm.core.vo.XmGroupVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -44,6 +46,10 @@ public class XmTaskExecuserService extends BaseService {
 	PushNotifyMsgService notifyMsgService;
 
 
+	@Autowired
+	MkClient mkClient;
+
+
 	/**
 	 *
 	 * @param xmTaskExecuser
@@ -192,6 +198,10 @@ public class XmTaskExecuserService extends BaseService {
 			notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), "2", xmTaskDb.getProjectId(), xmTaskExecuser.getTaskId(), "恭喜您被雇主选为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskDb.getName() + "】的中标人,请尽快开展工作。");
 
 			updateXmTaskExeUseridsAndUsernamesByTaskId(taskId);
+			if("1".equals(xmTaskDb.getOshare()) && xmTaskDb.getShareFee()!=null && xmTaskDb.getShareFee().compareTo(BigDecimal.ZERO)>0){
+				mkClient.pushAfterTaskExecSuccess(xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());
+			}
+
  		xmRecordService.addXmTaskRecord(projectId, taskId, "项目-任务-变更为执行人", xmTaskExecuser.getUsername()+"变更为任务执行人",null,null);
 	}
 

xm-core/src/main/java/com/xm/core/service/client/MkClient.java

@@ -9,6 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+
+import static com.mdp.core.utils.BaseUtils.map;
+
 @Service
 /**
  * 对mk接口调用
@@ -30,4 +34,27 @@ public class MkClient {
          return tips;
     }
 
+    /**
+     * 任务验收后，推送任务金额到mk用于计算分享赚佣金
+     * @return
+     */
+    public Tips pushAfterTaskAcceptanceSuccess(String userid, String username, String projectId, String taskId, BigDecimal shareFee){
+        Tips tips = new Tips("推送订单成功");
+        push.leftPush("xm_task_acceptance_success_for_person_share_earn",map("userid",userid  ,"username",username  ,"projectId",projectId  ,"taskId",taskId,"shareFee",shareFee));
+        // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
+        return tips;
+    }
+    /**
+     * 任务中标后，推送任务金额到mk用于计算分享赚佣金
+     * @return
+     */
+    public Tips pushAfterTaskExecSuccess(String userid, String username, String projectId, String taskId, BigDecimal shareFee){
+        Tips tips = new Tips("推送订单成功");
+        push.leftPush("xm_task_exec_for_person_share_earn",map("userid",userid  ,"username",username  ,"projectId",projectId  ,"taskId",taskId,"shareFee",shareFee));
+        // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
+        return tips;
+    }
+
+
+
 }

xm-core/src/main/java/com/xm/core/service/client/SysClient.java

@@ -99,4 +99,15 @@ public class SysClient {
         // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
         return tips;
     }
+
+    /**
+     * 任务验收后，推送任务金额到sys
+     * @return
+     */
+    public Tips pushPayAtAfterTaskAcceptanceSuccess(String userid,String taskId,BigDecimal at){
+        Tips tips = new Tips("推送订单成功");
+        push.leftPush("xm_task_acceptance_success_for_person",map("userid",userid  ,"taskId",taskId,"at",at));
+        // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
+        return tips;
+    }
 }