Merge remote-tracking branch 'origin/developerD' into developer

src/main/resources/mapper/CouponMapper.xml

@@ -74,7 +74,7 @@
         p.priceFlag,
         (select price from cm_sku where productId=p.productID and organizeId = 0 order by price asc limit 1)as price,
         (select costPrice from cm_sku where productId=p.productID and organizeId = 0 order by price asc limit 1)as costPrice,
-        (select costCheckFlag from cm_sku where productId=p.productID and organizeId = 0 order by price asc limit 1)as costCheckFlag,
+        (SELECT costCheckFlag FROM cm_organize_product_info WHERE productId = p.productId and organizeId = 0 limit 1)as costCheckFlag,
         p.shopID AS shopId,
         p.searchKey AS keyword,
         (select minBuyNumber from cm_sku where productId=p.productID and organizeId = 0 order by price asc limit 1) AS minBuyNumber,

src/main/resources/mapper/HeheMapper.xml

@@ -346,7 +346,7 @@
         select cs.skuId,
                cs.unit,
                cs.productId,
-               cs.costCheckFlag,
+               (SELECT costCheckFlag FROM cm_organize_product_info WHERE productId = cs.productId AND organizeId = cs.organizeId ) AS costCheckFlag,
                cs.costPrice,
                cs.shopPercent as costProportional,
                cs.stock,

src/main/resources/mapper/PageMapper.xml

@@ -375,7 +375,7 @@
                p.priceFlag,
                cs.price,
                cs.costPrice,
-               ifnull(cs.costCheckFlag, 1) as costCheckFlag,
+               ifnull((SELECT costCheckFlag FROM cm_organize_product_info WHERE productId = cs.productId AND organizeId = cs.organizeId ), 1) as costCheckFlag,
                p.searchKey                 as keyword,
                cs.minBuyNumber             as minBuyNumber,
                cs.ladderPriceFlag,

src/main/resources/mapper/PriceMapper.xml

@@ -134,10 +134,12 @@
         from repeat_purchase_price r
                  left join product p on p.productID = r.productId
                  left join cm_sku cs on r.skuId = cs.skuId
+                 LEFT JOIN cm_organize_product_info copi ON copi.productId = p.productId
         where r.skuId = #{skuId}
           and cs.organizeId = 0
+          and copi.organizeId = 0
           and userId = #{userId}
-          and ((cs.costCheckFlag = 1 and r.currentPrice <![CDATA[ >= ]]> cs.costPrice) or cs.costCheckFlag = 2)
+          and ((copi.costCheckFlag = 1 and r.currentPrice <![CDATA[ >= ]]> cs.costPrice) or copi.costCheckFlag = 2)
           and cs.price <![CDATA[ >= ]]> r.currentPrice
           and r.delFlag = 0
     </select>
@@ -210,7 +212,7 @@
                normalPrice,
                costPrice,
                ifnull(ladderPriceFlag, 0)                                                                           as ladderPriceFlag,
-               costCheckFlag,
+               (SELECT costCheckFlag FROM cm_organize_product_info WHERE productId = cs.productId AND organizeId = cs.organizeId ) AS costCheckFlag,
                shopPercent as costProportional,
                ifnull(stock, 0)                                                                                     as stock,
                unit,
@@ -268,7 +270,7 @@
     <select id="findSkusOutOfPrice" resultType="com.caimei365.commodity.model.dto.Sku">
         select skuId,
                ifnull(ladderPriceFlag, 0)                                                                           as ladderPriceFlag,
-               costCheckFlag,
+               (SELECT costCheckFlag FROM cm_organize_product_info WHERE productId = cs.productId AND organizeId = cs.organizeId ) AS costCheckFlag,
                shopPercent as costProportional,
                ifnull(stock, 0)                                                                                     as stock,
                unit,

src/main/resources/mapper/ShopMapper.xml

@@ -305,7 +305,7 @@
          organizeId,
          normalPrice,
          price,
-         costCheckFlag,
+         -- costCheckFlag,
          costprice,
          stock,
          minBuyNumber,
@@ -318,7 +318,7 @@
                 #{organizeId},
                 #{normalPrice},
                 #{price},
-                ifnull(#{costCheckFlag}, 1),
+                -- ifnull(#{costCheckFlag}, 1),
                 #{costPrice},
                 #{stock},
                 #{minBuyNumber},
@@ -616,7 +616,7 @@
                sellNumber,
                sortIndex,
                featuredFlag,
-               (select costCheckFlag from cm_sku where productId=p.productId and organizeId = 0 order by price asc LIMIT 1)as costCheckFlag,
+               (SELECT costCheckFlag FROM cm_organize_product_info WHERE productId = p.productId and organizeId = 0 LIMIT 1)as costCheckFlag,
                recommendType,
                machineType,
                productCode,