订单修改

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

@@ -1552,6 +1552,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 itemSaleItem.setItemProductName(productColor.getProductName());
                 itemSaleItem.setItemProductType(productColor.getProductType());
                 itemSaleItem.setItemColorId(productColor.getColorId());
+                 /*查询成本*/
+                SupplierProduct supplierProduct = supplierProductMapper.getSupplierProductByColorId(itemSaleItem.getItemColorId());
+                if(supplierProduct != null){
+                    itemSaleItem.setItemCost(supplierProduct.getSpCost());
+                    itemSaleItem.setItemCostTotal(supplierProduct.getSpCost() * itemSaleItem.getItemNum());
+                }else{
+                    throw  new RuntimeException("确认订单失败-未查询到该产品（"+ itemSaleItem.getItemProductName() +"-"+ itemSaleItem.getItemProductColor() +"）的成本价格");
+                }
+
                 if(salesOrder.getSalesId() != null){
                     itemSaleItem.setItemOrderId(salesOrder.getSalesId());
                 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1642,7 +1642,7 @@ public class AdminSalesOrderController {
             }
         }catch (Exception e){
             e.printStackTrace();
-            responseJson.setResultMsg("拆单订单失败！");
+            responseJson.setResultMsg("拆单订单失败！"+e.getMessage());
             return responseJson;
         }
         return ResponseJson.getSUCCESS();