订单运单增加提交增加结算方式字段

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

@@ -89,6 +89,8 @@ public class OrderChild implements HasKey<Integer> {
     private LocalDateTime expectReceiveTime;                      //预计到达目的地时间
 
     private Integer settlementAccountPeriod;                 //结算账期  1拉运完成结  2月结
+    
+    private Integer settlementWay;                          //结算方式  1装车净重 2卸车净重
 
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -169,6 +169,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("结算账期  1拉运完成结  2月结")
     private Integer settlementAccountPeriod;
 
+    @TableField("settlement_way")
+    @ApiModelProperty("结算方式  1装车净重 2卸车净重")
+    private Integer settlementWay;
+
     @TableField("stop_flag")
     @ApiModelProperty("是否暂停 0：否   1：是")
     private Integer stopFlag;

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

@@ -165,8 +165,11 @@ public class OneGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setLastLoadTime(DateUtils.parseDateTime(child.getLastLoadTime()).get());
             orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
 
-            //设置结账周期
+            //设置结算周期
             orderGoods.setSettlementAccountPeriod(orderInfo.getSettlementAccountPeriod());
+            //设置结算方式
+            orderGoods.setSettlementWay(orderInfo.getSettlementWay());
+
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());

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

@@ -167,8 +167,10 @@ public class ThreeGoodsOrderStrategy extends GoodsOrderStrategy implements Initi
             orderGoods.setLastLoadTime(DateUtils.parseDateTime(child.getLastLoadTime()).get());
             orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
 
-            //设置结账周期
+            //设置结算周期
             orderGoods.setSettlementAccountPeriod(orderInfo.getSettlementAccountPeriod());
+            //设置结算方式
+            orderGoods.setSettlementWay(orderInfo.getSettlementWay());
             List<OrderOwnTruckVo> orderOwnTruckVos = orderFeign.selectTruckListFeign(orderNo);
             if (orderOwnTruckVos == null || orderOwnTruckVos.isEmpty()) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "全部自由车辆列表数据为空");

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

@@ -171,8 +171,10 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
 
 
-            //设置结账周期
+            //设置结算周期
             orderGoods.setSettlementAccountPeriod(orderInfo.getSettlementAccountPeriod());
+            //设置结算方式
+            orderGoods.setSettlementWay(orderInfo.getSettlementWay());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());