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

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

@@ -15,6 +15,7 @@ import com.xm.core.entity.XmProject;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskExecuser;
 import com.xm.core.service.*;
+import com.xm.core.service.client.AcClient;
 import com.xm.core.service.client.MkClient;
 import com.xm.core.service.client.SysClient;
 import com.xm.core.vo.XmGroupVo;
@@ -23,6 +24,7 @@ import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -73,9 +75,15 @@ public class XmTaskExecuserController {
 	@Autowired
 	MkClient mkClient;
 
+	@Autowired
+	AcClient acClient;
+
 	@Autowired
 	SysClient sysClient;
 
+	@Value(value = "${mdp.platform-branch-id:platform-branch-001}")
+	String platformBranchId;
+	
 
 	@Autowired
     XmGroupService groupService;
@@ -528,10 +536,15 @@ public class XmTaskExecuserController {
 			xmTaskUpdate.setId(xmTask.getId());
 			xmTaskUpdate.setTaskState("4");
 			if(needPay){
+				XmTaskExecuser xmTaskExecuserDb=this.xmTaskExecuserService.selectOneById(map("taskId",xmTask.getId(),"userid",xmTask.getExecutorUserid()));
+				acClient.shopBalancePayToClient("plaftform-branch-001","platfrom",
+						xmTask.getId(),xmTask.getQuoteFinalAt(),"任务【"+xmTask.getName()+"】验收完毕，发放佣金.",xmTask.getExecutorUserid(),xmTaskExecuserDb.getExecUserBranchId());
 				//调用ac系统付款给服务商
 				xmTaskUpdate.setEtoDevTime(new Date());
 				xmTaskUpdate.setBidStep("7");
 				xmTaskUpdate.setEstate("3");
+				acClient.shopBalancePayToClient(platformBranchId,"platform",xmTask.getId(),xmTask.getEfunds(),
+						"任务【"+xmTask.getName()+"】验收完毕，发放佣金.",xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getExecUserBranchId());
 			}
 
 			xmTaskService.updateSomeFieldByPk(xmTaskUpdate);

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

@@ -5,6 +5,7 @@ import com.mdp.core.service.BaseService;
 import com.mdp.msg.client.PushNotifyMsgService;
 import com.xm.core.entity.XmTask;
 import com.xm.core.entity.XmTaskOrder;
+import com.xm.core.service.client.AcClient;
 import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +40,11 @@ public class XmTaskOrderService extends BaseService {
 	XmRecordService xmRecordService;
 
 
+
+	@Autowired
+	AcClient acClient;
+
+
 	@Transactional
 	public void orderPaySuccess(String orderId, String payId, String prepayId, String tranId, BigDecimal payAt, String remarks) {
 		//更新订单状态
@@ -114,9 +120,13 @@ public class XmTaskOrderService extends BaseService {
 		this.xmTaskService.updateSomeFieldByPkAfterPaySuccess(xmTaskUpdate);
 		if("1".equals(taskOrderDb.getBizType()) && "5".equals(xmTaskUpdate.getBidStep())){
 			XmTask xmTaskDb=this.xmTaskService.selectOneById(taskOrderDb.getTaskId());
+			acClient.platformRecharge(xmTaskDb.getCreateUserid(),xmTaskUpdate.getEfunds(),xmTaskDb.getId(),"任务【"+xmTaskDb.getName()+"】，成功托管佣金【"+taskOrderDb.getEfunds()+"】，实际到账金额【"+payAt+"】");
+
 			msgService.pushMsg(taskOrderDb.getObranchId(),taskOrderDb.getOuserid(),xmTaskDb.getExecutorUserid(),"2",xmTaskDb.getProjectId(),xmTaskDb.getId(),"雇主成功托管佣金【"+taskOrderDb.getEfunds()+"】，实际到账金额【"+payAt+"】，当前任务进入用户工作阶段，请尽快开展工作。");
 			xmRecordService.addXmTaskRecord(taskOrderDb.getProjectId(),taskOrderDb.getTaskId(),"托管佣金","成功托管佣金【"+taskOrderDb.getEfunds()+"】，实际到账金额【"+payAt+"】");
 		}else{
+			acClient.platformRecharge(taskOrderDb.getOuserid(),payAt,taskOrderDb.getTaskId(),"成功缴纳活动费用金额【"+taskOrderDb.getFinalFee()+"】，实际到账金额【"+payAt+"】。参加的活动为【"+marketNames.stream().collect(Collectors.joining(","))+"】");
+
 			xmRecordService.addXmTaskRecord(taskOrderDb.getProjectId(),taskOrderDb.getTaskId(),"营销活动","成功缴纳活动费用金额【"+taskOrderDb.getFinalFee()+"】，实际到账金额【"+payAt+"】。参加的活动为【"+marketNames.stream().collect(Collectors.joining(","))+"】");
 		}
 	}