Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+@Getter
+@Setter
+public class OrderGoodsCancelParam {
+
+    @NotNull(message = "货单编号不能为空")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
+
+    @ApiModelProperty("货单取消类型 1：弹窗1  2：取消未接单及未到达货源地的车辆 3：取消未接单及未装车的车辆")
+    private Integer cancelOperateType;
+
+    @ApiModelProperty("取消的车辆列表")
+    private List<String> truckList;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.OrderGoodsParams;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
@@ -146,8 +147,8 @@ public class GoodsOrderController {
 
     @ApiOperation(value = "取消货单", notes = "<br>By:胡宇帆")
     @GetMapping("/orderGoodsCancel")
-    public Result<Object> orderGoodsCancel(@RequestParam(value = "orderGoodsNo") String orderGoodsNo) {
-        orderGoodsService.orderGoodsCancel(orderGoodsNo);
+    public Result<Object> orderGoodsCancel(@RequestBody OrderGoodsCancelParam param) {
+        orderGoodsService.orderGoodsCancel(param);
         return Result.ok();
     }
 

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

@@ -82,10 +82,15 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     List<OrderChild> selectResidueWeight(String orderNo,Integer status);
 
+    List<OrderChild> selectResidueWeight(String orderNo,Integer status,List<String> truckList);
+
     /**
      * 查询在途运单
      * @param orderGoodsNo
      * @return
      */
     List<OrderChild> selectInTransitOrderChild(String orderGoodsNo);
+
+
+    void batchUpdateOrderChildStatus(Integer status, List<Integer> ids);
 }

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

@@ -62,4 +62,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     boolean updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(Integer orderGoodsId, Integer status);
 
     Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
+
 }

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

@@ -30,6 +30,9 @@ public interface OrderGoodsTruckBindDao extends BaseDao<OrderGoodsTruckBindMappe
 
     void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code);
 
+    void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, List<String> truckList);
+
+
     List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo);
 
     void updateOrderGoodsBindStatusExpire(String orderGoodsNo);

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

@@ -266,6 +266,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public List<OrderChild> selectResidueWeight(String orderNo, Integer status, List<String> truckList) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderNo,orderNo)
+                .lt(ObjectUtil.isNotEmpty(status),OrderChild::getStatus, status)
+                .in(OrderChild::getTruckNo, truckList)
+        );
+    }
+
 
     @Override
     public List<OrderChild> selectInTransitOrderChild(String orderGoodsNo) {
@@ -275,6 +283,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public void batchUpdateOrderChildStatus(Integer status, List<Integer> ids) {
+        baseMapper.updateOrderGoodsSetResidueWeight(status, ids);
+    }
+
     @Override
     public List<OrderChild> getOrderChildByOrderNo(String orderNo) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();

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

@@ -167,4 +167,6 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight, Integer id) {
         return baseMapper.updateOrderGoodsSetResidueWeight(residueWeight,id);
     }
+
+
 }

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

@@ -84,6 +84,18 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
         );
     }
 
+    @Override
+    public void updateOrderGoodsBindStatus(String orderGoodsNo, Integer code, List<String> truckList) {
+        update(lUdWrapper()
+                .set(OrderGoodsTruckBind::getStatus, code)
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .in(OrderGoodsTruckBind::getTruckNo, truckList)
+                .or()
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+        );
+    }
+
     @Override
     public List<OrderGoodsTruckBind> selectListByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)

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

@@ -10,13 +10,11 @@ import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
+import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -48,4 +46,6 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     @Select("select count(1) from order_child where order_goods_no = #{orderGoodsNo} and status < 110")
     int countValidByOrderGoodsNo(String orderGoodsNo);
 
+    @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateOrderChildStatus")
+    Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "ids") List<Integer> ids);
 }
\ No newline at end of file

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

@@ -59,4 +59,5 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "id") Integer id);
+
 }

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

@@ -3,6 +3,7 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.OrderGoodsCancelParam;
 import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
@@ -60,7 +61,7 @@ public interface OrderGoodsService {
 
     /**
      * 取消货单
-     * @param orderGoodsNo
+     * @param OrderGoodsCancelParam
      */
-    void orderGoodsCancel(String orderGoodsNo);
+    void orderGoodsCancel(OrderGoodsCancelParam orderGoodsNo);
 }

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

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
+import java.util.List;
 import java.util.Objects;
 
 public class OrderChildSqlProvider {
@@ -125,4 +126,20 @@ public class OrderChildSqlProvider {
     }
 
 
+    public String batchUpdateOrderChildStatus(@Param(value ="status") Integer status, @Param(value = "ids") List<Integer> ids ){
+        StringBuffer sqlList = new StringBuffer();
+
+        sqlList.append("update order_child set status = " + status + "where id in (");
+        for (int i = 0; i < ids.size(); i++) {
+            Integer id = ids.get(i);
+
+            sqlList.append("'").append(id).append("'");
+
+            if (i < ids.size() - 1) {
+                sqlList.append(",");
+            }
+        }
+        sqlList.append(")");
+        return sqlList.toString();
+    }
 }

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

@@ -183,4 +183,5 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
+
 }