From dc9e80d1933ae7514d12b3e85001d147e2b08bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 26 Apr 2022 18:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/service/XmTaskSbillService.java   | 25 ++++-----------
 .../com/xm/core/service/client/MkClient.java  | 31 +++----------------
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
index b5aa1249..81735879 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
@@ -1,28 +1,21 @@
 package com.xm.core.service;
 
-import com.mdp.core.utils.BaseUtils;
 import com.mdp.core.utils.DateUtils;
-import com.mdp.core.utils.NumberUtil;
 import com.xm.core.entity.XmTaskSbillDetail;
-import com.xm.core.entity.XmTaskWorkload;
 import com.xm.core.service.client.MkClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mdp.core.service.BaseService;
-import static com.mdp.core.utils.BaseUtils.*;
-import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 
 import com.xm.core.entity.XmTaskSbill;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
@@ -106,20 +99,14 @@ public class XmTaskSbillService extends BaseService {
 	}
 
 	private void pushWorkloadToMk(XmTaskSbill xmTaskSbill) {
-		List<Map<String,Object>> taskWorkloads=this.xmTaskWorkloadService.listTaskWorkloadBySbillIdGroupByUseridAndTaskId(xmTaskSbill.getId());
-		if(taskWorkloads==null || taskWorkloads.size()==0){
+		XmTaskSbillDetail detailQ=new XmTaskSbillDetail();
+		detailQ.setSbillId(xmTaskSbill.getId());
+		List<XmTaskSbillDetail> detailsDb=this.xmTaskSbillDetailService.selectListByWhere(detailQ);
+		if(detailsDb!=null && detailsDb.size()>0){
 			return;
 		}
-		for (Map<String, Object> t : taskWorkloads) {
-			String taskId= (String) t.get("taskId");
-			String taskName= (String) t.get("taskName");
-			String userid= (String) t.get("userid");
-			String username= (String) t.get("username");
-			String custBranchId="";
-			BigDecimal actNum=BigDecimal.valueOf(1);
-			BigDecimal sigPrice= NumberUtil.getBigDecimal(t.get("samt"));
-			BigDecimal workload=NumberUtil.getBigDecimal(t.get("sworkload"));
-			mkClient.pushActiExecOrder(taskId,userid,username,custBranchId,xmTaskSbill.getBranchId(),taskId, actNum,sigPrice,actNum.multiply(sigPrice),workload,taskName);
+		for (XmTaskSbillDetail t : detailsDb) {
+			mkClient.pushSbillDetail(t);
 		}
 	}
 
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 f21ad168..ef651120 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
@@ -5,6 +5,7 @@ import com.mdp.core.entity.Tips;
 import com.mdp.core.utils.BaseUtils;
 import com.mdp.micro.client.CallBizService;
 import com.mdp.mq.queue.Push;
+import com.xm.core.entity.XmTaskSbillDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -30,34 +31,10 @@ public class MkClient {
     @Autowired
     Push push;
 
-    /**
-     * 		execOrder.setOrderId(sequence.getReqFlowNo());
-     * 		execOrder.setActNum(new BigDecimal("1"));
-     * 		execOrder.setEntityId(entityId);
-     * 		execOrder.setCustId(receiverId);
-     * 		execOrder.setActSinglePrice(new BigDecimal("10.22"));
-     * 		execOrder.setTotalPrice(new BigDecimal("10.22"));
-     * 		execOrder.setCustBranchId("platform-branch-001");
-     * @return
-     */
-    public Tips pushActiExecOrder(String orderId,String custId,String custName,String custBranchId,String orderBranchId, String entityId,BigDecimal actNum,BigDecimal actSinglePrice,BigDecimal totalPrice,BigDecimal workload,String entityDesc){
+    public Tips pushSbillDetail(XmTaskSbillDetail detail){
         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",orderBranchId);
-        params.put("entityId",entityId);
-        params.put("actNum",actNum);
-        params.put("actSinglePrice",actSinglePrice);
-        params.put("totalPrice",totalPrice);
-        params.put("workload",workload);
-        params.put("entityDesc",entityDesc);
-        push.leftPush("xm_task_settle",params);
-       // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
-        return tips;
+        push.leftPush("xm_task_settle",BaseUtils.toMap(detail));
+         return tips;
     }
 
     /**