From ccb5a61a97506447c43ca59cb65d0d43f870b39b Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Wed, 28 Jun 2023 10:44:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E5=8D=A1=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCardDailyLogController.java | 2 ++ .../iformall/domain/po/WxCardDailyLog.java | 5 +++++ .../com/iformall/service/WxCouponService.java | 2 ++ .../impl/WxCardDailyLogServiceImpl.java | 20 ++++++++++++++++++- .../impl/WxCouponPasswordServiceImpl.java | 1 + .../service/impl/WxCouponServiceImpl.java | 9 +++++++++ 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java index 8bd491f10..457dfba51 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardDailyLogController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCardDailyLog; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxCardDailyLogService; import com.iformall.service.WxCardSpendService; import io.swagger.annotations.Api; @@ -41,6 +42,7 @@ public class WxCardDailyLogController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCardDailyLog == null) wxCardDailyLog = new WxCardDailyLog(); wxCardDailyLog.updateTenantInfo(getTenantInfo()); + wxCardDailyLog.setSortColumns(BaseEntity.SortField.CreateDate_DESC); PageInfo info = wxCardDailyLogService.listAsPage(wxCardDailyLog, pageNum, pageSize); return new ResultData(info); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java index 800b18038..15cb1a709 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -42,4 +43,8 @@ public class WxCardDailyLog extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="卡卷总数",name="count") private Integer count; + @io.swagger.annotations.ApiModelProperty(value="卡卷总数",name="count") + @TableField(exist = false) + private String title; + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index bbefaccbb..f0b1c9de1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -309,4 +309,6 @@ public interface WxCouponService { void addManyCouponMerchants(TenantEntity tenantInfo, List couponIds, List merchantIds); void delManyCouponMerchants(TenantEntity tenantInfo, List couponIds, List merchantIds); + + List getByIdList(List collect, String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java index dd1eacc13..116f77e58 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardDailyLogServiceImpl.java @@ -6,12 +6,14 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.mapper.*; import com.iformall.service.*; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; @Service public class WxCardDailyLogServiceImpl implements WxCardDailyLogService { @@ -21,10 +23,26 @@ public class WxCardDailyLogServiceImpl implements WxCardDailyLogService { @Autowired WxCardDailyLogMapper wxCardDailyLogMapper; + @Autowired + WxCouponService wxCouponService; + @Override public PageInfo listAsPage(WxCardDailyLog record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardDailyLogMapper.findList(record)); + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardDailyLogMapper.findList(record)); + if (CollectionUtils.isEmpty(pageInfo.getList())){ + return pageInfo; + } + List couponIds = pageInfo.getList().parallelStream().map(WxCardDailyLog::getCouponId).collect(Collectors.toList()); + List list = wxCouponService.getByIdList(couponIds, record.getTenantId()); + if (CollectionUtils.isEmpty(list)){ + return pageInfo; + } + Map map = list.parallelStream().collect(Collectors.toMap(WxCoupon::getId, WxCoupon::getTitle)); + for (WxCardDailyLog log : pageInfo.getList()) { + log.setTitle(map.get(log.getCouponId())); + } + return pageInfo; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 176ffa347..fffe86b23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -392,6 +392,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { cardSetPrice.setCardPasswordId(wxCouponPasswordUpd.getId()); cardSetPrice.setPrice(wxCouponPasswordUpd.getPrice()); cardSetPrice.setOperatorType(EnumUserType.MALLUSER.getCode()); + cardSetPrice.setCouponId(wxCouponPasswordUpd.getCouponId()); cardSetPrice.setOperatorId(user.getId()); cardSetPrice.setOperatorUser(user.getUsername()); cardSetPrice.setCouponId(wxCoupon.getCouponId()); 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 9cf1066a9..f942c8cf9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -2104,5 +2105,13 @@ public class WxCouponServiceImpl implements WxCouponService { } } + @Override + public List getByIdList(List couponIds, String tenantId) { + return wxCouponMapper.selectList(new LambdaQueryWrapper() + .eq(WxCoupon::getIsDel, 0) + .in(WxCoupon::getId, couponIds) + .eq(TenantEntity::getTenantId, tenantId)); + } + }