From 506a04261beac0880a6d7e2dc31a41909f66f189 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Thu, 16 Aug 2018 17:13:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8=E5=9C=BA=E6=99=AF=E6=8A=95?= =?UTF-8?q?=E6=94=BE][=E4=BF=AE=E6=94=B9]:bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCouponController.java | 17 +- .../controller/WxCouponSendController.java | 5 +- .../com/simple/mapper/WxCouponMapper.java | 2 + .../com/simple/service/WxCouponService.java | 5 +- .../service/impl/WxCouponServiceImpl.java | 15 +- .../main/resources/mapper/WxCouponMapper.xml | 146 ++++++++++++++++++ .../resources/mapper/WxCouponSendMapper.xml | 2 +- 7 files changed, 180 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index e3813a4b7..fb4d73720 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -117,7 +117,22 @@ public class WxCouponController extends BaseController dto.setWxMerchant(merchant); return new ResultData(Result.SUCCESS,"查询成功",dto); } - + + + @ApiOperation("分页列表接口") + @GetMapping("send/list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData sendList(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { + if (null == wxCoupon) wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(getTenantId()); + wxCoupon.setStatus(1); + PageInfo page = null; + page = wxCouponService.findCanSendList(wxCoupon, pageNum, pageSize); + + return new ResultData(page); + } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index ad4da0932..413bc9ecf 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -38,6 +38,7 @@ public class WxCouponSendController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCouponSend wxCouponSend,Integer pageNum, Integer pageSize) { if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); + wxCouponSend.setTenantId(getTenantId()); final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); return new ResultData(page); } @@ -50,11 +51,12 @@ public class WxCouponSendController extends BaseController return new ResultData(Result.ERROR,"已经添加过该券"); } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); - if(wxCoupon.getSendEndDate().after(new Date())){ + if(wxCoupon.getSendEndDate().before(new Date())){ return new ResultData(Result.ERROR,"发放日期异常"); } wxCouponSend.setMerchantId(wxCoupon.getMerchantId()); + wxCouponSend.setType(wxCoupon.getType()); wxCouponSend.setTenantId(wxCoupon.getTenantId()); wxCouponSend.setTitle(wxCoupon.getTitle()); wxCouponSend.setSendStartTime(wxCoupon.getSendStartDate()); @@ -68,6 +70,7 @@ public class WxCouponSendController extends BaseController @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCouponSend wxCouponSend) { + wxCouponSend.setTenantId(getTenantId()); wxCouponSendService.saveOrUpdate(wxCouponSend); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java index a0c8168d1..55acf79f6 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java @@ -12,6 +12,8 @@ public interface WxCouponMapper extends CommonMapper { List findEnableList(WxCoupon wxCoupon); + List findCanSendList(WxCoupon record); + diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 12ecd5dc8..2b7ac2300 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -48,7 +48,10 @@ public interface WxCouponService { * @param id */ void deleteById(Long id); - + /** + * + */ + PageInfo findCanSendList(WxCoupon record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java index d6fe80afe..fc870d8ea 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -50,12 +50,11 @@ public class WxCouponServiceImpl implements WxCouponService { public void deleteById(Long id) { wxCouponMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public PageInfo findCanSendList(WxCoupon record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCanSendList(record)); + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 28aab475c..3b4ed7811 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -327,6 +327,145 @@ order by ${sortColumns} + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `merchant_id` = #{merchantId} + + + + + and `type` = #{type} + + + + + and `cover_img` like concat('%', #{coverImg},'%') + + + + + and `title` like concat('%', #{title},'%') + + + + + and `sub_title` like concat('%', #{subTitle},'%') + + + + + and `sale_price` = #{salePrice} + + + + + and `use_price` = #{usePrice} + + + + + and `use_limit_quantity` = #{useLimitQuantity} + + + + + and `target_ad` = #{targetAd} + + + + + and `send_type` = #{sendType} + + + + and `send_end_date` >= NOW() + and `send_start_date` <= NOW() + + + and `valid_type` = #{validType} + + + + + and `valid_start_date` = #{validStartDate} + + + + + and `valid_end_date` = #{validEndDate} + + + + + and `valid_days` = #{validDays} + + + + + and `detail` like concat('%', #{detail},'%') + + + + + and `price` = #{price} + + + + + and `remain_inventory` = #{remainInventory} + + + + + and `inventory` = #{inventory} + + + + + and `remark` like concat('%', #{remark},'%') + + + + + and `status` in (0,1,2) + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + + and `business` like concat('%', #{business},'%') + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 67e4be2a7..bfc8a822e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -72,7 +72,7 @@ and `send_end_time` = #{sendEndTime} - + and `send_end_time` >= NOW() and `send_start_time` <= NOW()