需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -621,8 +621,8 @@ public class BigLogic {
 
                 DateTime endDay = DateUtil.endOfDay(startDay);
 
-                Integer integer = pgOrderBases.stream().filter(item -> item.getCreateTime().before(endDay)
-                        && item.getCreateTime().after(startDay) && status.contains(item.getOrderStatus())
+                Integer integer = pgOrderBases.stream().filter(item -> item.getOverTime().before(endDay)
+                        && item.getOverTime().after(startDay) && status.contains(item.getOrderStatus())
                         && item.getOrderSmallTypeText().equals(largeWorkerOrderDateBean.getLx())
                 )
                         .map(PgOrderBase::getTotalNum).reduce(Integer::sum).orElse(0);

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -660,7 +660,7 @@ public class WechatLogic {
         //开始分账
         try {
             profitSettlementSharing(settlementOrder.getOrderId(), settlementOrder.getTranscationId(), map, mapPhone,
-                    settlementOrder.getCompanyWechatId(), "B", settlementOrder.getConfigId());
+                    settlementOrder.getCompanyWechatId(), "B", settlementOrder.getConfigId(),settlementOrder.getWorkerOrderId());
 
             settlementOrder.setStatus(SettlementStatusNewEnum.OK.toString());
             settlementOrder.setSettlementTime(new Date());
@@ -701,7 +701,7 @@ public class WechatLogic {
         //开始分账
         try {
             profitSettlementSharing(settlementOrder.getOrderId(), settlementOrder.getTranscationId(), map, mapPhone,
-                    settlementOrder.getCompanyWechatId(), "B", settlementOrder.getConfigId());
+                    settlementOrder.getCompanyWechatId(), "B", settlementOrder.getConfigId(),settlementOrder.getWorkerOrderId());
 
             settlementOrder.setStatus(SettlementStatusNewEnum.OK.toString());
             settlementOrder.setSettlementTime(new Date());
@@ -729,7 +729,7 @@ public class WechatLogic {
      * @throws WxPayException
      */
     private void profitSettlementSharing(String orderSharingId, String transactionId, Map<String, BigDecimal> amountMap,
-                                         Map<String, String> phoneMap, String companyWechatId, String source, String config) throws WxPayException {
+                                         Map<String, String> phoneMap, String companyWechatId, String source, String config,String workerOrdderId) throws WxPayException {
 
         List<Map<String, Object>> list = new ArrayList<>();
 
@@ -742,11 +742,15 @@ public class WechatLogic {
             if (shareAmount.doubleValue() == 0) {
                 continue;
             }
+
+
+            String str = StringUtil.isEmpty(workerOrdderId)?"":"，工单号："+workerOrdderId;
+
             Map<String, Object> receiver = new HashMap<>();
             receiver.put("type", "PERSONAL_SUB_OPENID");
             receiver.put("account", openId);
             receiver.put("amount", ProfitSharingReceiverRequest.yuanToFen(shareAmount.toString()));
-            receiver.put("description", "辅材配件款"  + "：" + shareAmount + "元");
+            receiver.put("description", "辅材配件款"  + "：" + shareAmount + "元"+str);
             list.add(receiver);
         }