From 6c7bfbfbb88d7883d0e47cc52866c5904dea38e2 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 12 Aug 2018 15:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=9F=A5=E8=AF=A2=E5=85=A8?= =?UTF-8?q?=E9=83=A8,=E6=8E=A8=E5=B9=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponSpreadController.java | 18 ++ .../controller/WxCouponVerifyController.java | 11 ++ .../com/simple/mapper/WxCouponMapper.java | 3 + .../com/simple/service/WxCouponService.java | 10 ++ .../simple/service/WxCouponSpreadService.java | 22 ++- .../service/impl/WxCouponServiceImpl.java | 5 + .../impl/WxCouponSpreadServiceImpl.java | 16 +- .../main/resources/mapper/WxCouponMapper.xml | 156 +++++++++++++++++- 8 files changed, 224 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java index 77b05871c..538e16131 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSpreadController.java @@ -16,6 +16,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.util.List; + @RestController @RequestMapping("wxCouponSpread") @Api(description="推广接口") @@ -70,6 +72,22 @@ public class WxCouponSpreadController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxCouponSpreadService.getById(id)); } + + @ApiOperation("根据卡券id查询接口") + @GetMapping("/findByCouponId") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findByCouponId(Long id) { + WxCouponSpread result = null; + if(id!=null){ + WxCouponSpread wxCouponSpread = new WxCouponSpread(); + wxCouponSpread.setCouponId(id); + List list = wxCouponSpreadService.findList(wxCouponSpread); + if(!list.isEmpty()){ + result = list.get(0); + } + } + return new ResultData(Result.SUCCESS,"查询成功",result); + } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java index 95b91de39..9e778e87e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import com.simple.domain.po.MallUserInfo; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -65,6 +66,16 @@ public class WxCouponVerifyController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxCouponVerifyService.getById(id)); } + + @ApiOperation("根据id更新接口") + @PostMapping("verify") + public ResultData verify(@RequestBody WxCouponVerify wxCouponVerify) { + MallUserInfo user =getUser(); + wxCouponVerify.setBUserId(user.getId()); + wxCouponVerify.setTenantId(user.getTenantId()); + wxCouponVerifyService.saveOrUpdate(wxCouponVerify); + 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 e019d8eec..6bef8144c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java @@ -10,6 +10,9 @@ public interface WxCouponMapper extends CommonMapper { List findList(WxCoupon wxCoupon); + List findEnableList(WxCoupon wxCoupon); + + diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 63b6090dc..12ecd5dc8 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -16,6 +16,16 @@ public interface WxCouponService { * @return */ PageInfo listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo findEnableList(WxCoupon record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponSpreadService.java b/mallinkService/src/main/java/com/simple/service/WxCouponSpreadService.java index e75dc9867..77720ad7a 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponSpreadService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponSpreadService.java @@ -37,12 +37,20 @@ public interface WxCouponSpreadService { * @param id */ void deleteById(Long id); - - - - - - - + /** + * 根据实体查询不分页 + * + * @param + */ + List findList(WxCouponSpread record); + + + + + + + + + } 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 33f13446e..21a78d349 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -23,6 +23,11 @@ public class WxCouponServiceImpl implements WxCouponService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findList(record)); } + @Override + public PageInfo findEnableList(WxCoupon record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findList(record)); + } + @Override public WxCoupon getById(Long id) { return wxCouponMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSpreadServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSpreadServiceImpl.java index f665d57f1..8b1e4eefe 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSpreadServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSpreadServiceImpl.java @@ -43,12 +43,12 @@ public class WxCouponSpreadServiceImpl implements WxCouponSpreadService { public void deleteById(Long id) { wxCouponSpreadMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public List findList(WxCouponSpread record) { + return wxCouponSpreadMapper.findList(record); + + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 2ef3be32d..2333e89aa 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -180,12 +180,164 @@ 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_start_date` = #{sendStartDate} + + + + + and `send_end_date` = #{sendEndDate} + + + + + 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} + + - + + + +