上加商品，修改库存设计

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductColorMapper.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.mapper;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.product.ProductColor;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 产品颜色	mapper
@@ -90,7 +91,7 @@ public interface ProductColorMapper {
 	 * @param num
 	 * @return
 	 */
-	Integer updateAddSoldNum(Integer colorId, Integer num);
+	Integer updateAddSoldNum(@Param("colorId")Integer colorId, @Param("num")Integer num);
 
 	/**
 	 * 售出修改数量
@@ -98,5 +99,5 @@ public interface ProductColorMapper {
 	 * @param num
 	 * @return
 	 */
-	Integer updateMinusSoldNum(Integer colorId, Integer num);
+	Integer updateMinusSoldNum(@Param("colorId")Integer colorId, @Param("num")Integer num);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -196,9 +196,20 @@
 
 	<!-- 根据orderId获取订单项数据 -->
 	<select id="getShopOrderItemByOrderId" parameterType="String" resultType="OrderItem">
-		SELECT I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice, 
-			I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal, C.COLOR_NAME productColor,
-			C.COLOR_69CODE produectRemark, I.ITEM_PRODUCT_TYPE itemProductType
+		SELECT
+			I.item_id itemId,
+			I.item_sales_orderid itemSalesOrderid,
+			I.ITEM_PRODUCT_NAME itemProductName,
+			I.ITEM_PRODUCT_PIC itemProductPic,
+			I.ITEM_PRODUCT_PRICE itemProductPrice,
+			I.ITEM_PRODUCT_DISCOUNT itemProductDiscount,
+			I.ITEM_NUM itemNum,
+			I.ITEM_TOTAL itemTotal,
+			I.item_color_id itemColorId,
+			I.item_product_id itemProductId,
+			C.COLOR_NAME productColor,
+			C.COLOR_69CODE produectRemark,
+			I.ITEM_PRODUCT_TYPE itemProductType
 		FROM 
 			TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P 
 			ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID 

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productColorMapper.xml

@@ -154,7 +154,7 @@
 	<update id="updateAddSoldNum" parameterType="Integer">
 		UPDATE TB_IAMBERRY_PRODUCT_COLOR
 		<set>
-			color_sold_num = color_sold_num + #{colorId},
+			color_sold_num = color_sold_num + #{num},
 			COLOR_UPDATE_TIME=NOW()
 		</set>
 		WHERE COLOR_ID = #{colorId}
@@ -164,7 +164,7 @@
 	<update id="updateMinusSoldNum" parameterType="Integer">
 		UPDATE TB_IAMBERRY_PRODUCT_COLOR
 		<set>
-			color_sold_num = color_sold_num - #{colorId},
+			color_sold_num = color_sold_num - #{num},
 			COLOR_UPDATE_TIME=NOW()
 		</set>
 		WHERE COLOR_ID = #{colorId}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -644,7 +644,7 @@ public class AdminOrderHandlers {
                         List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
                         /*调整库存 - 同意退款，库存返回*/
                         for (int i = 0; i < orderItemList.size(); i++) {
-                            Integer fl = productColorService.updateAddSoldNum(orderItemList.get(i).getItemColorId(),orderItemList.get(i).getItemNum());
+                            Integer fl = productColorService.updateMinusSoldNum(orderItemList.get(i).getItemColorId(),orderItemList.get(i).getItemNum());
                             if (fl < 1) {
                                 logger.info("退款修改数量失败，订单号为:" +orderItemList.get(i).getItemSalesOrderid() );
                             }else{

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -666,8 +666,8 @@ public class OrderHandler {
 			List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(order.getSalesOrderid());
 			/*调整库存*/
 			for (int i = 0; i < orderItemList.size(); i++) {
-				Integer fl = productColorService.updateMinusSoldNum(orderItemList.get(i).getItemColorId(),orderItemList.get(i).getItemNum());
-				if (fl < 1) {
+				Integer fl = productColorService.updateAddSoldNum(orderItemList.get(i).getItemColorId(),orderItemList.get(i).getItemNum());
+ 				if (fl < 1) {
 					ratFWLogger.info("售出修改数量失败，订单号为:" +orderItemList.get(i).getItemSalesOrderid() );
 				}else{
 					ratFWLogger.info("售出修改数量成功，订单号为:" +orderItemList.get(i).getItemSalesOrderid()

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -251,7 +251,7 @@ public class ResponseWechatPayHandler {
 
 						/*调整库存*/
 						for (int i = 0; i < orderItemList.size(); i++) {
-							Integer fl = productColorService.updateMinusSoldNum(orderItemList.get(i).getItemColorId(),orderItemList.get(i).getItemNum());
+							Integer fl = productColorService.updateAddSoldNum(orderItemList.get(i).getItemColorId(),orderItemList.get(i).getItemNum());
 							if (fl < 1) {
 								ratFWLogger.info("售出修改数量失败，订单号为:" +orderItemList.get(i).getItemSalesOrderid() );
 							}else{