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

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

@@ -26,6 +26,8 @@ public interface OrderChildFeign {
     Result<?> syncLastTruck(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo);
 
 
+    @RequestMapping(value = "clx-performance/feign/orderChild/getInvoiceType", method = RequestMethod.GET)
+    Result<Integer> getInvoiceType(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo);
 
 
 }

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

@@ -5,6 +5,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.LastTruckService;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.child.FeignOrderChildService;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -30,6 +31,8 @@ public class OrderChildFeignController {
 
     private final LastTruckService lastTruckService;
 
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
 
     @GetMapping({"/getOrderChildTotalByUserNo"})
     Integer getTrucksByOrderGoodsNo(@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo) {
@@ -69,4 +72,10 @@ public class OrderChildFeignController {
 
     }
 
+    @ApiOperation(value = "获取当前订单是否有存在网运单", notes = "<br>By:胡宇帆")
+    @GetMapping({"/getInvoiceType"})
+    Result<Integer> getInvoiceType(@RequestParam("orderNo") @NotNull(message = "订单编号不能为空") String orderNo) {
+        return Result.ok(settlementOwnerDetailService.getInvoiceType(orderNo));
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -94,6 +94,11 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
 
+    @Override
+    public Integer getInvoiceType(String orderNo) {
+        return baseMapper.getInvoiceType(orderNo);
+    }
+
     @Override
     public IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
         LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java

@@ -33,4 +33,6 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
     IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
 
     IPage<SettlementOwnerDetail> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
+
+    Integer getInvoiceType(String orderNo);
 }

performance-web/src/main/java/com/clx/performance/mapper/settle/SettlementOwnerDetailMapper.java

@@ -20,4 +20,6 @@ public interface SettlementOwnerDetailMapper extends BaseMapper<SettlementOwnerD
     IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(@Param("page") Page<PageOwnerSettlementOwnerDetailVO> page,
                                                                                @Param("param") PageOwnerSettlementOwnerDetailParam param);
 
+    @SelectProvider(type = SettlementOwnerDetailSqlProvider.class, method = "getInvoiceType")
+    Integer getInvoiceType(@Param("orderNo") String orderNo);
 }
\ No newline at end of file

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

@@ -291,4 +291,9 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //创建excel
         return ExcelUtil.create(excelSheet);
     }
+
+    @Override
+    public Integer getInvoiceType(String orderNo) {
+        return settlementOwnerDetailDao.getInvoiceType(orderNo);
+    }
 }

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

@@ -24,4 +24,6 @@ public interface SettlementOwnerDetailService  {
     IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
 
     SXSSFWorkbook exportOwnerSettlementOrderDetail(PageOwnerSettlementOwnerDetailParam param);
+
+    Integer getInvoiceType(String orderNo);
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/SettlementOwnerDetailSqlProvider.java

@@ -28,7 +28,14 @@ public class SettlementOwnerDetailSqlProvider {
     }
 
 
-
+    public String getInvoiceType( @Param("orderNo") String orderNo) {
+        return new SQL(){{
+            SELECT("invoice_type");
+            FROM("settlement_owner_detail");
+            WHERE("order_no = '" + orderNo + "'");
+            LIMIT(1);
+        }}.toString();
+    }
 
 
 }