承运优化需求-订单运单增加来源

performance-api/src/main/java/com/clx/performance/enums/SyncPlatformEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+
+
+@Getter
+@AllArgsConstructor
+public enum SyncPlatformEnum {
+
+    ;
+    @Getter
+    @AllArgsConstructor
+    public enum Source {
+        TRADE_PLATFORM(1, "数煤宝"),
+        OWNER_PLATFORM(2, "承运货主"),
+        NEW_OWNER_CLIENT(3, "供应链"),
+        ;
+        private final Integer code;
+        private final String name;
+
+
+        public static Optional<Source> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> Objects.equals(e.code,code)).findFirst();
+        }
+
+        public static String getNameByCode(Integer code) {
+            if (code == null) {return null;}
+            return getByCode(code).map(Source::getName).orElse(null);
+        }
+    }
+}

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

@@ -20,6 +20,12 @@ import java.util.List;
 @ToString
 public class PageCarrierOrderChildParam extends PageParam {
 
+    @ApiModelProperty(value = "订单来源: 1数煤宝 2承运货主 3供应链")
+    private Integer orderSource;
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
     @ApiModelProperty(value = "货单编号")
     private String orderGoodsNo;
 

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

@@ -15,6 +15,9 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 public class PageOrderGoodsListParam extends PageParam {
 
+    @ApiModelProperty(value = "订单来源: 1数煤宝 2承运货主 3供应链")
+    private Integer orderSource;
+
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
 
@@ -39,5 +42,7 @@ public class PageOrderGoodsListParam extends PageParam {
     @ApiModelProperty(value="收货地址",example = "黄羊城")
     private String receiveAddress;
 
+    @ApiModelProperty("用车方式 1：平台车辆配货 2：自有车辆配货")
+    private Integer vehicleUsage;
 
 }

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -3,6 +3,7 @@ package com.clx.performance.vo.app;
 import cn.hutool.json.JSONUtil;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.OrderGoodsEnum;
+import com.clx.performance.enums.SyncPlatformEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -343,4 +344,11 @@ public class OrderChildVO {
         }
         return new ArrayList<>();
     }
+
+    @ApiModelProperty(value = "订单来源")
+    private Integer orderSource;
+    private String orderSourceMsg;
+    public String getOrderSourceMsg() {
+        return SyncPlatformEnum.Source.getNameByCode(orderSource);
+    }
 }

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

 package com.clx.performance.vo.pc;
 
+import com.clx.performance.enums.SyncPlatformEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -129,4 +130,11 @@ public class CarrierOrderChildDetailVO {
 
     @ApiModelProperty(value = "目的地详细地址")
     private String receiveDetailAddress;
+
+    @ApiModelProperty(value = "订单来源")
+    private Integer orderSource;
+    private String orderSourceMsg;
+    public String getOrderSourceMsg() {
+        return SyncPlatformEnum.Source.getNameByCode(orderSource);
+    }
 }
\ No newline at end of file

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

 package com.clx.performance.vo.pc;
 
 import com.clx.performance.enums.OrderGoodsEnum;
+import com.clx.performance.enums.SyncPlatformEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -226,4 +227,18 @@ public class OrderGoodsVO {
     public String getReceiveWaitModeMsg() {
         return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(receiveWaitMode);
     }
+
+    @ApiModelProperty(value = "订单来源")
+    private Integer orderSource;
+    private String orderSourceMsg;
+    public String getOrderSourceMsg() {
+        return SyncPlatformEnum.Source.getNameByCode(orderSource);
+    }
+
+    @ApiModelProperty("已接单车数")
+    private Integer alreadyLoadTruckAmount;
+
+    @ApiModelProperty("已拉运车数")
+    private Integer alreadyTransportTruckAmount;
+
 }
\ No newline at end of file

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

 package com.clx.performance.vo.pc;
 
+import com.clx.performance.enums.SyncPlatformEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -21,6 +22,9 @@ public class PageCarrierOrderChildVO {
     @ApiModelProperty(value="运单状态",example = "1")
     private Integer status;
 
+    @ApiModelProperty(value="订单编号",example = "41441")
+    private String orderNo;
+
     @ApiModelProperty(value="货单编号",example = "41441")
     private String orderGoodsNo;
 
@@ -73,7 +77,11 @@ public class PageCarrierOrderChildVO {
     @ApiModelProperty(value = "车牌号",example = "晋A12345")
     private String truckNo;
 
-
-
+    @ApiModelProperty(value = "订单来源")
+    private Integer orderSource;
+    private String orderSourceMsg;
+    public String getOrderSourceMsg() {
+        return SyncPlatformEnum.Source.getNameByCode(orderSource);
+    }
 
 }
\ No newline at end of file

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

@@ -211,4 +211,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderGoodsNotCancelChildDTO> countValidByOrderGoodsNoList(List<String> orderGoodsList);
 
     void batchUpdateCancel(List<OrderChild> canCancelOrderChildList);
+
+    int countTakeByOrderGoodsNo(String orderGoodsNo);
+    int countLoadByOrderGoodsNo(String orderGoodsNo);
 }

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

@@ -703,4 +703,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public void batchUpdateCancel(List<OrderChild> canCancelOrderChildList) {
         baseMapper.batchUpdateCancel(canCancelOrderChildList);
     }
+
+    @Override
+    public int countTakeByOrderGoodsNo(String orderGoodsNo) {
+        return baseMapper.countTakeByOrderGoodsNo(orderGoodsNo);
+    }
+
+    @Override
+    public int countLoadByOrderGoodsNo(String orderGoodsNo) {
+        return baseMapper.countLoadByOrderGoodsNo(orderGoodsNo);
+    }
 }

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

@@ -183,4 +183,13 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
     @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateCancel")
     void batchUpdateCancel(List<OrderChild> canCancelOrderChildList);
+
+    @Select("select count(*) from order_child " +
+            " where order_goods_no=#{orderGoodsNo} and status in(10,20,30,40,50,60,70,80,90,100)")
+    int countTakeByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
+
+    @Select("select count(*) from order_child " +
+            " where order_goods_no=#{orderGoodsNo} and status in(50,60,70,80,90,100)")
+    int countLoadByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
+
 }
\ No newline at end of file

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

@@ -119,6 +119,8 @@ public class OrderChild implements HasKey<Integer> {
      */
     private Integer removeLoadLimitStatus;
 
+    private Integer orderSource;            //订单来源
+
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间
 

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

@@ -208,6 +208,8 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("是否支持借款：0:否 1:是")
     private Integer supportLoan;
 
+    private Integer orderSource;            //订单来源
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -481,6 +481,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChildLoanComponent.getChildDetermine(orderInfo, ownerInfo, orderGoods, childNo);
 
         OrderChild orderChild = new OrderChild();
+        orderChild.setOrderSource(orderInfo.getOrderSource());
         orderChild.setChildNo(childNo);
         orderChild.setUserNo(userNo);
 
@@ -2574,6 +2575,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         fieldList.add(new ExcelField(18, "发货地址", "sendAddress", 10000));
         fieldList.add(new ExcelField(19, "收货地址", "receiveAddress", 10000));
 
+        fieldList.add(new ExcelField(20, "订单编号", "receiveAddress", 10000));
+        fieldList.add(new ExcelField(21, "订单来源", "receiveAddress", 10000));
+
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
         for (int i=0; i<list.size(); i++){
@@ -2609,6 +2613,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             rowData.add(new ExcelData(dto.getSendAddress()));
             rowData.add(new ExcelData(dto.getReceiveAddress()));
 
+            rowData.add(new ExcelData(dto.getOrderNo()));
+            rowData.add(new ExcelData(dto.getOrderSourceMsg(), "-"));
+
             dataList.add(rowData);
         }
 

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

@@ -853,6 +853,10 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
                 this.calcOrderGoodsResidueWeight(orderGoodsVO.getExtractWeight(),orderGoodsVO.getAlreadyTransportWeight())
         );
 
+        // 车数
+        orderGoodsVO.setAlreadyLoadTruckAmount(orderChildDao.countTakeByOrderGoodsNo(orderGoodsVO.getOrderGoodsNo()));
+        orderGoodsVO.setAlreadyTransportTruckAmount(orderChildDao.countLoadByOrderGoodsNo(orderGoodsVO.getOrderGoodsNo()));
+
         String orderNo = orderGoodsVO.getOrderNo();
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
 

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

@@ -129,6 +129,8 @@ public class OrderChildSqlProvider {
                 if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("finish_time <= #{param.endTime}");}
             }
 
+            if (Objects.nonNull(param.getOrderSource())) {WHERE("order_source = #{param.orderSource}");}
+            if (StringUtils.isNotBlank(param.getOrderNo())) {WHERE("order_no = #{param.orderNo}");}
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {WHERE("order_goods_no = #{param.orderGoodsNo}");}
             if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
             if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}

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

@@ -76,6 +76,8 @@ public class OrderGoodsSqlProvider {
                     WHERE("a.order_goods_status = #{param.orderGoodsStatus}");
                 }
             }
+            if (Objects.nonNull(param.getOrderSource())) {WHERE("order_source = #{param.orderSource}");}
+            if (Objects.nonNull(param.getVehicleUsage())) {WHERE("vehicle_usage = #{param.vehicleUsage}");}
 
             if (StringUtils.isNotBlank(param.getOrderNo())) {
                 WHERE("a.order_no = #{param.orderNo}");

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

@@ -104,6 +104,7 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
         for (OrderGoodsChildParams child : childParamsList) {
 
             OrderGoods orderGoods = new OrderGoods();
+            orderGoods.setOrderSource(orderInfo.getOrderSource());
             //提取吨数
             orderGoods.setExtractWeight(child.getExtractWeight());
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);

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

@@ -107,6 +107,8 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
                 }
             }
             OrderGoods orderGoods = new OrderGoods();
+            orderGoods.setOrderSource(orderInfo.getOrderSource());
+
             //提取吨数
             orderGoods.setExtractWeight(child.getExtractWeight());
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);

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

@@ -105,6 +105,8 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
                 }
             }
             OrderGoods orderGoods = new OrderGoods();
+            orderGoods.setOrderSource(orderInfo.getOrderSource());
+
             //提取吨数
             orderGoods.setExtractWeight(child.getExtractWeight());
             orderGoods.setAlreadyTransportWeight(BigDecimal.ZERO);