订单无法添加

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -334,8 +334,8 @@ public class AdminCustomerController {
         for (int i = 0; i < list.size(); i++) {
             SalesOrderItem salesOrderItem = list.get(i);
             if (salesOrderItem.getItemIsSource() == 1) { //产品来源 1：产品颜色表，2：配件表
-                Product product = productService.getProductById(salesOrderItem.getItemProductId());
-                ProductColor productColor = productService.getProduceColor(salesOrderItem.getItemProductId());
+                Product product = productService.getProductById(salesOrderItem.getItemColorId());
+                ProductColor productColor = productService.getProduceColor(salesOrderItem.getItemColorId());
                 salesOrderItem.setItemProductType(product.getProductType());
                 salesOrderItem.setItemProductName(product.getProductName());
                 salesOrderItem.setItemProductPic(productColor.getColorPicture());
@@ -346,7 +346,7 @@ public class AdminCustomerController {
                 salesOrderItem.setItemIsSource(1);
                 salesAmount += productColor.getColorDiscount();
             } else if (salesOrderItem.getItemIsSource() == 2) {
-                Product product = productService.getProductById(salesOrderItem.getItemProductId());
+                Product product = productService.getProductByFittingsId(salesOrderItem.getItemProductId());
                 FittingsInfo fittingsInfo = fittingsInfoService.getFittingsById(salesOrderItem.getItemColorId());
                 salesOrderItem.setItemProductType(product.getProductType());
                 salesOrderItem.setItemProductName(product.getProductName());