From 69f4ff1eb5f15927a98c78cd6173f90c7498b8f1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 25 Jun 2019 20:02:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7=E8=90=A5=E9=94=80=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1][=E4=BF=AE=E6=94=B9][tenantId=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8A=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/market/WxCouponController.java | 1 + .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 2 ++ mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 353a24fed..679d3c9b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -273,6 +273,7 @@ public class WxCouponController extends BaseController { if(wxCoupon.getEnddate() == null){ wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } + wxCoupon.setTenantId(getTenantId()); return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 18ffe2c96..bce6667ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -100,6 +100,8 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxCouponMapper.findPressData".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c7e7967d0..e697f54bf 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -659,6 +659,9 @@ *100,2) as payment_rate from wx_coupon c where c.type = 8 + + and c.tenant_id=#{tenantId} + and c.id = #{id}