处理BUG,增加平台还是自有车辆配货判断

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -112,6 +112,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     UpdateOrderInfoParam updateOrderInfoParam = new UpdateOrderInfoParam();
                     updateOrderInfoParam.setOrderId(orderInfoFeign.getId());
                     updateOrderInfoParam.setResidueWeight(residueTransportWeight.add(new BigDecimal(orderInfoFeign.getResidueWeight())));
+                    updateOrderInfoParam.setVehicleUsage(orderGoods.getVehicleUsage());
+
                     log.info("订单ID：{},返还订单剩余吨数{}", orderInfoFeign.getId(), residueTransportWeight);
 
                     //返还订单剩余吨数

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -39,6 +39,10 @@ public class OrderGoods implements HasKey<Integer> {
     @TableField("truck_demand")
     private Integer truckDemand;
 
+    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    @TableField("vehicle_usage")
+    private Integer vehicleUsage;
+
     @TableField("order_goods_status")
     @ApiModelProperty("货单状态")
     private Integer orderGoodsStatus;

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

@@ -139,7 +139,7 @@ public class OrderGoodsSqlProvider {
         StringBuffer sqlList = new StringBuffer();
 
         sqlList.append("INSERT INTO order_goods(extract_weight,residue_transport_weight,already_transport_weight,loss_price,truck_demand,extract_way," +
-                "need_truck_num,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
+                "need_truck_num,vehicle_usage,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
                 "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_longitude," +
                 "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,goods_name,goods_id,create_time,modified_time," +
                 "user_name,user_no) VALUES ");
@@ -149,7 +149,7 @@ public class OrderGoodsSqlProvider {
 
             sqlList.append(" ('").append(o.getExtractWeight()).append("','").append(o.getResidueTransportWeight()).append("','").append(o.getAlreadyTransportWeight()).append("','")
                     .append(o.getLossPrice()).append("','").append(o.getTruckDemand()).append("','").append(o.getExtractWay()).append("','")
-                    .append(o.getNeedTruckNum()).append("','").append(o.getPendingOrderWay()).append("','").append(o.getPendingOrderTime()).append("','")
+                    .append(o.getNeedTruckNum()).append("','").append(o.getVehicleUsage()).append("','").append(o.getPendingOrderWay()).append("','").append(o.getPendingOrderTime()).append("','")
                     .append(o.getPendingOrderFreight()).append("','").append(o.getLastArriveSendTime()).append("','").append(o.getSeniorLogisticsManagerId()).append("','")
                     .append(o.getSeniorLogisticsManagerName()).append("','").append(o.getOrderNo()).append("','").append(o.getOrderGoodsNo()).append("','")
                     .append(o.getOrderGoodsStatus()).append("','").append(o.getSendAddressId()).append("','").append(o.getSendAddressShorter()).append("','")

performance-web/src/main/java/com/clx/performance/strategy/impl/OneGoodsOrderStrategy.java

@@ -104,6 +104,7 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);
             orderGoods.setLossPrice(orderInfo.getLossPrice());
             orderGoods.setTruckDemand(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode());
+            orderGoods.setVehicleUsage(Integer.valueOf(child.getVehicleUsage()));
             //提取方式 1提取全部 2提取部分
             Integer extractWay = child.getExtractWay();
             orderGoods.setExtractWay(extractWay);

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

@@ -97,6 +97,7 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
 
             orderGoods.setLossPrice(orderInfo.getLossPrice());
             orderGoods.setTruckDemand(TruckDemandEnum.TruckType.OWNER_CAR.getCode());
+            orderGoods.setVehicleUsage(Integer.valueOf(child.getVehicleUsage()));
 
             //提取方式 1提取全部 2提取部分
             Integer extractWay = child.getExtractWay();

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

@@ -112,6 +112,7 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
 
             orderGoods.setLossPrice(orderInfo.getLossPrice());
             orderGoods.setTruckDemand(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode());
+            orderGoods.setVehicleUsage(Integer.valueOf(child.getVehicleUsage()));
 
             //提取方式 1提取全部 2提取部分
             Integer extractWay = child.getExtractWay();