From b229509898c6c0ca7aa9745303b792aaab860773 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 16 May 2019 17:57:33 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=8D=A1=E5=88=B8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 9 ------- .../controller/WxCouponChannelController.java | 26 ++++++++++++++++--- .../controller/WxCouponController.java | 23 ---------------- .../java/com/iformall/domain/po/WxCoupon.java | 10 ------- .../iformall/domain/po/WxCouponChannel.java | 12 +++++++++ .../mapper/WxCouponChannelMapper.java | 3 +++ .../com/iformall/mapper/WxCouponMapper.java | 6 ----- .../service/WxCouponChannelService.java | 17 +++++++----- .../com/iformall/service/WxCouponService.java | 13 ++-------- .../impl/WxCouponChannelServiceImpl.java | 6 +++++ .../service/impl/WxCouponServiceImpl.java | 4 --- .../mapper/WxCouponChannelMapper.xml | 20 ++++++++++++++ .../main/resources/mapper/WxCouponMapper.xml | 20 -------------- 13 files changed, 75 insertions(+), 94 deletions(-) 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 80c390333..6ac26261d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -200,13 +200,4 @@ public class WxCouponController extends BaseController { return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); } - @ApiOperation("商户活动列表信息") - @GetMapping("findByMerchant") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { - return new ResultData(wxCouponService.findByMerchant(wxCoupon,pageNum,pageSize)); - } - } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 314fc2d02..c566d748e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -1,6 +1,8 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponChannelStatus; @@ -41,9 +43,28 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); - PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); + filterTimed(wxCouponChannel, page); + return new ResultData(page); + } + + + @ApiOperation("商户活动列表信息") + @GetMapping("listByMerchant") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { + wxCouponChannel.setTenantId(getTenantId()); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); + + PageInfo page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); + filterTimed(wxCouponChannel, page); + return new ResultData(page); + } + private void filterTimed(WxCouponChannel wxCouponChannel, PageInfo page) { if (wxCouponChannel.getTargetAd()!= null && wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) { Date now = new Date(); @@ -57,8 +78,5 @@ public class WxCouponChannelController extends BaseController { } }); } - - return new ResultData(page); } - } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index c67387398..957c66d08 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -68,27 +68,4 @@ public class WxCouponController extends BaseController { return new ResultData(wxCouponCVo); } - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxCouponController::list"); - if (wxCoupon == null) wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(getTenantId()); - return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 - } - - - @ApiOperation("商户活动列表信息") - @GetMapping("findByMerchant") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { - return new ResultData(wxCouponService.findByMerchant(wxCoupon,pageNum,pageSize)); - } - - } 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 c72c4422a..ac1f6f3e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -202,9 +202,6 @@ 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; @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") @Transient @@ -242,13 +239,6 @@ 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/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index d32346dee..abf76dcce 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -123,6 +123,10 @@ public class WxCouponChannel extends BaseEntity { @SortColumn(column = "price") private String priceStr; + @Transient + private Long merchantId; + + public String getSalePriceStr() { return salePriceStr; } @@ -263,6 +267,14 @@ public class WxCouponChannel extends BaseEntity { this.creditPrice = creditPrice; } + public Long getMerchantId() { + return merchantId; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } + public String getWeaAppPath() { if(type == null) return "pages/index/index"; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java index 3da651ee5..7d346b787 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java @@ -2,6 +2,7 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxTopic; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -18,6 +19,8 @@ public interface WxCouponChannelMapper extends CommonMapper findVoList(WxCouponChannel wxCouponChannel); + List findVoListByMerchant(WxCouponChannel wxCouponChannel); + WxCouponCVo findVoDetail(@Param("id")Long id); void updateStatusByCouponId(WxCouponChannel wxCouponChannel); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 3e2b91047..068ef8c1e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -76,10 +76,4 @@ 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/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 460a44e22..66055f162 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -32,6 +33,15 @@ public interface WxCouponChannelService { PageInfo listPageCVo(WxCouponChannel record, Integer pageIndex, Integer pageSize); + /** + * 查询商户的卷信息 + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listByMerchant(WxCouponChannel record, Integer pageIndex, Integer pageSize); + WxCouponCVo findDetailVo(Long id); /** @@ -67,12 +77,5 @@ public interface WxCouponChannelService { ResultData addBatch(String[] ids, String[] channelId, String tanantId, Date beginTime, Date endTime); void updateStatusByCouponId(Long couponId,String tenantId,int status); - - - - - - - } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index d7ea01dd4..39029ec61 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -175,11 +175,7 @@ public interface WxCouponService { * @return */ String pressSuccRate(WxCoupon wxCoupon); - /** - * 商场补贴金额 - * @return - */ -// Long sumSubsidy(WxCoupon wxCoupon); + /** * 砍价参与人数 * @return @@ -199,10 +195,5 @@ public interface WxCouponService { */ ResultData updateCouponStockAndEndTime(WxCoupon wxCoupon); - /** - * 查询商户的卷信息 - * @param wxCoupon - * @return - */ - PageInfo findByMerchant(WxCoupon wxCoupon,Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 4495430f1..24fed6729 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelAddVo; import com.iformall.domain.vo.WxCouponChannelVo; @@ -249,4 +250,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return wxCouponChannelMapper.findVoList(record); } + @Override + public PageInfo listByMerchant(WxCouponChannel record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoListByMerchant(record)); + } + } 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 20d71868a..2ba8d7e07 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -570,8 +570,4 @@ public class WxCouponServiceImpl implements WxCouponService { return new ResultData(); } - @Override - public PageInfo findByMerchant(WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findByMerchant(wxCoupon)); - } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 3654a3983..88d6356ba 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -172,6 +172,26 @@ + + cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time, c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price, diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index faf87026c..f90b0cac8 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -803,24 +803,4 @@ where ct.`sub_target_id` = #{id} - -