推送消息改成队列方式推送结算的任务订单

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

@@ -469,7 +469,7 @@ public class XmTaskExecuserService extends BaseService {
 					// 需要调用财务系统进行记账结算到用户的结算账户中。用户可以通过该账户提现取现金
 					cashOperateServie.shopBalancePayToClient(bizExecuser.getBranchId(),"platform",bizExecuser.getId(),bizExecuser.getSettleAmount(),bizExecuser.getTaskName()+"结算费用给执行人",bizExecuser.getUserid(),bizExecuser.getBranchId());
 					// 需要调用营销系统，计算佣金
-					mkClient.pushActiExecOrder(bizExecuser.getTaskId(), bizExecuser.getUserid(), bizExecuser.getBranchId(),bizExecuser.getTaskId(),new BigDecimal(1),bizExecuser.getSettleAmount(),bizExecuser.getSettleAmount(),bizExecuser.getSettleWorkload());
+					mkClient.pushActiExecOrder(bizExecuser.getTaskId(), bizExecuser.getUserid(), bizExecuser.getUsername(),bizExecuser.getBranchId(),bizExecuser.getTaskId(),new BigDecimal(1),bizExecuser.getSettleAmount(),bizExecuser.getSettleAmount(),bizExecuser.getSettleWorkload(),bizExecuser.getTaskName());
 					flowVars.put("settleStatus","6");
 					flowVars.put("status","6");
 					this.updateFlowStateByProcInst("2", flowVars); 

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

@@ -31,16 +31,21 @@ public class MkClient {
      * 		execOrder.setCustBranchId("platform-branch-001");
      * @return
      */
-    public Tips pushActiExecOrder(String orderId,String custId,String custBranchId, String entityId,BigDecimal actNum,BigDecimal actSinglePrice,BigDecimal totalPrice,BigDecimal workload){
+    public Tips pushActiExecOrder(String orderId,String custId,String custName,String custBranchId, String entityId,BigDecimal actNum,BigDecimal actSinglePrice,BigDecimal totalPrice,BigDecimal workload,String entityDesc){
         Tips tips = new Tips("推送订单成功");
         Map<String,Object> params=new HashMap<>();
         params.put("orderId",orderId);
+        params.put("entityType","2");
         params.put("custId",custId);
+        params.put("custName",custName);
+        params.put("custBranchId",custBranchId);
+        params.put("orderBranchId",custBranchId);
         params.put("entityId",entityId);
         params.put("actNum",actNum);
         params.put("actSinglePrice",actSinglePrice);
         params.put("totalPrice",totalPrice);
         params.put("workload",workload);
+        params.put("entityDesc",entityDesc);
         strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
         return tips;
     }