From 92c0beccaad5b707e6b3c888ae6968818746bd6a Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 19 Oct 2022 21:38:46 +0800 Subject: [PATCH] =?UTF-8?q?//=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/TtPoiPlanController.java | 27 +++++++++++++++++++ .../com/iformall/domain/po/TtPoiTakeRate.java | 3 +++ .../service/TtCouponGoodsService.java | 2 ++ .../impl/TtCouponGoodsServiceImpl.java | 10 +++++++ 4 files changed, 42 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java index 93f9779bf..98598c72a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java @@ -7,11 +7,13 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtPoiTakeRate; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumCpsPlanContentType; import com.iformall.enums.EnumCpsPlanStatus; import com.iformall.enums.EnumCpsPlanType; import com.iformall.service.TtCouponGoodsService; +import com.iformall.service.WxCouponService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -22,7 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -36,6 +40,9 @@ public class TtPoiPlanController extends BaseController { @Autowired private TtCouponGoodsService ttCouponGoodsService; + @Autowired + private WxCouponService wxCouponService; + @ApiOperation("分页列表接口") @GetMapping("takeRateList") @ApiImplicitParams({ @@ -48,9 +55,29 @@ public class TtPoiPlanController extends BaseController { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = ttCouponGoodsService.takeRateListAsPage(record, pageNum, pageSize); + if(page.getList() != null && !page.getList().isEmpty()){ + List couponIds = page.getList().stream().map(cc -> cc.getCouponId()).collect(Collectors.toList()); + Map couponMap = wxCouponService.getCouponMap(couponIds, getTenantInfo()); + for (TtPoiTakeRate takeRate:page.getList()) { + takeRate.setCoupon(couponMap.get(takeRate.getCouponId())); + } + } return new ResultData(page); } + @ApiOperation("通过id获取") + @GetMapping("getTakeRate") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "列表") + public ResultData getTakeRate(Long id) { + logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::getTakeRate"); + if(id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + TtPoiTakeRate takeRateById = ttCouponGoodsService.getTakeRateById(getTenantInfo(), id); + return new ResultData(takeRateById); + } + // @TenantIgnore @ApiOperation("通用计划分页列表接口") @GetMapping("list") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java b/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java index 62a6dfb1f..8793ab707 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java @@ -58,4 +58,7 @@ public class TtPoiTakeRate extends TenantEntity { @TableField(exist = false) private List douyinIdList; + @TableField(exist = false) + private WxCoupon coupon; + } diff --git a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java index 13db8b924..47b71b95e 100644 --- a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java +++ b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java @@ -34,6 +34,8 @@ public interface TtCouponGoodsService { //cps 佣金 PageInfo takeRateListAsPage(TtPoiTakeRate record, Integer pageNum, Integer pageSize); + TtPoiTakeRate getTakeRateById(TenantEntity tenantInfo, Long id); + //根据商品id查询线上通用佣金情况 ResultData poiPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize); //根据商品id查询线上定向佣金情况 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index dee4699a2..51f0b71b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -499,6 +499,16 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> ttPoiTakeRateMapper.findList(record)); } + @Override + public TtPoiTakeRate getTakeRateById(TenantEntity tenantInfo, Long id) { + TtPoiTakeRate takeRate = ttPoiTakeRateMapper.selectById(id, tenantInfo.getTenantId()); + if(takeRate != null){ + WxCoupon coupon = wxCouponMapper.selectById(takeRate.getCouponId(), tenantInfo.getTenantId()); + takeRate.setCoupon(coupon); + } + return takeRate; + } + @Override public ResultData poiPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize) {