From 7faba3df844da278738d43d338a28d7e48b9611d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 10 Jun 2021 23:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E6=94=B9?= =?UTF-8?q?=E6=88=90=E9=98=9F=E5=88=97=E6=96=B9=E5=BC=8F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=9A=84=E4=BB=BB=E5=8A=A1=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/service/XmTaskExecuserService.java | 2 +- .../src/main/java/com/xm/core/service/client/MkClient.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index 192cff87..c8c3b5f5 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/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); diff --git a/xm-core/src/main/java/com/xm/core/service/client/MkClient.java b/xm-core/src/main/java/com/xm/core/service/client/MkClient.java index e3d272e7..727f3036 100644 --- a/xm-core/src/main/java/com/xm/core/service/client/MkClient.java +++ b/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 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; }