From 6332c766b7fb75ab5d14de6b4191cdc3e02c45fa Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 3 Sep 2019 11:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E6=8E=89=E5=89=A9=E4=BD=99=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=B8=BA0=20=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponSendController.java | 2 +- .../src/main/resources/mapper/WxCouponSendMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 988f20990..74c9ccd94 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -54,7 +54,7 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setMerchantId(getUser().getMerchantId()); if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { - wxCouponSend.setMerchantLnventory(0); + wxCouponSend.setMerchantRemain(0); } wxCouponSend.setStatus(wxCouponSend.getStatus()); //库存大于0 diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 6c8d1e800..04910652c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -86,8 +86,8 @@ and cs.conditions->'$.id' = concat(#{merchantId},'') - - and cs.conditions -> '$.merchantLnventory'> #{merchantLnventory} + + and cs.conditions -> '$.merchantRemain'> #{merchantRemain} and cs.id in