取消货单

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;
@@ -132,4 +133,12 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/orderGoods/saveBindTruck"})
     Result<Object> saveBindTruck(@RequestBody @Validated DistributionTruckParam param);
 
+    /**
+     * 取消货单
+     * @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/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;
@@ -55,5 +56,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/OrderGoodsDao.java

@@ -100,4 +100,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/OrderGoodsDaoImpl.java

@@ -275,4 +275,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/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;
@@ -102,4 +103,6 @@ public interface OrderGoodsService {
     void batchUpdateResidueWeight(List<OrderGoods> list);
 
     void saveBindTruck(DistributionTruckParam param);
+
+    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

@@ -23,6 +23,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;
@@ -972,4 +973,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);
+
+    }
 }