From d8196e0e90bfd93f38b78644550ec1c36de1efe2 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 15:14:14 +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/ctrl/XmQuestionController.java | 2 +- .../com/xm/core/service/XmTaskExecuserService.java | 2 +- .../java/com/xm/core/service/client/MkClient.java | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index fb9df81e..5f77457e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -121,7 +121,7 @@ public class XmQuestionController { Tips tips=new Tips("成功新增一条数据"); try{ User user=LoginUtils.getCurrentUserInfo(); - if(StringUtils.hasText(xmQuestionVo.getQtype())){ + if(!StringUtils.hasText(xmQuestionVo.getQtype())){ xmQuestionVo.setQtype("bug"); } xmQuestionService.addQuestion(xmQuestionVo); 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 032043d8..192cff87 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()); + mkClient.pushActiExecOrder(bizExecuser.getTaskId(), bizExecuser.getUserid(), bizExecuser.getBranchId(),bizExecuser.getTaskId(),new BigDecimal(1),bizExecuser.getSettleAmount(),bizExecuser.getSettleAmount(),bizExecuser.getSettleWorkload()); 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 9dd44499..e3d272e7 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 @@ -1,9 +1,11 @@ package com.xm.core.service.client; +import com.alibaba.fastjson.JSON; import com.mdp.core.entity.Tips; import com.mdp.core.utils.BaseUtils; import com.mdp.micro.client.CallBizService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -17,7 +19,7 @@ import java.util.Map; public class MkClient { @Autowired - CallBizService callBizService; + StringRedisTemplate strRedisTemplate; /** * execOrder.setOrderId(sequence.getReqFlowNo()); @@ -29,9 +31,8 @@ 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){ + public Tips pushActiExecOrder(String orderId,String custId,String custBranchId, String entityId,BigDecimal actNum,BigDecimal actSinglePrice,BigDecimal totalPrice,BigDecimal workload){ Tips tips = new Tips("推送订单成功"); - String restUrl="/mk/mk/acti/execOrder/add"; Map params=new HashMap<>(); params.put("orderId",orderId); params.put("custId",custId); @@ -39,8 +40,8 @@ public class MkClient { params.put("actNum",actNum); params.put("actSinglePrice",actSinglePrice); params.put("totalPrice",totalPrice); - Map resultMap=callBizService.postForMap(restUrl,params); - tips= BaseUtils.mapToTips(resultMap); + params.put("workload",workload); + strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params)); return tips; } }