Merge remote-tracking branch 'origin/dev' into dev

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

@@ -177,6 +177,14 @@ public enum OrderChildEnum {
     );
 
 
+
+    public static final List<Integer> CARRIER_CAN_CANCEL_STATUS_LIST = Arrays.asList(
+            Status.CREATED.getCode(),
+            Status.GO_TO_SEND.getCode(),
+            Status.ARRIVE_SEND.getCode()
+    );
+
+
     public static ConcurrentHashMap<Integer, String> map = new ConcurrentHashMap();
     static {
         for(OrderChildEnum.Status

performance-api/src/main/java/com/clx/performance/param/pc/OrderChildCarrierBatchCancelParam.java

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildCarrierBatchCancelParam {
+
+    @ApiModelProperty(value = "运单编号集合", example = "")
+    @NotEmpty(message = "运单编号集合不能为空")
+    private List<String> childNoList;
+
+    @ApiModelProperty(value = "取消原因", example = "信息错误")
+    private String remark;
+
+}

performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java

@@ -42,4 +42,10 @@ public class RedisConstants {
      */
     public static final String LINE_WARN_WEATHER = "clx-performance:lineWarn:weather:";
 
+
+    /**
+     * 订单最后一车
+     */
+    public static final String ORDER_LAST_TRUCK_CHILD = "clx-performance:order:last:truck:child:";
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java

@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.param.pc.OrderChildCarrierBatchCancelParam;
 import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
@@ -127,4 +128,12 @@ public class CarrierOrderChildController {
     }
 
 
+
+    @ApiOperation(value = "批量取消运单", notes = "<br>By:刘海泉")
+    @PostMapping("/updateCarrierBatchCancel")
+    public Result<List<String>> updateCarrierBatchCancel(@RequestBody @Validated OrderChildCarrierBatchCancelParam param) {
+        List<String> cancelFailList = orderChildService.updateCarrierBatchCancel(param);
+        return Result.ok(cancelFailList);
+    }
+
 }

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

@@ -8,7 +8,6 @@ import com.clx.performance.param.app.*;
 import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.pc.*;
-import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
@@ -108,6 +107,8 @@ public interface OrderChildService {
 
     void cacheOrderChildExpectData(String childNo, OrderChildExpectDTO expect);
 
+    List<String> updateCarrierBatchCancel(OrderChildCarrierBatchCancelParam param);
+
     List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo);
 
 }

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

@@ -4,12 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.clx.open.sdk.callback.OpenCallBackClient;
 import com.clx.open.sdk.callback.message.OrderChildMessage;
 import com.clx.open.sdk.enums.ResultStatusEnum;
-import com.clx.order.enums.OrderEnum;
 import com.clx.order.enums.ResultEnum;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.param.feign.UpdateOrderLastTruckParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.config.ThirdAppConfig;
+import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.model.OrderChild;
@@ -22,6 +21,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -45,6 +45,7 @@ public class LastTruckServiceImpl implements LastTruckService {
     private final OrderChildStruct orderChildStruct;
     private final ThirdAppConfig thirdAppConfig;
     private final RedissonClient redissonClient;
+    private final RedisTemplate<String, String> redisTemplate;
     /**
      * @Author kavin
      * @Description 判断最后一车的逻辑
@@ -121,18 +122,21 @@ public class LastTruckServiceImpl implements LastTruckService {
     @Override
     public OrderChildVO getOrderLastTruck(String orderNo) throws Exception {
 
+        FeignOrderVO orderInfo = orderFeign.getOrderInfoFeign(orderNo);
+        if(Objects.isNull(orderInfo)){
+            log.error("计算订单最后一车，通过订单号:{},未查询到对应的订单",orderNo);
+            return null;
+        }
+
         //为每个货主的订单进行加锁，计算最后一车进行排队，防止多个运单dts监听并发导致最后一车重复计算
         RLock lock = redissonClient.getLock(RedissonConstants.CALC_ORDER_LAST_TRUCK_LOCK + orderNo);
         try{
-            FeignOrderVO orderInfo = orderFeign.getOrderInfoFeign(orderNo);
-            if(Objects.isNull(orderInfo)){
-                log.error("计算订单最后一车，通过订单号:{},未查询到对应的订单",orderNo);
-                return null;
-            }
+
+            String lastTruckCacheKey = getLastTruckCacheKey(orderNo);
             //已经计算出最后一车，则直接返回运单信息
-            if(Objects.equals(orderInfo.getLastTruckFlag(), OrderEnum.LastTruckFlag.YES.getCode())){
-                OrderChild child = orderChildDao.getByChildNo(orderInfo.getLastTruckChildNo()).orElseThrow(
-                        ResultEnum.DATA_NOT_FIND);
+            if(Objects.equals(Boolean.TRUE,redisTemplate.hasKey(lastTruckCacheKey))){
+                String childNo = redisTemplate.opsForValue().get(lastTruckCacheKey);
+                OrderChild child = orderChildDao.getByChildNo(childNo).orElseThrow(ResultEnum.DATA_NOT_FIND);
                 return orderChildStruct.convert(child);
             }
             boolean flag = lock.tryLock(15, 30, TimeUnit.SECONDS);
@@ -148,11 +152,8 @@ public class LastTruckServiceImpl implements LastTruckService {
                 //查询最后一车的运单
                 OrderChild child = orderChildDao.getLastTruckChild(orderNo);
                 log.info("当前订单计算出最后一车，运单编号：{} ", child.getChildNo());
-                //更新订单最后一车
-                UpdateOrderLastTruckParam param = new UpdateOrderLastTruckParam();
-                param.setOrderNo(orderNo);
-                param.setChildNo(child.getChildNo());
-                orderFeign.updateOrderLastTruck(param);
+                //更新订单最后一车到缓存,并设置有效期为60天
+                redisTemplate.opsForValue().set(getLastTruckCacheKey(orderNo),child.getChildNo(),60, TimeUnit.DAYS);
                 return orderChildStruct.convert(child);
             }
             return  null;
@@ -161,9 +162,9 @@ public class LastTruckServiceImpl implements LastTruckService {
                 lock.unlock();
             }
         }
+    }
 
-
-
-
+    public String getLastTruckCacheKey(String orderNo){
+        return RedisConstants.ORDER_LAST_TRUCK_CHILD + orderNo;
     }
 }

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

@@ -63,8 +63,6 @@ import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
-import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
-import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.clx.user.enums.idcard.IdCardEnum;
 import com.clx.user.feign.DocumentFeign;
@@ -3139,4 +3137,64 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(OCR_RECOGNITION_ERROR);
         }
     }
+    @Override
+    public List<String> updateCarrierBatchCancel(OrderChildCarrierBatchCancelParam param) {
+        List<OrderChild> orderChildList = orderChildDao.listInField(OrderChild::getChildNo, param.getChildNoList());
+        List<OrderChild> canCancelOrderChildList = new ArrayList<>();  //可以取消的运单集合
+        List<OrderChild> notCancelOrderChildList = new ArrayList<>();  //不可以取消的运单集合
+
+        //已接单、前往货源地、到达货源地 的运单才可以取消
+        for (OrderChild child : orderChildList) {
+            if(OrderChildEnum.CARRIER_CAN_CANCEL_STATUS_LIST.contains(child.getStatus())){
+                canCancelOrderChildList.add(child);
+            }else{
+                notCancelOrderChildList.add(child);
+            }
+        }
+
+
+/*        // 禁止取消 (卸车前取消)
+        if (orderChild.getStatus() >= OrderChildEnum.Status.UNLOAD.getCode()) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_CANCEL_FORBID);
+        }
+
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
+                PerformanceResultEnum.DATA_NOT_FIND);
+
+        // 定向
+        OrderGoodsTruckBind orderGoodsTruckBind = null;
+        if (Objects.equals(orderGoods.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())
+                || Objects.equals(orderGoods.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.FLEET_EXCLUSIVE.getCode())) {
+            orderGoodsTruckBind = orderGoodsTruckBindDao.getByOrderGoodsNoAndTruckNo(orderGoods.getOrderGoodsNo(),
+                    orderChild.getTruckNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        }
+
+        orderChild.setCancelRemark(param.getRemark());
+        orderChild.setCancelTime(LocalDateTime.now());
+        orderChild.setFinishTime(orderChild.getCancelTime());
+        orderChild.setStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
+
+        // 返回吨数
+        updateOrderGoodsAmountReturn(orderChild, orderGoods);
+
+        // 取消定向
+        updateOrderGoodsDirectCancel(orderGoods,orderGoodsTruckBind);
+
+        orderChildDao.updateCancel(orderChild);
+
+        // 更新出车状态
+        updateDriverOrderStatusCancel(orderChild.getDriverUserNo(), orderChild.getTruckId());
+
+        // 日志
+        orderChildLogService.saveCarrierOrderChildLog(childNo, OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(),
+                OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), loginUserInfo.getUserNo(),
+                loginUserInfo.getUserName());
+
+        // 承运取消后置逻辑
+        orderChildPostService.orderChildCancelByCarrier(orderChild, UserTypeEnum.CARRIER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());*/
+
+
+
+        return notCancelOrderChildList.stream().map(OrderChild :: getChildNo).collect(Collectors.toList());
+    }
 }