Merge remote-tracking branch 'origin/test' into test

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

@@ -912,8 +912,9 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     @Transactional(rollbackFor = Exception.class)
     public void ownerAccountThaw(ThawAccountParam param) {
         String orderNo = param.getOrderNo();
-        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(param.getOrderType())) {
         List<OwnerRunningWaterRecord> list = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
+
+        if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(param.getOrderType())) {
             if (CollectionUtil.isEmpty(list)) {
                 log.info("解冻预付运费、保证金账户出错,查询出冻结流水有问题,参数为{}", JSONUtil.parse(param));
                 return;
@@ -921,13 +922,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             generateOrdinary(list);
         }
         else {
-            generateNetwork(param);
+            generateNetwork(list);
         }
     }
 
     //处理网运单
-    private void generateNetwork(ThawAccountParam param) {
-        List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(param.getOrderNo());
+    private void generateNetwork(List<OwnerRunningWaterRecord> runningWaterRecordList) {
         //保证金冻结金额
         BigDecimal frozenMargin = BigDecimal.ZERO;
         //预付运费冻结金额
@@ -959,7 +959,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
 
         BigDecimal subtract = frozenFreight.subtract(takeOutFreight);
-        log.info("执行网运单账户释放： 保证金冻结金额：{}, 预付运费冻结金额{}, 预付运费扣除金额, {}", frozenMargin, frozenFreight, takeOutFreight);
+        log.info("执行网运单账户释放： 保证金冻结金额：{}, 预付运费冻结金额{}, 预付运费扣除金额, {},有效流水记录：{}", frozenMargin, frozenFreight, takeOutFreight, JSONUtil.parse(list));
 
         while (true) {
             int flag = 0;
@@ -1039,7 +1039,22 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     }
 
     //处理普通单
-    private void generateOrdinary(List<OwnerRunningWaterRecord> list) {
+    private void generateOrdinary(List<OwnerRunningWaterRecord> runningWaterRecordList) {
+        List<OwnerRunningWaterRecord> list = new LinkedList<>();
+        for (OwnerRunningWaterRecord runningWaterRecord : runningWaterRecordList) {
+            if (runningWaterRecord.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.MARGIN_ACCOUNT.getCode())
+                    && runningWaterRecord.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
+            ) {
+                list.add(runningWaterRecord);
+            }
+
+            if (runningWaterRecord.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
+                    && runningWaterRecord.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
+            ) {
+                list.add(runningWaterRecord);
+            }
+        }
+        log.info("执行普通单解冻,有效流水记录{}", JSONUtil.parse(list) );
         while (true) {
             int flag = 0;
             for (OwnerRunningWaterRecord runningWaterRecord : list) {