修改客户信息

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

@@ -287,40 +287,50 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
 
             //判断主从订单--------------------end
-
             try {
-                msg = addRstOrderinfo(mainOrder);
-                if (msg){
-                    if(listSalesOrder.size() > 0){
-                        for (int i = 0;i<listSalesOrder.size();i++){
-                            listSalesOrder.get(i).setSalesDealCode(listSalesOrder.get(i).getSalesDealCode()+"-"+(i+1));
-                            listSalesOrder.get(i).setSalesMainOrderId(mainOrder.getSalesId());
-                            listSalesOrder.get(i).setSalesId(null);
-                            msg = addRstOrderinfo(listSalesOrder.get(i));
-                        }
-                    }
-                }
+                msg = addRstOrderinfo(mainOrder,listSalesOrder);
             }catch (Exception e){
-                throw  new RuntimeException("添加订单出错--------！");
+                return false;
             }
         }
         return msg;
     }
+
+
     @Transactional
-    private boolean addRstOrderinfo(SalesOrder salesOrder) {
-            //添加订单数据
-            int orderNum = salesOrderMapper.addSalesOrder(salesOrder);
-            if (orderNum <= 0) {
-                return false;
-            }
-            for (SalesOrderItem item : salesOrder.getSalesOrderItemList()) {
-                item.setItemOrderId(salesOrder.getSalesId());
-            }
-            //批量添加订单项数据
-            int itemNum = salesOrderMapper.addOrderItemList(salesOrder.getSalesOrderItemList());
-            if (itemNum <= 0) {
-                return false;
+    private boolean addRstOrderinfo(SalesOrder mainOrder,List<SalesOrder> listSalesOrder) throws RuntimeException {
+        int orderNum = salesOrderMapper.addSalesOrder(mainOrder);
+        if (orderNum <= 0) {
+            throw  new RuntimeException("添加订单出错--------！");
+        }
+        for (SalesOrderItem item : mainOrder.getSalesOrderItemList()) {
+            item.setItemOrderId(mainOrder.getSalesId());
+        }
+        //批量添加订单项数据
+        int itemNum = salesOrderMapper.addOrderItemList(mainOrder.getSalesOrderItemList());
+        if (itemNum <= 0) {
+            throw  new RuntimeException("添加订单出错--------！");
+        }else{
+            if(listSalesOrder.size() > 0){
+                for (int i = 0;i<listSalesOrder.size();i++){
+                    listSalesOrder.get(i).setSalesDealCode(listSalesOrder.get(i).getSalesDealCode()+"-"+(i+1));
+                    listSalesOrder.get(i).setSalesMainOrderId(mainOrder.getSalesId());
+                    listSalesOrder.get(i).setSalesId(null);
+                    orderNum = salesOrderMapper.addSalesOrder(listSalesOrder.get(i));
+                    if (orderNum <= 0) {
+                        throw  new RuntimeException("添加订单出错--------！");
+                    }
+                    for (SalesOrderItem item : listSalesOrder.get(i).getSalesOrderItemList()) {
+                        item.setItemOrderId(listSalesOrder.get(i).getSalesId());
+                    }
+                    //批量添加订单项数据
+                    itemNum = salesOrderMapper.addOrderItemList(listSalesOrder.get(i).getSalesOrderItemList());
+                    if (itemNum <= 0) {
+                        throw  new RuntimeException("添加订单出错--------！");
+                    }
+                }
             }
+        }
         return true;
     }