浏览代码

如果没有指定是否出库,默认未出库

wangxiaoming 5 年之前
父节点
当前提交
3785df68db

+ 9 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -690,6 +690,10 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         //子订单根据快递策略分配物流方式
         setStrategyLogistics(listSalesOrder);
 
+        if(mainOrder.getSalesDeliver() == null){
+            mainOrder.setSalesDeliver(1);
+        }
+
         // 保存订单信息
         int res = salesOrderMapper.addSalesOrder(mainOrder);
         if (res <= 0) {
@@ -712,6 +716,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     listSalesOrder.get(i).setSalesOrderId(listSalesOrder.get(i).getSalesOrderId()+"-"+(i+1));
                 }
                 // 主订单id
+
+                if(listSalesOrder.get(i).getSalesDeliver() == null){
+                    listSalesOrder.get(i).setSalesDeliver(1);
+                }
+
                 listSalesOrder.get(i).setSalesMainOrderId(mainOrder.getSalesId());
                 listSalesOrder.get(i).setSalesId(null);
                 calculationTotal(listSalesOrder.get(i),listSalesOrder.get(i).getSalesOrderItemList());