订单逆向

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

 package com.clx.performance.param.pc;
 
+import com.clx.order.params.OrderGoodsChildParams;
+import com.msl.common.convertor.field.Converted;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
 /**
  * @ClassName UpdateEditOrderGoodsParam
  * @Description
@@ -13,60 +20,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UpdateEditOrderGoodsParam {
-//    @ApiModelProperty("货单id")
-//    private Integer id;
-//
-//    @ApiModelProperty("提取方式 1提取全部 2提取部分")
-//    private Integer extractWay;
-//
-//    @ApiModelProperty("提取吨数")
-//    private BigDecimal extractWeight;
-//
-//    @ApiModelProperty("需要车辆/辆")
-//    private Integer needTruckNum;
-//
-//
-//    @ApiModelProperty("挂单方式  1公开派单  2定向派单")
-//    private Integer pendingOrderWay;
-//
-//
-//    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
-//    private String vehicleUsage;
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//    @ApiModelProperty(value = "最晚到达货源地时间/运单的最晚装货时间", example = "2023-09-09 12:00:01", required = true)
-//    private String lastArriveSendTime;
-//
-//
-//
-//
-//    @ApiModelProperty("高级物流经理id")
-//    private Integer seniorLogisticsManagerId;
-//
-//    @ApiModelProperty("高级物流经理姓名")
-//    private String seniorLogisticsManagerName;
-//
-//
-//    @ApiModelProperty(value = "挂单时间", example = "2023-09-09 12:00:01", required = true)
-//    private String pendingOrderTime;
-//
-//
-//    @MoneyInConvert
-//    @ApiModelProperty("挂单运费")
-//    private BigDecimal pendingOrderFreight;
-//
-//
-//
-//
-//    @ApiModelProperty("车辆列表")
-//    private List<String> truckList;
 
+    @ApiModelProperty("订单编号")
+    @NotBlank(message = "订单编号不能为空")
+    private String orderNo;
+
+    @Valid
+    @Converted(isDynamic = true)
+    private List<OrderGoodsChildParams> orderGoodsChildParams;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsEditVO.java

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderGoodsEditVO {
+
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+    @ApiModelProperty("拉运吨数")
+    private String transportWeight;
+    @ApiModelProperty("有效运费")
+    private BigDecimal validFreightPrice;
+    @ApiModelProperty("用车需求： 1平台车辆 2部分平台车辆 3自有车辆")
+    private Integer truckDemand;
+    @ApiModelProperty("剩余拉运吨数")
+    private String residueWeight;
+    @ApiModelProperty("自有承运吨数")
+    private String ownCarryWeight;
+    @ApiModelProperty("自有承运剩余吨数")
+    private String ownResidueCarryWeight;
+    @ApiModelProperty("平台承运吨数")
+    private String platformCarryWeight;
+    @ApiModelProperty("平台剩余承运吨数")
+    private String platformResidueCarryWeight;
+    @ApiModelProperty("向下浮动量（吨）")
+    private String downFloatWeight;
+    @ApiModelProperty("向上浮动量（吨）")
+    private String upFloatWeight;
+    @ApiModelProperty("是否暂停 0：否   1：是")
+    private Integer stopFlag;
+    @ApiModelProperty("结算账期  1拉运完成结  2月结")
+    private Integer settlementAccountPeriod;
+    @ApiModelProperty("1:可以全部编辑 0：不能全部编辑")
+    private boolean editAllFlag;
+
+    private List<OrderGoodsVO> orderGoodsVOList;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 
@@ -112,5 +113,18 @@ public class OrderGoodsVO {
     @ApiModelProperty("车辆列表")
     private List<String> truckList;
 
+    @ApiModelProperty("批次号")
+    private String batchNumber;
 
+    @ApiModelProperty("'最晚到达目的地时间'")
+    private String lastArriveReceiveTime;
+
+    @ApiModelProperty("最晚装货时间")
+    private String lastLoadTime;
+
+    @ApiModelProperty("'最晚接单时间'")
+    private String lastOrderTime;
+
+    @ApiModelProperty("'是否可编辑全部字段'")
+    private boolean editAllFlg;
 }
\ No newline at end of file

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

@@ -29,11 +29,12 @@ public class OrderCancelFeignController {
     @ApiOperation(value = "货主端订单取消", notes = "<br>By:胡宇帆")
     @PostMapping("/orderCancel")
     public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
-        OrderCancelParam cancelParam = new OrderCancelParam();
-        cancelParam.setOrderNo(param.getOrderNo());
-        cancelParam.setCancelType(3);
-        cancelParam.setCreateByType(1);
-        orderCancelService.platformCancelOrderPrePC(cancelParam);
+//        OrderCancelParam cancelParam = new OrderCancelParam();
+//        cancelParam.setOrderNo(param.getOrderNo());
+//        cancelParam.setCancelType(3);
+//        cancelParam.setCreateByType(1);
+//        orderCancelService.platformCancelOrderPrePC(cancelParam);
+        orderCancelService.ownerCancelOrderPre(param.getOrderNo());
         return Result.ok();
     }
 }

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

@@ -14,6 +14,7 @@ import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.vo.pc.OrderChildPCVO;
+import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
@@ -127,15 +128,16 @@ public class GoodsOrderController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @ApiOperation(value = "货单编辑查询", notes = "<br>By:胡宇帆")
     @GetMapping("/findOrderGoodsByBatchNumber")
-    public Result<OrderGoodsVO> findOrderGoodsByBatchNumber(@RequestParam(value = "batch_number") Long batchNumber){
-        OrderGoodsVO orderGoodsVO = orderGoodsService.findOrderGoodsByBatchNumber(batchNumber);
+    public Result<OrderGoodsEditVO> findOrderGoodsByBatchNumber(@RequestParam(value = "batchNumber") Long batchNumber){
+        OrderGoodsEditVO orderGoodsVO = orderGoodsService.findOrderGoodsByBatchNumber(batchNumber);
         return Result.ok(orderGoodsVO);
     }
 
-    @ApiOperation(value = "货单编辑", notes = "<br>By:刘海泉")
+    @ApiOperation(value = "货单编辑提交", notes = "<br>By:刘海泉")
     @PostMapping("/updateEditOrderGoods")
-    public Result updateEditOrderGoods(@RequestBody @Validated UpdateEditOrderGoodsParam param) {
+    public Result<Object> updateEditOrderGoods(@RequestBody @Validated UpdateEditOrderGoodsParam param) {
         orderGoodsService.updateEditOrderGoods(param);
         return Result.ok();
     }

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

@@ -97,4 +97,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     void batchUpdateOrderChildStatus(Integer status, List<Integer> ids);
 
     List<OrderChild> selectOrderChildListByOrderGoodsNoAndStatusGE(String orderGoodsNo, Integer status);
+
+    List<OrderChild> selectListByOrderGoodsList(List<String> orderGoodsList);
 }

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

@@ -63,5 +63,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     Integer updateOrderGoodsSetResidueWeight(BigDecimal residueWeight,  Integer id);
 
-    OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber);
+    List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber);
 }

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

@@ -301,6 +301,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .ge(ObjectUtil.isNotNull(status),OrderChild::getStatus, status)
         );    }
 
+    @Override
+    public List<OrderChild> selectListByOrderGoodsList(List<String> orderGoodsList) {
+        return baseMapper.selectList(lQrWrapper().in(OrderChild::getOrderGoodsNo, orderGoodsList));
+    }
+
     @Override
     public List<OrderChild> getOrderChildByOrderNo(String orderNo) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();

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

@@ -169,7 +169,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber) {
+    public List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber) {
         return baseMapper.findOrderGoodsByBatchNumber(batchNumber);
     }
 

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

@@ -60,5 +60,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeight")
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "residueWeight") BigDecimal residueWeight, @Param(value = "id") Integer id);
 
-    OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber);
+    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "findOrderGoodsByBatchNumber")
+    List<OrderGoodsVO> findOrderGoodsByBatchNumber(Long batchNumber);
 }

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

@@ -8,7 +8,7 @@ public interface OrderCancelService {
 //
 //    void platformCancelOrder(String orderNo);
 //
-//    void ownerCancelOrderPre(String orderNo);
+    void ownerCancelOrderPre(String orderNo);
 //
 //    void ownerCancelOrder(String orderNo);
 

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

@@ -10,6 +10,7 @@ import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 
 import java.math.BigDecimal;
@@ -79,5 +80,5 @@ public interface OrderGoodsService {
      * @param batchNumber
      * @return
      */
-    OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber);
+    OrderGoodsEditVO findOrderGoodsByBatchNumber(Long batchNumber);
 }

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

@@ -28,6 +28,7 @@ import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.OrderGoodsStruct;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
+import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.clx.user.feign.UserClxFeign;
 import com.msl.common.base.Optional;
@@ -441,8 +442,33 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
 
     @Override
-    public OrderGoodsVO findOrderGoodsByBatchNumber(Long batchNumber) {
-        OrderGoodsVO orderGoodsVO = orderGoodsDao.findOrderGoodsByBatchNumber(batchNumber);
-        return orderGoodsVO;
+    public OrderGoodsEditVO findOrderGoodsByBatchNumber(Long batchNumber) {
+        OrderGoodsEditVO result = new OrderGoodsEditVO();
+        List<OrderGoodsVO> orderGoodsVOList = orderGoodsDao.findOrderGoodsByBatchNumber(batchNumber);
+        String orderNo = orderGoodsVOList.get(0).getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        result.setOrderNo(orderInfoFeign.getOrderNo());
+        result.setTransportWeight(orderInfoFeign.getTransportWeight());
+        result.setValidFreightPrice(orderInfoFeign.getValidFreightPrice());
+        result.setTruckDemand(orderInfoFeign.getTruckDemand());
+        result.setResidueWeight(orderInfoFeign.getResidueWeight());
+        result.setOwnCarryWeight(orderInfoFeign.getOwnCarryWeight());
+        result.setOwnResidueCarryWeight(orderInfoFeign.getOwnResidueCarryWeight());
+        result.setPlatformCarryWeight(orderInfoFeign.getPlatformCarryWeight());
+        result.setDownFloatWeight(orderInfoFeign.getDownFloatWeight());
+        result.setUpFloatWeight(orderInfoFeign.getUpFloatWeight());
+        result.setStopFlag(orderInfoFeign.getStopFlag());
+        result.setSettlementAccountPeriod(orderInfoFeign.getSettlementAccountPeriod());
+
+        List<String> orderGoodsList = orderGoodsVOList.stream().map(OrderGoodsVO::getOrderGoodsNo).collect(Collectors.toList());
+        List<OrderChild> orderChildList = orderChildDao.selectListByOrderGoodsList(orderGoodsList);
+        if (CollectionUtils.isNotEmpty(orderChildList)) {
+            result.setEditAllFlag(false);
+        } else {
+            result.setEditAllFlag(true);
+        }
+        result.setOrderGoodsVOList(orderGoodsVOList);
+
+        return result;
     }
 }

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

@@ -184,5 +184,29 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
+    public String pageOrderGoodsList(@Param("batchNumber") Long batchNumber) {
+        String sql = new SQL() {{
+            SELECT("a.id, a.order_no," +
+                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
+                    " if(a.residue_transport_weight < 0, '0', a.residue_transport_weight) as residue_transport_weight ,a.already_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
+                    " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
+                    "a.goods_id, a.goods_name, a.pending_order_way," +
+                    " date_format(a.directional_expire_time, '%Y-%m-%d %H:%i:%s') as directional_expire_time ," +
+                    " date_format(a.last_arrive_send_time, '%Y-%m-%d %H:%i:%s') as last_arrive_send_time ," +
+                    " date_format(a.pending_order_time, '%Y-%m-%d %H:%i:%s') as pending_order_time," +
+                    " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
+                    " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
+                    "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
+                    "a.user_no,a.user_name,batch_number,last_arrive_receive_time,last_load_time,last_order_time");
+            FROM("order_goods a");
+
+            if (Objects.nonNull(batchNumber)) {
+                WHERE("a.batch_number = #{batchNumber}");
+            }
+
+            ORDER_BY("a.create_time desc");
+        }}.toString();
+        return sql;
+    }
 
 }