Merge remote-tracking branch 'origin/v17.3_youhua_20240615' into test

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

 package com.clx.performance.feign;
 
 import com.clx.performance.param.app.collect.CollectTruckParam;
+import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.feign.DistributionTruckParam;
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.OrderCancelFeignParam;
@@ -145,4 +146,12 @@ public interface PerformanceFeign {
      */
     @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
     Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
+    /**
+     * 取消货单
+     * @param param
+     * @return
+     */
+    @PostMapping(value = {"clx-performance/feign/orderGoods/cancelOrderGoods"})
+    Result<Object> cancelOrderGoods(@RequestBody @Validated CancelOrderGoodsParam param);
+
 }

performance-api/src/main/java/com/clx/performance/param/feign/CancelOrderGoodsParam.java

+package com.clx.performance.param.feign;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+
+@Getter
+@Setter
+public class CancelOrderGoodsParam {
+    @NotBlank(message = "订单编号不能为空")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    @NotNull(message = "操作人编号不能为空")
+    @ApiModelProperty("操作人编号")
+    private Long createBy;
+
+    @NotNull(message = "操作人名称不能为空")
+    @Size(max=32,message = "操作人名称最多输入32个字符")
+    @ApiModelProperty("操作人名称")
+    private String createName;
+}

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

@@ -2,6 +2,7 @@ package com.clx.performance.constant;
 
 public class RabbitKeyConstants {
 
+    //更改订单状态为挂单中
     public static final String ORDER_POSTED_QUEUE = "clx-order.order.posted.queue";
 
     //改订单状态为已挂单
@@ -12,16 +13,18 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_ON_ROUTE_KEY ="clx-order.order.on.route.key";
 
+/*
     public static final String ORDER_ON_DEAD_ROUTE_KEY ="clx-order.order.on.dead.route.key";
+*/
 
     public static final String ORDER_ON_QUEUE ="clx-order.order.on.queue";
 
     public static final String ORDER_ON_EXCHANGE ="clx-order.order.on.exchange";
 
-    //更改订单状态为挂单中
-    public static final String ORDER_ON_DEAD_EXCHANGE ="clx-order.order.on.dead.exchange";
 
-    public static final String ORDER_ON_DEAD_QUEUE ="clx-order.order.on.dead.queue";
+/*    public static final String ORDER_ON_DEAD_EXCHANGE ="clx-order.order.on.dead.exchange";
+
+    public static final String ORDER_ON_DEAD_QUEUE ="clx-order.order.on.dead.queue";*/
 
 
     public static final String ORDER_GOODS_SYNC_TRUCK_DRIVER_INFO_QUEUE = "clx-performance.order.goods.sync.truck.driver.info.queue";

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

 package com.clx.performance.controller.feign;
 
+import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.feign.DistributionTruckParam;
 import com.clx.performance.param.pc.OrderChildReportParam;
 import com.clx.performance.service.OrderGoodsService;
@@ -65,5 +66,12 @@ public class OrderGoodsFeignController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "取消货单", notes = "<br>By:李瑞新")
+    @PostMapping({"/cancelOrderGoods"})
+    Result<Object> cancelOrderGoods(@RequestBody @Validated CancelOrderGoodsParam param) {
+        orderGoodsService.cancelOrderGoods(param);
+        return Result.ok();
+    }
+
 
 }

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

@@ -174,11 +174,13 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
                         Integer sendSystemAddressId, Integer receiveSystemAddressId,
                         String beginTime);
     Integer unloadTimeAvg(Integer sendAddressId, Integer receiveAddressId,
-                          Integer sendSystemAddressId, Integer receiveSystemAddressId,
-                          String beginTime);
+                        Integer sendSystemAddressId, Integer receiveSystemAddressId,
+                        String beginTime);
 
     List<OrderChild> listByChildNoList(List<String> childNoList);
 
+    MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
+
     List<OrderChild> listByOrderGoodsNoAndStatus(String orderGoodsNo, List<Integer> statusList);
 
     BigDecimal sumTakeWeightByOrderGoodsNo(String orderGoodsNo, BigDecimal defaultWeight);
@@ -192,5 +194,4 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<LineWarnOrderChildStatisticsDTO>sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList);
 
 
-    MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo);
 }

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

@@ -101,4 +101,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     void batchUpdateResidueWeight(List<Integer> list, BigDecimal residueWeight);
 
     List<OrderGoodsFleetOpenTruck> queryProcessFleetOpenTruckList();
+
+    void cancelOrderGoods(String orderNo);
 }

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

@@ -559,7 +559,9 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public Integer loadTimeAvg(Integer sendAddressId, Integer receiveAddressId, Integer sendSystemAddressId, Integer receiveSystemAddressId, String beginTime) {
+    public Integer loadTimeAvg(Integer sendAddressId, Integer receiveAddressId,
+                               Integer sendSystemAddressId, Integer receiveSystemAddressId,
+                               String beginTime) {
         return baseMapper.loadTimeAvg(sendAddressId,receiveAddressId,
                 sendSystemAddressId,receiveSystemAddressId,
                 beginTime);
@@ -578,6 +580,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
 
+    @Override
+    public MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo) {
+        return baseMapper.statisticsTruckMonth(startTime,endTime,truckNo);
+    }
+
     @Override
     public List<OrderChild> listByOrderGoodsNoAndStatus(String orderGoodsNo, List<Integer> statusList) {
         return list(lQrWrapper()
@@ -627,8 +634,4 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.sumUnloadNumByOrderGoodsNoList(orderGoodsNoList);
     }
 
-    @Override
-    public MonthInComeAndOrderedVO statisticsTruckMonth(LocalDateTime startTime, LocalDateTime endTime, String truckNo) {
-        return baseMapper.statisticsTruckMonth(startTime,endTime,truckNo);
-    }
 }

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

@@ -284,4 +284,12 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public List<OrderGoodsFleetOpenTruck> queryProcessFleetOpenTruckList() {
         return baseMapper.queryProcessFleetOpenTruckList();
     }
+
+    @Override
+    public void cancelOrderGoods(String orderNo) {
+        update(lUdWrapper()
+                .eq(OrderGoods::getOrderNo, orderNo)
+                .set(OrderGoods::getOrderGoodsStatus, OrderGoodsStatusEnum.Status.CANCEL.getCode())
+        );
+    }
 }

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

@@ -10,7 +10,10 @@ import com.msl.common.base.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -29,6 +32,9 @@ public class RabbitOrderGoodsStatusOnHandler {
     @Autowired
     private LineWarnMqService lineWarnMqService;
 
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
     @RabbitListener(queues = RabbitKeyConstants.ORDER_GOODS_ON_DEAD_QUEUE)
     public void onMessage(String message) {
         log.info("处理货单状态由已挂单变为挂弹中监听器执行,货单ID为{}", message);
@@ -45,6 +51,14 @@ public class RabbitOrderGoodsStatusOnHandler {
             log.info("处理货单状态由已挂单变为挂单中监听器执行,从状态{}-----变更为{}", orderGoods.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.PAYING.getName());
             orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderGoodsStatusEnum.Status.PAYING.getCode());
 
+
+            Message orderNoMessage = MessageBuilder.withBody(orderGoods.getOrderNo().getBytes()).build();
+
+            //发送mq，更改货单对应的订单为挂单中
+            rabbitTemplate.send(
+                    RabbitKeyConstants.ORDER_POSTED_EXCHANGE, RabbitKeyConstants.ORDER_POSTED_ROUTE_KEY, orderNoMessage
+            );
+
             // 发送mq
             lineWarnMqService.orderGoodsAdd(orderGoods.getOrderGoodsNo());
 

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -118,6 +118,11 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
                           Integer sendSystemAddressId, Integer receiveSystemAddressId,
                           String beginTime);
 
+
+    @SelectProvider(type = OrderChildSqlProvider.class, method = "statisticsTruckMonth")
+    MonthInComeAndOrderedVO statisticsTruckMonth(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime,  @Param("truckNo")String truckNo);
+
+
     @Select("select sum(if (status>=50, load_net, #{defaultWeight})) from order_child " +
             " where order_goods_no=#{orderGoodsNo} and status in(10,20,30,40,50,60,70,80,90,100)")
     BigDecimal sumTakeWeightByOrderGoodsNo(String orderGoodsNo, BigDecimal defaultWeight);
@@ -163,8 +168,4 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
             "</script>")
     List<LineWarnOrderChildStatisticsDTO>sumUnloadNumByOrderGoodsNoList(List<String> orderGoodsNoList);
 
-
-
-    @SelectProvider(type = OrderChildSqlProvider.class, method = "statisticsTruckMonth")
-    MonthInComeAndOrderedVO statisticsTruckMonth(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime,  @Param("truckNo")String truckNo);
 }
\ No newline at end of file

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

 package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.model.OrderGoodsLog;
 import com.clx.performance.param.pc.OrderGoodsLogParam;
 import com.clx.performance.vo.pc.OrderGoodsLogVO;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2023-10-26
@@ -13,4 +16,6 @@ public interface OrderGoodsLogService {
     void saveLog(String orderGoodsNo,Long userNo,String userName,String type,String remark);
 
     IPage<OrderGoodsLogVO> pageOrderGoodsLog(OrderGoodsLogParam param);
+
+    void saveBatchLog(List<OrderGoodsLog> logs);
 }

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

@@ -5,6 +5,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.feign.DistributionTruckParam;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
@@ -104,4 +105,6 @@ public interface OrderGoodsService {
     void saveBindTruck(DistributionTruckParam param);
 
     void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
+
+    void cancelOrderGoods(CancelOrderGoodsParam param);
 }

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

@@ -47,4 +47,9 @@ public class OrderGoodsLogServiceImpl implements OrderGoodsLogService {
         result.setRecords(orderGoodsLogVOS);
         return result;
     }
+
+    @Override
+    public void saveBatchLog(List<OrderGoodsLog> logs) {
+        orderGoodsLogDao.saveBatchList(logs);
+    }
 }

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

@@ -27,6 +27,7 @@ import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.*;
 import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
+import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.feign.DistributionTruckParam;
 import com.clx.performance.param.pc.*;
 import com.clx.performance.service.IntegralMqService;
@@ -1005,4 +1006,28 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
 
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelOrderGoods(CancelOrderGoodsParam param) {
+        //取消货单
+        orderGoodsDao.cancelOrderGoods(param.getOrderNo());
+
+        //批量保存货单日志
+        List<OrderGoods> orderGoodsListByOrderNo = orderGoodsDao.getOrderGoodsListByOrderNo(param.getOrderNo());
+        List<OrderGoodsLog> orderGoodsLogs = new ArrayList<>();
+        OrderGoodsLog orderGoodsLog = null;
+        for(OrderGoods orderGoods:orderGoodsListByOrderNo){
+            orderGoodsLog = new OrderGoodsLog();
+            orderGoodsLog.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
+            orderGoodsLog.setCreateName(param.getCreateName());
+            orderGoodsLog.setType(OrderGoodsLogsEnum.Type.CANCEL.getName());
+            orderGoodsLog.setCreateBy(param.getCreateBy());
+            orderGoodsLog.setRemark("货主发起减吨请求，当前已挂单量超过总拉运量，自动取消");
+            orderGoodsLogs.add(orderGoodsLog);
+        }
+
+        orderGoodsLogService.saveBatchLog(orderGoodsLogs);
+
+    }
 }

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

 package com.clx.performance.strategy;
 
-import com.clx.order.enums.VehicleUsageEnum;
-import com.clx.performance.param.pc.OrderGoodsChildParams;
-import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.enums.OrderStopEnum;
 import com.clx.order.enums.ResultEnum;
+import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.vo.feign.FeignOrderVO;
-import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.model.OrderGoodsTruckBind;
+import com.clx.performance.param.pc.OrderGoodsChildParams;
+import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.performance.utils.SpringContextUtils;
 import com.msl.common.exception.ServiceSystemException;
-import com.msl.common.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -83,7 +81,7 @@ public abstract class GoodsOrderStrategy {
                 throw new ServiceSystemException(ResultEnum.DATA_ERROR, "已被定向单绑定车辆：" + trucks);            }
         }
         //根据不同的订单类型创建不同的货单
-        LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);
+/*        LocalDateTime sendLazyTime = goodsOrderProcess(orderGoodsParams, orderInfo, now);
 
         Message message = MessageBuilder.withBody(orderNo.getBytes()).build();
         BigDecimal epochMilli = null;
@@ -107,6 +105,6 @@ public abstract class GoodsOrderStrategy {
             rabbitTemplate.send(
                     RabbitKeyConstants.ORDER_ON_EXCHANGE, RabbitKeyConstants.ORDER_ON_ROUTE_KEY, message
             );
-        }
+        }*/
     }
 }