Merge branch 'ww' into test

2024-10-12 17:38:26 +08:00
parent 5781ed9c13 440558c590
commit eb8a91ad41
1 changed files with 1 additions and 1 deletions
--- a/src/main/resources/mapper/TbProskuConMapper.xml
+++ b/src/main/resources/mapper/TbProskuConMapper.xml
@@ -143,7 +143,7 @@

  <select id="selectByShopIdAndSkuIdAndProductId" resultMap="BaseResultMap">

-    select * from tb_prosku_con where product_sku_id=#{skuId} and shop_id=#{shopId} and product_id=#{productId} and status=1
+    select * from tb_prosku_con where product_sku_id=#{skuId} or  product_sku_id='0' and shop_id=#{shopId} and product_id=#{productId} and status=1
    </select>

  <select id="selectByShopIdAndSkuIdAndProductIdAndCheck" resultMap="BaseResultMap">