productType冲突解决，更改订单商品赠品productType字段

src/main/java/com/caimei365/order/model/vo/CartItemVo.java

@@ -94,6 +94,10 @@ public class CartItemVo implements Serializable {
     /**
      * 是否是赠品 2是，其他否
      */
+    private Integer giftType;
+    /**
+     * 商品类型：0其它类型(默认)，1妆字号，2械字号
+     */
     private Integer productType;
     /**
      * 商品是否处于活动状态 1是 0否

src/main/java/com/caimei365/order/model/vo/OrderProductVo.java

@@ -181,7 +181,7 @@ public class OrderProductVo implements Serializable {
     /**
      * 商品类型(0正常商品,1协商赠品,2促销赠品)
      */
-    private Integer productType;
+    private Integer giftType;
 //    /**
 //     * 阶梯价列表(临时用，保存订单阶梯价格)
 //     */

src/main/resources/mapper/BaseMapper.xml

@@ -146,7 +146,7 @@
                p.mainImage AS image,
                cpg.number  AS number,
                0           AS price,
-               2           as productType,
+               2           as giftType,
                p.price    AS originalPrice,
                p.unit      AS unit,
                p.stock     AS stock,
@@ -160,10 +160,9 @@
     <select id="getShopByProductId" resultType="com.caimei365.order.model.vo.CartShopVo">
         SELECT s.shopID AS shopId,
                s.name   AS shopName,
-               s.logo   AS shopLogo,
-               p.productType
+               s.logo   AS shopLogo
         FROM shop s
-                 LEFT JOIN product p ON p.shopID = s.shopID
+        LEFT JOIN product p ON p.shopID = s.shopID
         WHERE p.productId = #{productId}
         LIMIT 1
     </select>

src/main/resources/mapper/CartSellerMapper.xml

@@ -124,12 +124,15 @@
             p.taxPoint AS taxRate,
             p.productCategory,
             p.validFlag AS validFlag,
+            p.productType,
             if(csp.id is not null,1,0) as svipProductFlag,
             csp.priceType as svipPriceType,
             csp.discount as svipDiscount,
-            csp.discountPrice as svipDiscountPrice
+            csp.discountPrice as svipDiscountPrice,
+            cop.productType as giftType
         FROM bp_order_product_cart c
         LEFT JOIN product p ON c.productId = p.productID
+        left join cm_order_product cop on c.productId = cop.productID
         LEFT JOIN cm_svip_product csp ON p.productID = csp.productId
         WHERE c.serviceProviderId = #{serviceProviderId} AND c.clubId = #{clubId} AND c.shopID = #{shopId}
         AND p.productID in

src/main/resources/mapper/OrderCommonMapper.xml

@@ -103,7 +103,7 @@
         cop.buyAgainFlag,
         cop.notOutStore,
         cop.isActProduct AS actProduct,
-        cop.productType,
+        cop.productType AS giftType,
         cop.svipPriceFlag,
         cop.svipPriceType,
         cop.svipDiscount,