From bbd70ccaf11c36929ab5ebfcc55e71b1fd229f4b Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 2 Apr 2019 17:33:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E8=B4=A6=E5=8D=95=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxTopicController.java | 8 ++++++++ .../main/java/com/iformall/mapper/WxCouponMapper.java | 4 ++++ .../main/java/com/iformall/mapper/WxTopicMapper.java | 2 ++ .../main/java/com/iformall/service/WxTopicService.java | 4 ++-- .../com/iformall/service/impl/WxTopicServiceImpl.java | 10 ++++++++++ .../src/main/resources/mapper/WxCouponMapper.xml | 7 +++++++ .../src/main/resources/mapper/WxTopicMapper.xml | 1 - 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index 25a006af8..da98f2276 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -32,6 +32,14 @@ public class WxTopicController extends BaseController { return new ResultData(page); } + @GetMapping("findById") + public ResultData findById(WxTopic wxTopic) { + logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); + String tenantId = getTenantId(); + wxTopic.setTenantId(tenantId); + return new ResultData(wxTopicService.findById(wxTopic)); + } + @PostMapping("saveOrUpdate") public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 1ccb54bbd..f956a41db 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxTopic; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; import org.apache.ibatis.annotations.Param; @@ -64,4 +65,7 @@ public interface WxCouponMapper extends CommonMapper { List pressPaymentHistory(WxCoupon wxCoupon); String pressSuccRate(WxCoupon wxCoupon); Long sumJoin(WxCoupon wxCoupon); + + + List findCouponByTopic(WxTopic wxTopic); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java index b705fd12a..fcbf4ff9c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxTopic; import java.util.List; @@ -9,4 +10,5 @@ public interface WxTopicMapper extends CommonMapper { List findList(WxTopic wxTopic); WxTopic show(WxTopic record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxTopicService.java b/mallinkService/src/main/java/com/iformall/service/WxTopicService.java index eeff452c8..93f710846 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxTopicService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxTopicService.java @@ -19,6 +19,6 @@ public interface WxTopicService { ResultData saveOrUpdate(WxTopic record); WxTopic show(WxTopic record); - - + + WxTopic findById(WxTopic record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 60dbd4b3f..9c0979b38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.domain.po.WxCouponTopic; import com.iformall.domain.po.WxTopic; +import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponTopicMapper; import com.iformall.mapper.WxTopicMapper; import com.iformall.service.WxTopicService; @@ -27,6 +28,8 @@ public class WxTopicServiceImpl implements WxTopicService { private WxTopicMapper wxTopicMapper; @Autowired private WxCouponTopicMapper wxCouponTopicMapper; + @Autowired + private WxCouponMapper wxCouponMapper; @Override public PageInfo listAsPage(WxTopic record, Integer pageIndex, Integer pageSize) { @@ -89,4 +92,11 @@ public class WxTopicServiceImpl implements WxTopicService { wxCouponTopicMapper.insertSelective(couponTopic); } } + + @Override + public WxTopic findById(WxTopic record) { + WxTopic wxTopic = wxTopicMapper.selectByPrimaryKey(record.getId()); + wxTopic.setCouponList(wxCouponMapper.findCouponByTopic(record)); + return wxTopic; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 7f5bda582..267a882a0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -717,4 +717,11 @@ where wc.type = 8 and wop.create_date between #{startdate} and #{enddate} + + + diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 1337710f1..3a12586e9 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -54,5 +54,4 @@ -