Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test

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

@@ -1279,10 +1279,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         //查询保证金和预付运费欠多少金额
         for (OwnerAccount ownerAccount : accountList) {
             if (ownerAccount.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode())) {
-                build.setMarginArrearsOrderSumMoney(ownerAccount.getUsableBalance().subtract(marginArrearsOrder));
+                build.setMarginArrearsOrderSumMoney(marginArrearsOrder.subtract(ownerAccount.getUsableBalance()));
             }
             if (ownerAccount.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())) {
-                build.setPrepaidArrearsOrderSumMoney(ownerAccount.getUsableBalance().subtract(prepaidArrearsOrder));
+                build.setPrepaidArrearsOrderSumMoney(prepaidArrearsOrder.subtract(ownerAccount.getUsableBalance()));
             }
         }