Merge remote-tracking branch 'origin/main' into main

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderRepositoryServiceImpl.java

@@ -235,6 +235,8 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
         LambdaUpdateWrapper<TradeOrderDO> orderUpdateWrapper = new LambdaUpdateWrapper<TradeOrderDO>()
                 .set(TradeOrderDO::getOrderStatus, tradeOrderDO.getOrderStatus())
                 .set(TradeOrderDO::getPaymentDate, tradeOrderDO.getPaymentDate())
+                .set(TradeOrderDO::getPayStatus, tradeOrderDO.getPayStatus())
+                .set(TradeOrderDO::getRealPayAmount, tradeOrderDO.getRealPayAmount())
                 .eq(TradeOrderDO::getId, tradeOrderDO.getId());
         tradeOrderMapper.update(orderUpdateWrapper);
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -539,6 +539,16 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             tradeOrderDO.setConfirmDate(oldtradeOrderDO.getConfirmDate());
             tradeOrderDO.setCreator(oldtradeOrderDO.getCreator());
             tradeOrderDO.setCreateTime(oldtradeOrderDO.getCreateTime());
+            tradeOrderDO.setRealPayAmount(oldtradeOrderDO.getRealPayAmount());
+            tradeOrderDO.setPayStatus(oldtradeOrderDO.getPayStatus());
+            tradeOrderDO.setDeposi(oldtradeOrderDO.getDeposi());
+            tradeOrderDO.setDeposiPayTime(oldtradeOrderDO.getDeposiPayTime());
+            tradeOrderDO.setDeposiStatus(oldtradeOrderDO.getDeposiStatus());
+            tradeOrderDO.setFreeAmount(oldtradeOrderDO.getFreeAmount());
+            tradeOrderDO.setOrderStatus(oldtradeOrderDO.getOrderSort());
+            tradeOrderDO.setDiscountId(oldtradeOrderDO.getDiscountId());
+            tradeOrderDO.setIsInsure(oldtradeOrderDO.getIsInsure());
+            tradeOrderDO.setPaymentDate(oldtradeOrderDO.getPaymentDate());
         }else{
             tradeOrderDO.setStoreId(orderCreateReqDTO.getOrderProperty().getStoreId());
             tradeOrderDO.setStoreName(orderCreateReqDTO.getOrderProperty().getStoreName());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pay/impl/TradeOrderPayServiceImpl.java

@@ -814,6 +814,8 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
         //支付时间暂时用当前
         tradeOrderDO.setPaymentDate(LocalDateTime.now());
         tradeOrderDO.setPayStatus(PaymentStatusEnum.PAID.getStatus());
+        BigDecimal realPayAmount = tradeOrderDO.getRealPayAmount()==null?BigDecimal.ZERO:tradeOrderDO.getRealPayAmount();
+        tradeOrderDO.setRealPayAmount(realPayAmount.add(tradeOrderPayDO.getPayAmount()));
         tradeOrderRepositoryService.updateOrderAfterAllPay(tradeOrderDO);
         //保存订单日志
         TradeOrderLogUtils.setOrderInfo(tradeOrderDO.getId(), orderStatus, tradeOrderDO.getOrderStatus(), MapUtil.<String, Object>builder().put("payType", PayTypeEnum.valueOf(tradeOrderPayDO.getPaymentType()).getName()).put("payAmount", tradeOrderPayDO.getPayAmount()).build());

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/smsSendconfig/MessageSendMapper.xml

@@ -19,7 +19,7 @@
         t77.NAME shipName,
         t67.NAME routeName,
         t1.order_no,
-        t1.seller_id,
+        (select u.id  from system_users u where u.distributor_id = t1.source_id  limit  1) seller_id,
         t2.use_date,
         count( DISTINCT t2.id ) num,
         t1.source_name,
@@ -53,7 +53,7 @@
         t77.NAME shipName,
         t67.NAME routeName,
         t1.order_no,
-        t1.seller_id,
+        (select u.id  from system_users u where u.distributor_id = t1.source_id  limit  1) seller_id,
         t2.use_date,
         count( DISTINCT t2.id ) num,
         t1.source_name,
@@ -88,7 +88,7 @@
         t77.NAME shipName,
         t67.NAME routeName,
         t1.order_no,
-        t1.seller_id,
+        (select u.id  from system_users u where u.distributor_id = t1.source_id  limit  1) seller_id,
         t2.use_date,
         count( DISTINCT t2.id ) num,
         t1.source_name,