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

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

@@ -71,6 +71,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -908,12 +909,19 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     public void ownerAccountThaw(ThawAccountParam param) {
         String orderNo = param.getOrderNo();
         List<OwnerRunningWaterRecord> list = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
-
+        if (CollectionUtil.isEmpty(list)) {
+            log.info("解冻预付运费、保证金账户出错,查询出冻结流水有问题,参数为{}", JSONUtil.parse(param));
+            return;
+        }
+        List<OwnerRunningWaterRecord> thawList = list.stream().filter(i -> {
+                    return i.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.THAW.getCode());
+                }
+        ).collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(thawList)) {
+            log.info("当前订单已经产生了解冻流水,参数为{}", JSONUtil.parse(param));
+            return;
+        }
         if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(param.getOrderType())) {
-            if (CollectionUtil.isEmpty(list)) {
-                log.info("解冻预付运费、保证金账户出错,查询出冻结流水有问题,参数为{}", JSONUtil.parse(param));
-                return;
-            }
             generateOrdinary(list);
         }
         else {
@@ -1205,7 +1213,5 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         }
     }
 
-    public static void main(String[] args) {
 
-    }
 }