Merge branch 'v17.5_order_child_sync_broker_20240617' into test

performance-web/src/main/java/com/clx/performance/model/settle/SettlementPlatformServiceFee.java

@@ -28,8 +28,9 @@ public class SettlementPlatformServiceFee implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;                             //id
     private String childNo;                         //运单编号
-    private Long driverUserNo;                      //车主用户编号
-    private String driverName;                      //车主名称
+    private Long driverUserNo;                      //司机用户编号
+    private String driverName;                      //司机名称
+    private String driverMobile;                      //司机手机号
     private Integer sendAddressId;                  //发货地址id
     private String sendAddress;                     //发货地址
     private Integer receiveAddressId;               //收货地址id

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2008,7 +2008,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (result != null && Objects.equals(result.getCode(), 0) && result.getData() != null) {
             WalletResidueCardDTO data = result.getData();
             //钱包不能为负
-            if (Objects.isNull(data.getResidue()) || data.getResidue() < 0L) {
+            if(Objects.isNull(data.getResidue())){
+                String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足";
+                throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark);
+            }
+            //目前支付返回的是元  所以乘以100
+            data.setResidue(data.getResidue()*100);
+            if (data.getResidue() < 0L) {
                 String remark = truckOwnerFlag ? "钱包余额不足" : "车主钱包余额不足";
                 throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_ERROR, remark);
             }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -206,6 +206,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementPlatformServiceFee.setChildNo(settlementDriverDetail.getChildNo());
         settlementPlatformServiceFee.setDriverUserNo(settlementDriverDetail.getDriverUserNo());
         settlementPlatformServiceFee.setDriverName(settlementDriverDetail.getDriverName());
+        settlementPlatformServiceFee.setDriverMobile(orderChild.getDriverMobile());
         settlementPlatformServiceFee.setSendAddressId(orderChild.getSendAddressId());
         settlementPlatformServiceFee.setSendAddress(orderChild.getSendAddress());
         settlementPlatformServiceFee.setReceiveAddressId(orderChild.getReceiveAddressId());