Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-web/src/main/java/com/clx/performance/controller/pc/transport/TransportSyncController.java

@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping(value="/pc/transport/")
 @Validated
-@Api(tags = "PC-订单取消")
+@Api(tags = "PC-网络货运相关")
 @AllArgsConstructor
 public class TransportSyncController {
 

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

@@ -120,10 +120,10 @@ public class SettlementServiceImpl implements SettlementService {
 
                     runningWaterRecord.setRelationId(null);
                     runningWaterRecord.setAlterationBalance(ans);
-                    runningWaterRecord.setFrozenBalance(ans);
+                    runningWaterRecord.setFrozenBalance(account.getFrozenBalance().subtract(ans));
                     runningWaterRecord.setUsableBalance(account.getUsableBalance());
-                    runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO);
-                    runningWaterRecord.setAccountBalance(account.getAccountBalance());
+                    runningWaterRecord.setTakeOutBalance(ans);
+                    runningWaterRecord.setAccountBalance(account.getAccountBalance().subtract(ans));
                     runningWaterRecord.setOwnerUserNo(account.getOwnerUserNo());
 
                     runningWaterRecord.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());