hyq %!s(int64=5) %!d(string=hai) anos
pai
achega
269dfb574e

+ 1 - 1
kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -631,7 +631,7 @@ public class ApiOrderService {
                 && goodsInfo.getGoodsBizType().equalsIgnoreCase(Dict.orderBizType.item_00.getItem())) {
             GoodsVo goodsVo = new GoodsVo();
             goodsVo.setId(goodsInfo.getId());
-            //商品库存数量变化后是否已共享,0:否,1:是(下单、退款触发)
+            //商品库存数量变化后是否已共享,0:否,1:是(下单、退款、取消订单触发)
             goodsVo.setIsGoodsShareStock(Dict.isGoodsShareStock.item_0.getItem());
             apiGoodsMapper.updateByGoodsShareStock(goodsVo);
         }

+ 3 - 0
kmall-api/src/main/resources/mybatis/mapper/ApiCartMapper.xml

@@ -191,6 +191,9 @@
         LEFT JOIN mk_store_camp_minus m ON m.camp_minus_id = g.camp_minus_id
         where 1 = 1  and b.is_delete = 0 and b.is_on_sale = 1 and b.goods_number > 0
         and psr.stock_num > 0
+        <if test="checkCart != null and checkCart == '11'">
+            and b.goods_biz_type = '11'
+        </if>
         <if test="checkCart != null and checkCart != '11'">
             and b.goods_biz_type != '11'
         </if>