diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java index f86461c8b..c42739b04 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import com.simple.domain.vo.WxCouponChannelVo; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -31,33 +32,11 @@ public class WxCouponChannelController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); - final PageInfo page = wxCouponChannelService.listAsPage(wxCouponChannel, pageNum, pageSize); + wxCouponChannel.setTenantId(getTenantId()); + final PageInfo page = wxCouponChannelService.listPageCAPI(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponChannel wxCouponChannel) { - //Assert.notNull(wxCouponChannel.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponChannelService.saveOrUpdate(wxCouponChannel); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { - wxCouponChannelService.saveOrUpdate(wxCouponChannel); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponChannelService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } @ApiOperation("根据id查询接口") @GetMapping("/findById") diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index 3af45bf88..e3e6303c4 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -30,6 +30,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(getTenantId()); final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java index b43a78ab1..ee27fb2b9 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java @@ -31,33 +31,11 @@ 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); } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponSend wxCouponSend) { - //Assert.notNull(wxCouponSend.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponSendService.saveOrUpdate(wxCouponSend); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponSend wxCouponSend) { - wxCouponSendService.saveOrUpdate(wxCouponSend); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponSendService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } @ApiOperation("根据id查询接口") @GetMapping("/findById") diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java index f948b1489..b5bd20448 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java @@ -2,12 +2,15 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.vo.WxCouponChannelVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCouponChannel; public interface WxCouponChannelMapper extends CommonMapper { List findList(WxCouponChannel wxCouponChannel); + + List findVoList(WxCouponChannel wxCouponChannel); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java index 66db5d5ba..74192f9ec 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java @@ -1,8 +1,8 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.vo.WxCouponChannelVo; public interface WxCouponChannelService { @@ -15,6 +15,8 @@ public interface WxCouponChannelService { * @return */ PageInfo listAsPage(WxCouponChannel record, Integer pageIndex, Integer pageSize); + + PageInfo listPageCAPI(WxCouponChannel record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java index 2ca38048f..64588733a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -1,10 +1,13 @@ package com.simple.service.impl; import java.util.*; +import java.util.stream.Collectors; + import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.vo.WxCouponChannelVo; import com.simple.mapper.WxCouponChannelMapper; import com.simple.service.WxCouponChannelService; import com.simple.service.WxCouponService; @@ -22,6 +25,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { WxCouponService wxCouponService; + /** + * B端业务端 + * @param record + * @param pageIndex + * @param pageSize + * @return + */ @Override public PageInfo listAsPage(WxCouponChannel record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findList(record)); @@ -64,11 +74,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } + @Transactional public void addCuponChannel(Long couponid,Integer channelId,String tanantId){ - WxCoupon wxCouponUP = new WxCoupon(); - wxCouponUP.setId(couponid); - wxCouponUP.setStatus(1); - wxCouponService.saveOrUpdate(wxCouponUP); + WxCoupon wxCoupon = wxCouponService.getById(couponid); + if(wxCoupon.getStatus()!=1) { + wxCoupon.setStatus(1); + wxCouponService.saveOrUpdate(wxCoupon); + } WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setCouponId(couponid); wxCouponChannel.setCouponStatus(1); @@ -77,5 +89,33 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { saveOrUpdate(wxCouponChannel); } + /** + * C端api使用,关联查找的券时已生效 + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + @Override + public PageInfo listPageCAPI(WxCouponChannel record, Integer pageIndex, Integer pageSize) { + List wxCouponChannelVoList = new ArrayList<>(); + PageHelper.startPage(pageIndex, pageSize); + wxCouponChannelVoList = wxCouponChannelMapper.findVoList(record); + if(wxCouponChannelVoList.isEmpty()){ + return new PageInfo<>(wxCouponChannelVoList); + } + List couponIds = wxCouponChannelVoList.stream().map(p->p.getCouponId()).distinct().collect(Collectors.toList()); + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setIds(couponIds); + List wxCoupons = wxCouponService.findList(wxCoupon); + Map couponNamesMap = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId,p->p)); + for (WxCouponChannelVo wxcouponVo:wxCouponChannelVoList) { + if(couponNamesMap.get(wxcouponVo.getCouponId())!=null){ + wxcouponVo.setWxCoupon(couponNamesMap.get(wxcouponVo.getCouponId())); + } + } + return new PageInfo<>(wxCouponChannelVoList); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index f2cc85a26..5191ab548 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -10,12 +10,13 @@ + - `id`,`tenant_id`,`merchant_id`,`coupon_id`,`coupon_status`,`type`,`title`,`target_ad`,`create_date`,`update_date` + `id`,`tenant_id`,`merchant_id`,`coupon_id`,`coupon_status`,`type`,`title`,`target_ad`,`business`,`create_date`,`update_date` @@ -83,6 +84,25 @@ select from wx_coupon_channel + + + + + + + + + + + + + + + +