diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index eeef958b7..082651d95 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -1,6 +1,7 @@ package com.simple.controller; import com.simple.common.ErrorCode; +import com.simple.domain.po.WxCouponChannel; import com.simple.domain.vo.WxCouponCVo; import io.swagger.annotations.Api; import org.apache.log4j.Logger; @@ -29,12 +30,10 @@ public class WxCouponController extends BaseController { @ApiOperation("根据id查询接口") @GetMapping("/detail") - @ApiImplicitParam(name = "couponId", value = "id", dataType = "String", paramType = "query", required = true) - public ResultData detail(String couponId) { - WxCoupon wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(getTenantId()); - wxCoupon.setId(Long.valueOf(couponId)); - WxCouponCVo wxCouponCVo = wxCouponService.selectDetailForCUser(wxCoupon); + public ResultData detail(@ModelAttribute WxCouponChannel wxCouponChannel) { + if(wxCouponChannel == null) wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setTenantId(getTenantId()); + WxCouponCVo wxCouponCVo = wxCouponService.selectDetailForCUser(wxCouponChannel); if (wxCouponCVo == null) return new ResultData(ErrorCode.COUPON_IS_EMPTY); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java index 0961c5e67..3ef099724 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java @@ -2,6 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.po.WxCouponChannel; import com.simple.domain.vo.WxCouponCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCoupon; @@ -15,6 +16,6 @@ public interface WxCouponMapper extends CommonMapper { List findCanSendList(WxCoupon wxCoupon); - WxCouponCVo selectDetailForCUser(WxCoupon wxCoupon); + WxCouponCVo selectDetailForCUser(WxCouponChannel wxCouponChannel); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 7b020c509..ea3aa7a7a 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -3,6 +3,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxCouponChannel; import com.simple.domain.vo.WxCouponCVo; public interface WxCouponService { @@ -61,6 +62,6 @@ public interface WxCouponService { PageInfo findCanSendList(WxCoupon record, Integer pageIndex, Integer pageSize); - WxCouponCVo selectDetailForCUser(WxCoupon record); + WxCouponCVo selectDetailForCUser(WxCouponChannel 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 1278b5e86..16abf5c23 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; 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.WxCouponCVo; import com.simple.mapper.WxCouponMapper; import com.simple.service.WxCouponService; @@ -62,7 +63,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public WxCouponCVo selectDetailForCUser(WxCoupon record) { + public WxCouponCVo selectDetailForCUser(WxCouponChannel record) { return wxCouponMapper.selectDetailForCUser(record); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4aa9c3cfa..f7948f6a8 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -510,30 +510,24 @@ mb.building_name,mf.floor_name - - c.id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.remain_inventory,c.inventory,c.business, - m.name - - - select - from wx_coupon c,wx_merchant m, + from wx_coupon_channel cc, + wx_coupon c,wx_merchant m, wx_shop s,wx_merchant_shop ms, wx_mall_building mb, wx_mall_floor mf where c.merchant_id = m.id - - and c.id = #{id} + + and c.id = #{couponId} + and cc.coupon_id = #{couponId} and c.tenant_id = #{tenantId} - - and c.business like concat('%', #{business},'%') - - - and c.type = #{type} + + and cc.target_ad = #{targetAd} and ms.merchant_id = m.id and ms.shop_id = s.id