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

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

@@ -90,6 +90,10 @@ public interface PerformanceFeign {
 
     @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChild"})
     Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo);
+
+    @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChildLtUnsettle"})
+    Result<Boolean> selectInTransitOrderChildLtUnsettle(@RequestParam("orderNo") String orderNo);
+
     @GetMapping(value = {"clx-performance/feign/orderGoods/updateSystemAddressId"})
     Result<Boolean> updateSystemAddressId(@RequestParam("ownerAddressId") Integer ownerAddressId,@RequestParam("systemAddressId") Integer systemAddressId);
 

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

@@ -56,6 +56,16 @@ public class OrderChildFeignController {
         }
     }
 
+    @GetMapping({"/selectInTransitOrderChildLtUnsettle"})
+    Result<Boolean> selectInTransitOrderChildLtUnsettle(@RequestParam("orderNo") String orderNo) {
+        List<OrderChild> orderChildren = orderChildService.selectInTransitOrderChildLtUnsettle(orderNo);
+        if (CollectionUtil.isNotEmpty(orderChildren)) {
+            return Result.ok(true);
+        } else {
+            return Result.ok(false);
+        }
+    }
+
     @ApiOperation(value = "线路运单统计", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/lineStatistics", method = RequestMethod.GET)
     Result<OrderChildLineStatisticsVO> lineStatistics(@RequestParam @NotNull(message = "发货地址不可为空") Integer sendSystemAddressId,

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -116,6 +116,8 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
+    List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo);
+
     /**
      * 通过货单号查询在途运单
      * @param orderGoodsNo

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

@@ -377,6 +377,13 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderNo, orderNo)
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNLOAD.getCode())
+        );
+    }
+
     @Override
     public List<OrderChild> selectInTransitOrderChildByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.mapper.settle.SettlementOwnerDetailMapper;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
@@ -117,6 +118,16 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
         );
     }
 
+    @Override
+    public void updateFinalPaymentStatusBySettlementNoForOnline(String settlementNo, Integer finalPaymentStatus) {
+        update(lUdWrapper()
+                .eq(SettlementOwnerDetail::getSettlementNo, settlementNo)
+                .eq(SettlementOwnerDetail::getFinalPaymentStatus, SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode())
+                .set(SettlementOwnerDetail::getFinalPaymentStatus, finalPaymentStatus)
+
+        );
+    }
+
     @Override
     public IPage<SettlementOwnerDetail> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param) {
         LambdaQueryWrapper<SettlementOwnerDetail> query = new LambdaQueryWrapper<>();

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

@@ -40,4 +40,6 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
     Integer getInvoiceType(String orderNo);
 
     void updateSettlementByChildNoList(List<String> childNoList);
+
+    void updateFinalPaymentStatusBySettlementNoForOnline(String settlementNo, Integer finalPaymentStatus);
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -78,12 +78,14 @@ public interface OrderChildService {
     void orderChildExpect();
 
     /**
-     * 查询在途运单
+     * 查询是否存在未通过榜单审核的运单
      * @param orderNo
      * @return
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
+    List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo);
+
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
 
     void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus);

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

@@ -124,6 +124,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             }
             orderGoodsDao.batchUpdateOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode(),
                     ids);
+            //TODO 注意判断普通单还是网运单 普通单类型 1  网运单 2
+            //1网运单 2普通单
+            Integer invoiceType = settlementOwnerDetailDao.getInvoiceType(orderNo);
+            log.info("invoiceType={}", invoiceType);
+            ThawAccountParam thawAccountParam = new ThawAccountParam();
+
+            if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(invoiceType)) {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode());
+            } else {
+                thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
+            }
+            thawAccountParam.setOrderNo(orderNo);
+            log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+            ownerAccountService.ownerAccountThaw(thawAccountParam);
 
         } else {
             List<OrderChild> arriveSendChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());

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

@@ -2043,6 +2043,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         return orderChildDao.selectInTransitOrderChild(orderNo);
     }
 
+    @Override
+    public List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo) {
+        return orderChildDao.selectInTransitOrderChild(orderNo);
+    }
+
 
     /**
      * @return

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

@@ -999,7 +999,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                         prepaidFreight.setFrozenBalance(account.getFrozenBalance());
                         prepaidFreight.setUsableBalance(account.getUsableBalance());
                         prepaidFreight.setTakeOutBalance(BigDecimal.ZERO);
-                        prepaidFreight.setAccountBalance(account.getAccountBalance());
+                        prepaidFreight.setAccountBalance(account.getUsableBalance().add(account.getFrozenBalance()));
                         prepaidFreight.setOwnerUserNo(account.getOwnerUserNo());
 
                         prepaidFreight.setAccountType(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());

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

@@ -466,12 +466,14 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 finalPaymentStatus = SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode();
             }
         }else{ //网运单
-            if(settlementOwner.getPrepayFreight().compareTo(BigDecimal.ZERO) == 0){  //结算金额>0的,结算单收款方付款确认后，更新状态为“是”
-                finalPaymentStatus = SettlementOwnerDetailEnum.FinalPaymentStatus.YES.getCode();
-            }
-/*            else if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) ==  0){   //结算金额=0的，默认“无需支付”。
-                finalPaymentStatus = SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode();
-            }*/
+            settlementOwnerDetailDao.updateFinalPaymentStatusBySettlementNoForOnline(settlementNo, SettlementOwnerDetailEnum.FinalPaymentStatus.YES.getCode());
+
+//            if(settlementOwner.getPrepayFreight().compareTo(BigDecimal.ZERO) == 0){  //结算金额>0的,结算单收款方付款确认后，更新状态为“是”
+//                finalPaymentStatus = SettlementOwnerDetailEnum.FinalPaymentStatus.YES.getCode();
+//            }
+///*            else if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) ==  0){   //结算金额=0的，默认“无需支付”。
+//                finalPaymentStatus = SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode();
+//            }*/
         }
         if(Objects.nonNull(finalPaymentStatus)){
             settlementOwnerDetailDao.updateFinalPaymentStatusBySettlementNo(settlementNo, finalPaymentStatus);

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

@@ -171,12 +171,6 @@ public class SettlementServiceImpl implements SettlementService {
             settlementDriverDetail.setPrepayFreightFlag(0);
         }
 
-//        // 网运单更新预付运费
-//        if (Objects.equals(settlementOwnerDetail.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
-//            settlementOwnerDetail.setPrepayFreight(updatePrepayFreightPay(settlementOwnerDetail.getChildNo(),
-//                    settlementOwnerDetail.getFreight(), settlementOwnerDetail.getLossFreight()));
-//        }
-
         log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);