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

performance-api/src/main/java/com/clx/performance/feign/SettlementFeign.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface SettlementFeign {
 
     @ApiOperation(value = "查询当前订单号是否已经生成货主结算单明细")
-    @PostMapping("clx-performance/feign/settlement/selectListByOrderNo")
-    Result<Boolean> selectListByOrderNo(@RequestParam String orderNo);
+    @PostMapping("clx-performance/feign/settlement/thawAndLockSettlement")
+    Result<Boolean> thawAndLockSettlement(@RequestParam String orderNo);
 
 }

performance-web/src/main/java/com/clx/performance/controller/feign/SettlementFeignController.java

@@ -25,14 +25,10 @@ public class SettlementFeignController {
     private final SettlementOwnerDetailService settlementOwnerDetailService;
 
 
-    @GetMapping({"/selectListByOrderNo"})
+    @GetMapping({"/thawAndLockSettlement"})
     Result<Boolean> selectListByOrderNo(@RequestParam("orderNo") @NotNull(message = "订单号不能为空") String orderNo) {
-        List<SettlementOwnerDetail> list = settlementOwnerDetailService.selectListByOrderNo(orderNo);
-        if (CollectionUtil.isEmpty(list)) {
-            return Result.ok(true);
-        } else {
-            return Result.ok(false);
-        }
+        return Result.ok(settlementOwnerDetailService.thawAndLockSettlement(orderNo));
+
     }
 
 }

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

 package com.clx.performance.service.impl.settle;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.component.IdGenerateSnowFlake;
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OwnerAccountDao;
 import com.clx.performance.dao.OwnerRunningWaterRecordDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
@@ -25,6 +27,7 @@ import com.clx.performance.utils.excel.ExcelSheet;
 import com.clx.performance.utils.excel.ExcelUtil;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
+import com.msl.common.result.Result;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -52,6 +55,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
     private final IdGenerateSnowFlake idGenerateSnowFlake;
     private final OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
     private final OwnerAccountDao ownerAccountDao;
+    private final OrderChildDao orderChildDao;
 
 
     @Override
@@ -298,7 +302,23 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
     }
 
     @Override
-    public List<SettlementOwnerDetail> selectListByOrderNo(String orderNo) {
-        return settlementOwnerDetailDao.selectListByOrderNo(orderNo);
+    public Boolean thawAndLockSettlement(String orderNo) {
+        boolean orderChildrenFlag = false;
+        boolean ownerDetailsFlag = false;
+        List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildLtUnsettle(orderNo);
+        List<SettlementOwnerDetail> ownerDetails = settlementOwnerDetailDao.selectListByOrderNo(orderNo);
+        if (CollectionUtil.isNotEmpty(ownerDetails)) {
+            ownerDetailsFlag = true;
+        }
+
+        if (CollectionUtil.isNotEmpty(orderChildren)) {
+            orderChildrenFlag = true;
+        }
+
+        if (ownerDetailsFlag || orderChildrenFlag) {
+            return true;
+        } else {
+            return false;
+        }
     }
 }

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

@@ -4,15 +4,12 @@ package com.clx.performance.service.settle;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementOwnerDetailVO;
 import com.clx.performance.vo.pc.owner.settle.PageOwnerSettlementOwnerDetailVO;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
-import java.util.List;
-
 /**
  * @author liruixin
  * Date 2023-10-12
@@ -30,5 +27,5 @@ public interface SettlementOwnerDetailService  {
 
     Integer getInvoiceType(String orderNo);
 
-    List<SettlementOwnerDetail> selectListByOrderNo(String orderNo);
+    Boolean thawAndLockSettlement(String orderNo);
 }