货单和运单增加结账周期字段

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

@@ -167,7 +167,7 @@ public class OrderGoods implements HasKey<Integer> {
 
     @TableField("settlement_account_period")
     @ApiModelProperty("结算账期  1拉运完成结  2月结")
-    private String settlementAccountPeriod;
+    private Integer settlementAccountPeriod;
 
     @TableField("stop_flag")
     @ApiModelProperty("是否暂停 0：否   1：是")

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

@@ -266,6 +266,10 @@ public class OrderChildServiceImpl implements OrderChildService {
         LocalDateTime[] times = calcExpectTime(truckNo,orderGoods);
         orderChild.setExpectSendTime(times[0]);
         orderChild.setExpectReceiveTime(times[1]);
+
+        //设置运单的结账周期
+        orderChild.setSettlementAccountPeriod(orderGoods.getSettlementAccountPeriod());
+
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, truckLoad);
 

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

@@ -153,6 +153,8 @@ 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());
             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

@@ -157,6 +157,8 @@ 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());
             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

@@ -161,6 +161,9 @@ public class TwoGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
             orderGoods.setLastLoadTime(DateUtils.parseDateTime(child.getLastLoadTime()).get());
             orderGoods.setLastArriveReceiveTime(DateUtils.parseDateTime(child.getLastArriveReceiveTime()).get());
 
+
+            //设置结账周期
+            orderGoods.setSettlementAccountPeriod(orderInfo.getSettlementAccountPeriod());
             if (CollectionUtil.isNotEmpty(child.getTruckList())) {
                 orderGoodsTruckBindDao.saveBatchEntity(orderNo, orderGoodsNo, child.getTruckList(), now);
                 goodsOrderTruckRecordComponent.saveTruckRecord(orderGoodsNo, child.getTruckList());