Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-web/src/main/java/com/clx/performance/extranal/broker/BrokerService.java

@@ -8,4 +8,6 @@ public interface BrokerService {
     void orderChildSync(TransportParam param);
 
     TransportVO getOrderChildStatus(String childNo);
+
+    TransportVO getOrderChildStatus(String childNo, String settlementNo);
 }

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

@@ -36,7 +36,13 @@ public class BrokerServiceImpl implements BrokerService {
     @Override
     public TransportVO getOrderChildStatus(String childNo) {
 
-        Result<TransportVO> result = brokerFeign.getTransportByChildNo(childNo, settlementConfig.getBrokerUserCode());
+        return getOrderChildStatus(childNo, null);
+
+    }
+    @Override
+    public TransportVO getOrderChildStatus(String childNo, String settlementNo) {
+
+        Result<TransportVO> result = brokerFeign.getTransportByChildNo(childNo, settlementConfig.getBrokerUserCode(), settlementNo);
         if (result.getCode() != 0) {
             log.info("运单同步网络货运失败, msg:{}", result.getMsg());
         }

performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java

@@ -23,6 +23,7 @@ public interface BrokerFeign {
 
     @RequestMapping(value = "/broker-service/open/transport/getTransportByChildNo", method = RequestMethod.GET)
     Result<TransportVO> getTransportByChildNo(@RequestParam @NotBlank(message = "运单编号不能为空") String orderCode,
-                                              @RequestParam @NotNull(message = "userCode不能为空") String userCode);
+                                              @RequestParam @NotNull(message = "userCode不能为空") String userCode,
+                                              @RequestParam String settlementNo);
 
 }

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

@@ -73,8 +73,8 @@ public class NetworkDriverAccountServiceImpl implements NetworkDriverAccountServ
         WalletResidueCardVO data = result.getData();
         NetworkDriverAccount account = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, loginUserInfo.getUserNo()).get();
         data.setAssetSum(data.getAssetSum().add(account.getAccountBalance().movePointLeft(2)));
-        data.setFrozen(data.getFrozen().add(account.getFrozenBalance()).setScale(2, RoundingMode.UP));
-        data.setResidue(data.getResidue().add(account.getUsableBalance()).setScale(2, RoundingMode.UP));
+        data.setFrozen(data.getFrozen().add(account.getFrozenBalance()).setScale(2, RoundingMode.HALF_UP));
+        data.setResidue(data.getResidue().add(account.getUsableBalance()).setScale(2, RoundingMode.HALF_UP));
         return data;
     }
 }

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

@@ -327,7 +327,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
 
         // 获取状态
-        TransportVO result = brokerService.getOrderChildStatus(mq.getChildNo());
+        TransportVO result = brokerService.getOrderChildStatus(mq.getChildNo(), settlementOwnerDetail.getSettlementNo());
         if (result == null){
             log.info("运单号 {} 未找到运单信息",mq.getChildNo());
             return;