~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-03-22 b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java

@@ -146,7 +146,6 @@
    @ResponseBody
    public AjaxResult getShopProductShowList(@RequestBody ShopProduct shopProduct) {
        List<ShopProduct> shopProducts = null;
        shopProduct.setMallType(ShopProduct.MALL_MICRO);
        //查询是否匹配优惠条件
        ShopCoupon shopCoupon = shopCouponDao.getCouponByTitle(shopProduct.getTitle(),HostInterceptor.getCompanyId());
        if (shopCoupon != null && shopProduct.getOffset() < 1) {

			@@ -146,7 +146,6 @@
			@ResponseBody
			public AjaxResult getShopProductShowList(@RequestBody ShopProduct shopProduct) {
			List<ShopProduct> shopProducts = null;
			shopProduct.setMallType(ShopProduct.MALL_MICRO);
			//查询是否匹配优惠条件
			ShopCoupon shopCoupon = shopCouponDao.getCouponByTitle(shopProduct.getTitle(),HostInterceptor.getCompanyId());
			if (shopCoupon != null && shopProduct.getOffset() < 1) {