Merge remote-tracking branch 'origin/zx_saas_goods' into zx_saas_goods

mec-biz/src/main/resources/config/mybatis/GoodsSubMapper.xml

@@ -17,6 +17,6 @@
         </foreach>
     </update>
     <select id="queryChildGoods" resultType="com.ym.mec.biz.dal.dto.ComplementGoodsDto">
-        select sku_ skuStockId,goods_id_ goodsId,goods_price_ organCostPrice from goods_sub where goods_id_ = 1
+        select sku_ skuStockId,goods_id_ goodsId,goods_price_ organCostPrice from goods_sub where goods_id_ = #{goodsId}
     </select>
 </mapper>

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsCartItemServiceImpl.java

@@ -203,7 +203,8 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
         example.createCriteria().andDeleteStatusEqualTo(0)
                 .andIdEqualTo(id).andMemberIdEqualTo(memberId);
         cartItemMapper.updateByExampleSelective(cartItem, example);
-        return pmsSkuStock.getStock() - pmsSkuStock.getLockStock();
+//        return pmsSkuStock.getStock() - pmsSkuStock.getLockStock();
+        return 1;
     }
 
     @Override