Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsTruckBindEnum.java

@@ -22,7 +22,7 @@ public enum OrderGoodsTruckBindEnum {
 
         ;
 
-        private final int code;
+        private final Integer code;
         private final String name;
 
         public static Optional<Status> getByCode(int code) {

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
+import java.net.URLEncoder;
 
 
 @Slf4j

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

@@ -129,6 +129,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return update(lUdWrapper()
                 .eq(OrderChild::getId, item.getId())
                 .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getFinishTime, item.getFinishTime())
+                .set(OrderChild::getSettleTime, item.getSettleTime())
         );
     }
 

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

@@ -25,6 +25,7 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order
                 , OrderChildLogEnum.Type.LOAD.getCode(), OrderChildLogEnum.Type.UNLOAD.getCode()
                 , OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode()
                 , OrderChildLogEnum.Type.OWNER_CANCEL.getCode(), OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode()
-                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode()).groupBy(OrderChildLog::getType).orderByAsc(OrderChildLog::getId));
+                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode())
+                .groupBy(OrderChildLog::getType).orderByAsc(OrderChildLog::getId));
     }
 }

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -121,4 +121,7 @@ public class OrderChildDtsListener  {
         }
     }
 
+
+
+
 }

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

 package com.clx.performance.service;
 
 import com.clx.performance.model.OrderChild;
+import com.msl.common.result.Result;
 
 public interface LastTruckService {
 
     OrderChild getLastTruckChild(String orderNo);
 
-    void syncLastTruckChild(OrderChild child);
+    Result<?> syncLastTruckChild(OrderChild child);
 
 
     OrderChild getOrderCompleteLastTruck(String orderNo);
+
+    Result<?> syncLastTruckChild4OrderTrigger(String orderNo);
+
 }

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

@@ -159,11 +159,7 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
 
     @Override
     public IPage<IntegralTruckVO> driverPageTruckRank(DriverPageIntegralTruckRankParam param) {
-//        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
-
-
-        // 临时查本周排名
-        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek());
+        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         Long userNo = loginUserInfo.getUserNo();

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

@@ -67,13 +67,14 @@ public class LastTruckServiceImpl implements LastTruckService {
      * @return
      **/
     @Override
-    public void syncLastTruckChild(OrderChild child) {
+    public Result<?> syncLastTruckChild(OrderChild child) {
         OrderChildMessage message = orderChildStruct.convertMessage(child);
         message.setLastFlag(ResultStatusEnum.YES.getCode());
         log.info("开始同步最后一车的运单，运单编号:{},运单信息:{}",child.getChildNo(), JSON.toJSONString(message));
         OpenCallBackClient client2 = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());
         Result<?> result2 = client2.encryptPost(JSON.toJSONString(message),message.topic());
         log.info("结束同步最后一车的运单，运单编号:{}，响应结果:{}",child.getChildNo(),JSON.toJSONString(result2));
+        return result2;
     }
 
     @Override
@@ -87,4 +88,20 @@ public class LastTruckServiceImpl implements LastTruckService {
         }
         return null;
     }
+
+
+
+    /**
+     * @Author kavin
+     * @Description 订单取消、到达最晚拉运时间 同步最后一车
+     * @Param [orderNo]
+     * @return
+     **/
+    public Result<?> syncLastTruckChild4OrderTrigger(String orderNo) {
+        OrderChild child = getOrderCompleteLastTruck(orderNo);
+        if(Objects.nonNull(child)){
+            return syncLastTruckChild(child);
+        }
+        return Result.ok("订单完成/完结状态下未查询最后一车，订单编号:" + orderNo);
+    }
 }

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

@@ -415,7 +415,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (CollectionUtil.isNotEmpty(truckList)) {
             if (CollectionUtil.isNotEmpty(getChildList)) {
                 for (OrderGoodsTruckBind bind : getChildList) {
-                    if (!truckList.contains(bind.getTruckNo())) {
+                    if (OrderGoodsTruckBindEnum.Status.SUCCESS.getCode().equals(bind.getStatus()) && !truckList.contains(bind.getTruckNo())) {
                         throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前取消的车辆已经接单,车牌号为：" + bind.getTruckNo());
                     } else {
                         //已存在的记录不需要重新创建绑定记录

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

@@ -21,6 +21,7 @@ import com.clx.performance.service.breakcontract.BreakContractMqHandlerService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.payment.PayService;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.LocalDateTimeUtils;
 import com.msl.document.api.vo.ContractEvidenceRecordVo;
 import lombok.extern.slf4j.Slf4j;
@@ -129,6 +130,14 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
         breakContractSettlementLogService.saveBreakSettlementLog(settlementNo,
                 BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(),record.getCreateBy(),record.getCreateName());
+
+        try {
+            pay(settlement);
+        }catch (ServiceSystemException e){
+            settlement.setPayRemark(e.getMessage());
+            breakContractSettlementDriverDao.updatePayFail(settlement);
+        }
+
     }
 
     private String settlementNoGenerate() {

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

@@ -329,12 +329,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         BreakContractOwnerRuleVO.OrderAmountReduceRule reduceRule = autoRule.getOrderAmountReduceRule();//订单吨数减少规则
 
         //运单状态（不包括取消）
-        List<Integer> statusList = Arrays.asList(
-                new Integer[]{OrderChildEnum.Status.CREATED.getCode(), OrderChildEnum.Status.PAY.getCode(),
-                        OrderChildEnum.Status.GO_TO_SEND.getCode(), OrderChildEnum.Status.ARRIVE_SEND.getCode(),
-                        OrderChildEnum.Status.LOAD.getCode(), OrderChildEnum.Status.GO_TO_RECEIVE.getCode(),
-                        OrderChildEnum.Status.ARRIVE_RECEIVE.getCode(), OrderChildEnum.Status.UNLOAD.getCode(),
-                        OrderChildEnum.Status.UNSETTLE.getCode()});
+        List<Integer> breakStatusList = getBreakStatusList();
 
         BigDecimal figure ;//总费用
 
@@ -347,7 +342,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
                     .divide(param.getTransportWeight(),2, BigDecimal.ROUND_HALF_UP);
         }else{
 
-            List<OrderChild> orderChilds = orderChildDao.listOrderChildByOrderNoAndStatus(param.getOrderNo(), statusList);
+            List<OrderChild> orderChilds = orderChildDao.listOrderChildByOrderNoAndStatus(param.getOrderNo(), breakStatusList);
 
             if(CollectionUtils.isEmpty(orderChilds)){
                 BigDecimal totalFreight = param.getTransportWeight().multiply(param.getValidFreightPrice());
@@ -425,21 +420,11 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         BreakContractOwnerRuleVO.AutoRule autoRule = JSONObject.parseObject(autoRuleJson, BreakContractOwnerRuleVO.AutoRule.class);
         BreakContractOwnerRuleVO.OrderCancelRule orderCancelRule = autoRule.getOrderCancelRule();//订单取消规则
 
-        //运单状态
-        List<Integer> statusList = new ArrayList<>();
-        statusList.add(OrderChildEnum.Status.CREATED.getCode());
-        statusList.add(OrderChildEnum.Status.PAY.getCode());
-        statusList.add(OrderChildEnum.Status.GO_TO_SEND.getCode());
-        statusList.add(OrderChildEnum.Status.ARRIVE_SEND.getCode());
-        statusList.add(OrderChildEnum.Status.LOAD.getCode());
-        statusList.add(OrderChildEnum.Status.GO_TO_RECEIVE.getCode());
-        statusList.add(OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
-        statusList.add(OrderChildEnum.Status.UNLOAD.getCode());
-        statusList.add(OrderChildEnum.Status.UNSETTLE.getCode());
+        List<Integer> breakStatusList = getBreakStatusList();
 
         //由于已经更新了订单状态为货主取消了
         if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){
-            statusList.add(OrderChildEnum.Status.OWNER_CANCEL.getCode());
+            breakStatusList.add(OrderChildEnum.Status.OWNER_CANCEL.getCode());
         }
         BigDecimal figure ;//总费用
 
@@ -449,7 +434,8 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
             figure = transportWeight.multiply(validFreightPrice).multiply(orderCancelRule.getBeforeRatio());
         }else{
 
-            List<OrderChild> orderChilds = orderChildDao.listOrderChildByOrderNoAndStatus(orderNo, statusList);
+            List<OrderChild> orderChilds = orderChildDao.listOrderChildByOrderNoAndStatus(orderNo, breakStatusList);
+
             //没有司机拉运
             if(CollectionUtils.isEmpty(orderChilds)){
                 figure = transportWeight.multiply(validFreightPrice).multiply(orderCancelRule.getAfterRatio());
@@ -512,4 +498,26 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         ownerRecordAddParam.setRemark("订单取消产生违约");
         breakContractOwnerRecordService.autoSaveRecord(ownerRecordAddParam);
     }
+
+
+    /**
+     * 违约订单状态
+     * @return
+     */
+    private  List<Integer> getBreakStatusList(){
+        //运单状态
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(OrderChildEnum.Status.CREATED.getCode());
+        statusList.add(OrderChildEnum.Status.PAY.getCode());
+        statusList.add(OrderChildEnum.Status.GO_TO_SEND.getCode());
+        statusList.add(OrderChildEnum.Status.ARRIVE_SEND.getCode());
+        statusList.add(OrderChildEnum.Status.LOAD.getCode());
+        statusList.add(OrderChildEnum.Status.GO_TO_RECEIVE.getCode());
+        statusList.add(OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
+        statusList.add(OrderChildEnum.Status.UNLOAD.getCode());
+        statusList.add(OrderChildEnum.Status.UNSETTLE.getCode());
+        statusList.add(OrderChildEnum.Status.COMPLETE.getCode());
+        return statusList;
+
+    }
 }

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

@@ -24,6 +24,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.settle.SettlementLogService;
@@ -89,6 +90,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private OrderChildDao orderChildDao;
 
+    @Autowired
+    private OrderChildLogService orderChildLogService;
+
 
 
     @Override
@@ -183,9 +187,16 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         if(1 == payType){
             orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
+            orderChild.setSettleTime(LocalDateTime.now());
+            orderChild.setFinishTime(orderChild.getSettleTime());
             orderChildDao.updateSettlement(orderChild);
+
             settlementDriver.setStatus(SettlementDriverEnum.Status.SETTLED.getCode());
             settlementDriverDao.updateEntityByKey(settlementDriver);
+
+            // 日志
+            orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.COMPLETE.getCode(),
+                    OrderChildLogEnum.Type.COMPLETE.getMsg(), 0L, "系统");
         }else{
             settlementDriver.setPayErrorMsg(payErrorMsg);
             settlementDriverDao.updateEntityByKey(settlementDriver);

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

@@ -11,6 +11,7 @@ import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.enums.settle.SettlementWayEnum;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementPlatformAccount;
@@ -283,16 +284,17 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
         fieldList.add(new ExcelField(2, "开票标识", "invoiceType", 5000));
         fieldList.add(new ExcelField(3, "货主编码", "ownerUserNo", 5000));
-        fieldList.add(new ExcelField(4, "订单编号", "orderNo", 15000));
-        fieldList.add(new ExcelField(5, "实际净重", "weight", 5000));
-        fieldList.add(new ExcelField(6, "实际运费金额", "freight", 5000));
-        fieldList.add(new ExcelField(7, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(8, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(9, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(10, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(11, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(12, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(13, "状态", "status", 5000));
+        fieldList.add(new ExcelField(4, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(5, "订单编号", "orderNo", 15000));
+        fieldList.add(new ExcelField(6, "实际净重", "weight", 5000));
+        fieldList.add(new ExcelField(7, "实际运费金额", "freight", 5000));
+        fieldList.add(new ExcelField(8, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(9, "货损吨数", "lossWeight", 5000));
+        fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(11, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(12, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(13, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(14, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -305,6 +307,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             rowData.add(new ExcelData(dto.getSettlementNo()));
             rowData.add(new ExcelData(SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
             rowData.add(new ExcelData(String.valueOf(dto.getOwnerUserNo())));
+            rowData.add(new ExcelData(SettlementWayEnum.WayType.getMsgByCode(dto.getSettlementWay())));
             rowData.add(new ExcelData(dto.getOrderNo()));
             rowData.add(new ExcelData(dto.getWeight()));
             rowData.add(new ExcelData(dto.getFreight().movePointLeft(2)));

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -181,7 +181,7 @@ public class OrderChildSqlProvider {
             SELECT("child_no,goods_name,freight_price," +
                     "send_address,receive_address," +
                     "driver_user_no, driver_name,driver_mobile," +
-                    "truck_no," +
+                    "truck_no,cancel_type,cancel_remark," +
                     "unload_pound_no,weight," +
                     "cancel_remark,order_no," +
                     "pound_status,status," +