订单逻辑修改

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -76,6 +76,7 @@ public class OrderInfo extends BasePo {
     /**
      * 交期
      */
+    @NotNull(message = "交货时间不能为空")
     private Date deliveryTime;
 
     /**
@@ -155,7 +156,6 @@ public class OrderInfo extends BasePo {
     /**
      * 发货时间
      */
-    @NotNull(message = "交货时间不能为空")
     private Date shippingTime;
 
     /**

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -1,7 +1,6 @@
 package com.sd.business.service.order.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -137,7 +136,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     public void add(OrderInfoDto orderDto) {
         orderDto.setSource(1);
         orderDto.setCode("PI" + new Date().getTime());
-        orderDto.setDeliveryTime(DateUtil.offsetDay(new Date(), 1));
         orderDto.setSettlementStatus(1);
         orderDto.setTaxRate(new BigDecimal("10.00"));
         orderDto.setTag("0");

sd-business/src/main/java/com/sd/business/service/price/impl/PriceBillingStandardServiceImpl.java

@@ -65,9 +65,9 @@ public class PriceBillingStandardServiceImpl extends ServiceImpl<PriceBillingSta
     public void add(PriceBillingStandardDto priceBillingStandardDto) {
         this.save(priceBillingStandardDto);
 
-        List<PriceBillingStandardDetail> priceBillingStandardDetailList = priceBillingStandardDto.getPriceBillingStandardDetailList();
-        priceBillingStandardDetailList.forEach(item -> item.setPriceBillingStandardId(priceBillingStandardDto.getId()));
-        priceBillingStandardDetailService.saveBatch(priceBillingStandardDetailList);
+        List<PriceBillingStandardDetail> list = priceBillingStandardDto.getPriceBillingStandardDetailList();
+        list.forEach(item -> item.setPriceBillingStandardId(priceBillingStandardDto.getId()));
+        priceBillingStandardDetailService.saveBatch(list);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -75,11 +75,10 @@ public class PriceBillingStandardServiceImpl extends ServiceImpl<PriceBillingSta
     public void edit(PriceBillingStandardDto priceBillingStandardDto) {
         this.updateById(priceBillingStandardDto);
 
-        List<PriceBillingStandardDetail> priceBillingStandardDetailList = priceBillingStandardDto.getPriceBillingStandardDetailList();
-
         // 更新关联
-        priceBillingStandardDetailService.editLinked(priceBillingStandardDetailList,
-                PriceBillingStandardDetail::getPriceBillingStandardId, priceBillingStandardDto.getId());
+        List<PriceBillingStandardDetail> list = priceBillingStandardDto.getPriceBillingStandardDetailList();
+        list.forEach(item -> item.setPriceBillingStandardId(priceBillingStandardDto.getId()));
+        priceBillingStandardDetailService.editLinked(list, PriceBillingStandardDetail::getPriceBillingStandardId, priceBillingStandardDto.getId());
     }
 
     @Transactional(rollbackFor = Exception.class)

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -286,6 +286,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         orderInfo.setRemark(wlnOrder.getString("remark"));
         orderInfo.setTaxRate(new BigDecimal("10.00"));
         orderInfo.setTag("0");
+        orderInfo.setSettlementStatus(1);
 
         StringBuilder builder = new StringBuilder();
         // 订单来源平台