库存规格不一致，取消订单库存不回退

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1196,6 +1196,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 item.setOrderCode(orderSn);
                 item.setCartId(vo.getId());
                 item.setProductId(vo.getProductId());
+                item.setProductAttrValueId(vo.getProductAttrValueId());
                 item.setJsonInfo(JSONUtil.toJsonStr(fsStoreCartDTO));
                 item.setNum(vo.getCartNum());
                 item.setIsAfterSales(0);
@@ -1958,6 +1959,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 item.setOrderCode(orderSn);
                 item.setCartId(vo.getId());
                 item.setProductId(vo.getProductId());
+                item.setProductAttrValueId(vo.getProductAttrValueId());
                 item.setJsonInfo(JSONUtil.toJsonStr(fsStoreCartDTO));
                 item.setNum(vo.getCartNum());
                 item.setIsAfterSales(0);

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderItemScrmMapper.xml

@@ -14,10 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="num"    column="num"    />
         <result property="isAfterSales"    column="is_after_sales"    />
         <result property="isPrescribe"    column="is_prescribe"    />
+        <result property="productAttrValueId"    column="product_attr_value_id"    />
     </resultMap>
 
     <sql id="selectFsStoreOrderItemVo">
-        select item_id, order_id, order_code, cart_id, product_id, json_info, num, is_after_sales,is_prescribe from fs_store_order_item_scrm
+        select item_id, order_id, order_code, cart_id, product_id, json_info, num, is_after_sales, is_prescribe, product_attr_value_id from fs_store_order_item_scrm
     </sql>
 
     <select id="selectFsStoreOrderItemList" parameterType="FsStoreOrderItemScrm" resultMap="FsStoreOrderItemResult">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="num != null">num,</if>
             <if test="isAfterSales != null">is_after_sales,</if>
             <if test="isPrescribe != null">is_prescribe,</if>
+            <if test="productAttrValueId != null">product_attr_value_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="num != null">#{num},</if>
             <if test="isAfterSales != null">#{isAfterSales},</if>
             <if test="isPrescribe != null">#{isPrescribe},</if>
+            <if test="productAttrValueId != null">#{productAttrValueId},</if>
          </trim>
     </insert>
 
@@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="num != null">num = #{num},</if>
             <if test="isAfterSales != null">is_after_sales = #{isAfterSales},</if>
             <if test="isPrescribe != null">is_prescribe = #{isPrescribe},</if>
+            <if test="productAttrValueId != null">product_attr_value_id = #{productAttrValueId},</if>
         </trim>
         where item_id = #{itemId}
     </update>