资金相关

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

@@ -445,7 +445,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             rowData.add(new ExcelData(dto.getUsableBalance()));
             rowData.add(new ExcelData(dto.getAccountBalance()));
             rowData.add(new ExcelData(dto.getTakeOutBalance()));
-            rowData.add(new ExcelData(dto.getRunningWaterNo().toString()));
+            rowData.add(new ExcelData(dto.getRunningWaterNo() == null ? "" :dto.getRunningWaterNo().toString()));
             rowData.add(new ExcelData(dto.getCreateBy()));
             rowData.add(new ExcelData(dto.getCreateTime().toString()));
 
@@ -503,9 +503,9 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             rowData.add(new ExcelData(dto.getUsableBalance()));
             rowData.add(new ExcelData(dto.getAccountBalance()));
             rowData.add(new ExcelData(dto.getTakeOutBalance()));
-            rowData.add(new ExcelData(dto.getRunningWaterNo().toString()));
+            rowData.add(new ExcelData(dto.getRunningWaterNo() == null ? "" :dto.getRunningWaterNo().toString()));
             rowData.add(new ExcelData(dto.getCreateBy()));
-            rowData.add(new ExcelData(dto.getCreateTime().toString()));
+            rowData.add(new ExcelData(dto.getCreateTime()));
 
             dataList.add(rowData);
         }
@@ -696,10 +696,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             }
             if (flag == 2) {
                 log.info("冻结账户完毕");
-                break;
-            }
-        }
                 log.info("插入保证金冻结流水");
+                accountList = ownerAccountDao.accountInfo(userNo);
+                for (OwnerAccount ownerAccount : accountList) {
+                    if (ownerAccount.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode())) {
                         //插入保证金冻结流水
                         OwnerRunningWaterRecord marginAccount = new OwnerRunningWaterRecord();
                         marginAccount.setOwnerUserName(ownerName);
@@ -709,13 +709,18 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                         marginAccount.setOrderNo(orderNo);
 
                         marginAccount.setRelationId(null);
-        marginAccount.setAccountBalance(ensureBalance);
+                        marginAccount.setAlterationBalance(ensureBalance);
+                        marginAccount.setFrozenBalance(ensureBalance);
+                        marginAccount.setUsableBalance(ownerAccount.getUsableBalance());
+                        marginAccount.setTakeOutBalance(BigDecimal.ZERO);
+                        marginAccount.setAccountBalance(ownerAccount.getAccountBalance());
                         marginAccount.setOwnerUserNo(userNo);
 
                         marginAccount.setAccountType(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode());
                         marginAccount.setRunningWaterType(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode());
                         marginAccount.setRunningWaterNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.FROZEN.getCode()));
                         ownerRunningWaterRecordDao.saveEntity(marginAccount);
+                    }else {
                         log.info("插入预付运费冻结流水");
 
                         //插入预付运费冻结流水
@@ -727,7 +732,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                         prepaidFreight.setOrderNo(orderNo);
 
                         prepaidFreight.setRelationId(null);
-        prepaidFreight.setAccountBalance(frozenBalance);
+                        prepaidFreight.setAlterationBalance(frozenBalance);
+                        prepaidFreight.setFrozenBalance(frozenBalance);
+                        prepaidFreight.setUsableBalance(ownerAccount.getUsableBalance());
+                        prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
+                        prepaidFreight.setAccountBalance(ownerAccount.getAccountBalance());
                         prepaidFreight.setOwnerUserNo(userNo);
 
                         prepaidFreight.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
@@ -735,6 +744,14 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                         prepaidFreight.setRunningWaterNo(idGenerateSnowFlake.nextId(IdTypeEnum.Type.FROZEN.getCode()));
                         ownerRunningWaterRecordDao.saveEntity(prepaidFreight);
 
+                    }
+                }
+
+
+                break;
+            }
+        }
+
 
     }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -14,7 +14,7 @@ public class OwnerRunningWaterRecordSqlProvider {
     public String marginAccountPageList(@Param("param") PagePlatformMarginAccountParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
-                    " a.owner_user_name, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
+                    " a.owner_user_name,a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
                     " a.account_balance,a.usable_balance, a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_running_water_record a");
             WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode());
@@ -37,7 +37,7 @@ public class OwnerRunningWaterRecordSqlProvider {
     public String prepaidFreightAccountPageList(@Param("param") PagePlatformPrepaidFreightAccountParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
-                    " a.owner_user_name, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
+                    " a.owner_user_name,a.a.running_water_no, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
                     " a.account_balance,a.usable_balance, a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_running_water_record a");
             WHERE("a.account_type =" + OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());