From 534fe97d8a29202343cb0c470a976cb82f0256f6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 9 May 2019 16:28:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E7=BC=B4=E5=95=86=E6=88=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 7 ++++++- .../java/com/iformall/domain/po/WxCoupon.java | 11 +++++++++++ .../com/iformall/mapper/WxCouponMapper.java | 7 +++++++ .../com/iformall/service/WxCouponService.java | 6 ++++++ .../service/impl/WxCouponServiceImpl.java | 5 +++++ .../main/resources/mapper/WxCouponMapper.xml | 18 ++++++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) 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 8a153090d..31cc41fd3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -180,7 +180,12 @@ public class WxCouponController extends BaseController { return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); } - + @ApiOperation("商户活动列表信息") + @GetMapping("findByMerchant") + @SystemControllerLog(description = "商户活动列表信息") + public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) { + return new ResultData(wxCouponService.findByMerchant(wxCoupon)); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 788153e17..5af9ab287 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -201,6 +201,9 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgInventory") private Integer orgInventory; + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + @Transient + private Long merchantId; //营销分析 private WxCouponStatisVo wxCouponStatisVo; @@ -213,6 +216,14 @@ public class WxCoupon extends BaseEntity { this.wxCouponStatisVo = wxCouponStatisVo; } + public Long getMerchantId() { + return merchantId; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } + public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index c685d0db7..3e2b91047 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -75,4 +75,11 @@ public interface WxCouponMapper extends CommonMapper { // 库存,有效期修改 int updateStockAndValidDate(WxCoupon wxCoupon); + + /** + * 查询商户的卷信息 + * @param wxCoupon + * @return + */ + List findByMerchant(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 77c075d60..21728264a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -199,4 +199,10 @@ public interface WxCouponService { */ ResultData updateCouponStockAndEndTime(WxCoupon wxCoupon); + /** + * 查询商户的卷信息 + * @param wxCoupon + * @return + */ + List findByMerchant(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 43e75073f..689be3748 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -529,4 +529,9 @@ public class WxCouponServiceImpl implements WxCouponService { } return new ResultData(); } + + @Override + public List findByMerchant(WxCoupon wxCoupon) { + return wxCouponMapper.findByMerchant(wxCoupon); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 1fd752a14..51d16f62b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -801,4 +801,22 @@ wx_coupon wc on wc.id = ct.coupon_id where ct.`sub_target_id` = #{id} + + +