| @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.WxCardDailyLog; | import com.iformall.domain.po.WxCardDailyLog; | ||||
| import com.iformall.domain.po.WxCoupon; | import com.iformall.domain.po.WxCoupon; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.service.WxCardDailyLogService; | import com.iformall.service.WxCardDailyLogService; | ||||
| import com.iformall.service.WxCardSpendService; | import com.iformall.service.WxCardSpendService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| @@ -41,6 +42,7 @@ public class WxCardDailyLogController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | ||||
| if (wxCardDailyLog == null) wxCardDailyLog = new WxCardDailyLog(); | if (wxCardDailyLog == null) wxCardDailyLog = new WxCardDailyLog(); | ||||
| wxCardDailyLog.updateTenantInfo(getTenantInfo()); | wxCardDailyLog.updateTenantInfo(getTenantInfo()); | ||||
| wxCardDailyLog.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| PageInfo<WxCardDailyLog> info = wxCardDailyLogService.listAsPage(wxCardDailyLog, pageNum, pageSize); | PageInfo<WxCardDailyLog> info = wxCardDailyLogService.listAsPage(wxCardDailyLog, pageNum, pageSize); | ||||
| return new ResultData(info); | return new ResultData(info); | ||||
| } | } | ||||
| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| @@ -42,4 +43,8 @@ public class WxCardDailyLog extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="卡卷总数",name="count") | @io.swagger.annotations.ApiModelProperty(value="卡卷总数",name="count") | ||||
| private Integer count; | private Integer count; | ||||
| @io.swagger.annotations.ApiModelProperty(value="卡卷总数",name="count") | |||||
| @TableField(exist = false) | |||||
| private String title; | |||||
| } | } | ||||
| @@ -309,4 +309,6 @@ public interface WxCouponService { | |||||
| void addManyCouponMerchants(TenantEntity tenantInfo, List<Long> couponIds, List<Long> merchantIds); | void addManyCouponMerchants(TenantEntity tenantInfo, List<Long> couponIds, List<Long> merchantIds); | ||||
| void delManyCouponMerchants(TenantEntity tenantInfo, List<Long> couponIds, List<Long> merchantIds); | void delManyCouponMerchants(TenantEntity tenantInfo, List<Long> couponIds, List<Long> merchantIds); | ||||
| List<WxCoupon> getByIdList(List<Long> collect, String tenantId); | |||||
| } | } | ||||
| @@ -6,12 +6,14 @@ import com.iformall.common.IdWorker; | |||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import org.apache.commons.collections.CollectionUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.stream.Collectors; | |||||
| @Service | @Service | ||||
| public class WxCardDailyLogServiceImpl implements WxCardDailyLogService { | public class WxCardDailyLogServiceImpl implements WxCardDailyLogService { | ||||
| @@ -21,10 +23,26 @@ public class WxCardDailyLogServiceImpl implements WxCardDailyLogService { | |||||
| @Autowired | @Autowired | ||||
| WxCardDailyLogMapper wxCardDailyLogMapper; | WxCardDailyLogMapper wxCardDailyLogMapper; | ||||
| @Autowired | |||||
| WxCouponService wxCouponService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxCardDailyLog> listAsPage(WxCardDailyLog record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxCardDailyLog> listAsPage(WxCardDailyLog record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardDailyLogMapper.findList(record)); | |||||
| PageInfo<WxCardDailyLog> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardDailyLogMapper.findList(record)); | |||||
| if (CollectionUtils.isEmpty(pageInfo.getList())){ | |||||
| return pageInfo; | |||||
| } | |||||
| List<Long> couponIds = pageInfo.getList().parallelStream().map(WxCardDailyLog::getCouponId).collect(Collectors.toList()); | |||||
| List<WxCoupon> list = wxCouponService.getByIdList(couponIds, record.getTenantId()); | |||||
| if (CollectionUtils.isEmpty(list)){ | |||||
| return pageInfo; | |||||
| } | |||||
| Map<Long, String> map = list.parallelStream().collect(Collectors.toMap(WxCoupon::getId, WxCoupon::getTitle)); | |||||
| for (WxCardDailyLog log : pageInfo.getList()) { | |||||
| log.setTitle(map.get(log.getCouponId())); | |||||
| } | |||||
| return pageInfo; | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -392,6 +392,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { | |||||
| cardSetPrice.setCardPasswordId(wxCouponPasswordUpd.getId()); | cardSetPrice.setCardPasswordId(wxCouponPasswordUpd.getId()); | ||||
| cardSetPrice.setPrice(wxCouponPasswordUpd.getPrice()); | cardSetPrice.setPrice(wxCouponPasswordUpd.getPrice()); | ||||
| cardSetPrice.setOperatorType(EnumUserType.MALLUSER.getCode()); | cardSetPrice.setOperatorType(EnumUserType.MALLUSER.getCode()); | ||||
| cardSetPrice.setCouponId(wxCouponPasswordUpd.getCouponId()); | |||||
| cardSetPrice.setOperatorId(user.getId()); | cardSetPrice.setOperatorId(user.getId()); | ||||
| cardSetPrice.setOperatorUser(user.getUsername()); | cardSetPrice.setOperatorUser(user.getUsername()); | ||||
| cardSetPrice.setCouponId(wxCoupon.getCouponId()); | cardSetPrice.setCouponId(wxCoupon.getCouponId()); | ||||
| @@ -3,6 +3,7 @@ package com.iformall.service.impl; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.alibaba.fastjson.JSONArray; | import com.alibaba.fastjson.JSONArray; | ||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| @@ -2104,5 +2105,13 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| } | } | ||||
| } | } | ||||
| @Override | |||||
| public List<WxCoupon> getByIdList(List<Long> couponIds, String tenantId) { | |||||
| return wxCouponMapper.selectList(new LambdaQueryWrapper<WxCoupon>() | |||||
| .eq(WxCoupon::getIsDel, 0) | |||||
| .in(WxCoupon::getId, couponIds) | |||||
| .eq(TenantEntity::getTenantId, tenantId)); | |||||
| } | |||||
| } | } | ||||