From 533ff863bd6490dd2efc029b019a4c0115a2c2e1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 02 Jan 2024 16:47:26 +0800
Subject: [PATCH] 修改推荐人
---
src/main/resources/mapper/modules/MallMemberCouponMapper.xml | 2 +-
src/test/java/cc/mrbird/febs/ProfitTest.java | 31 +++++++++++++++++++------------
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +-
4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
index 1827138..d456976 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
@@ -13,7 +13,7 @@
public interface MallMemberCouponMapper extends BaseMapper<MallMemberCoupon> {
IPage<MallMemberCouponVo> selectListInPage(IPage<MallMemberCouponVo> page, @Param("record") MallMemberCouponDto mallMemberCouponDto);
- List<MallMemberCouponVo> selectListCreateInPage(IPage<MallMemberCouponVo> page, @Param("record") MallMemberCouponDto mallMemberCouponDto);
+ List<MallMemberCouponVo> selectListCreateInPage(@Param("record") MallMemberCouponDto mallMemberCouponDto, @Param("list")List<Long> couponIds);
List<MallMemberCoupon> selectListByExpireTime(@Param("date")DateTime date);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 7dee1a3..480b828 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -982,7 +982,7 @@
List<Long> couponIds = couponGoodsMapper.selectByGoodId(mallMemberCouponDto.getGoodsId());
List<MallMemberCouponVo> mallMemberCouponVos = new ArrayList<>();
if(CollUtil.isNotEmpty(couponIds)){
- mallMemberCouponVos = mallMemberCouponMapper.selectListCreateInPage(page, mallMemberCouponDto);
+ mallMemberCouponVos = mallMemberCouponMapper.selectListCreateInPage(mallMemberCouponDto,couponIds);
}
return new FebsResponse().success().data(mallMemberCouponVos);
}
diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index 845eebc..ee8fdb9 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -40,7 +40,7 @@
and a.state=#{record.state}
and a.expire_time >= #{record.expireTime}
and a.coupon_id in
- <foreach collection = "record.couponIds" item = "item" separator="," open = "(" close = ")" >
+ <foreach collection = "list" item = "item" separator="," open = "(" close = ")" >
#{item}
</foreach >
order by a.CREATED_TIME desc
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index fa3a8ef..93719a9 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -1,33 +1,27 @@
package cc.mrbird.febs;
-import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.HttpCurlUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.mall.dto.AdminLeaderAddFenceDto;
-import cc.mrbird.febs.mall.dto.ApiLeaderRefundOrderDto;
-import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
+import cc.mrbird.febs.mall.dto.MallMemberCouponDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
+import cc.mrbird.febs.mall.vo.MallMemberCouponVo;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
-import cc.mrbird.febs.pay.model.WxGenerateQrCodeDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.rabbit.consumer.AgentConsumer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.http.HttpEntity;
@@ -89,11 +83,26 @@
public void thankfulProfit() {
memberProfitService.thankfulProfit(new Date());
}
-
+ @Autowired
+ private MallMemberCouponMapper mallMemberCouponMapper;
+ @Autowired
+ private MallGoodsMapper mallGoodsMapper;
+ @Autowired
+ private CouponGoodsMapper couponGoodsMapper;
@Test
public void rankProfit() {
- memberProfitService.rankProfit();
+// memberProfitService.rankProfit();
+ MallMemberCouponDto mallMemberCouponDto = new MallMemberCouponDto();
+ mallMemberCouponDto.setMemberId(72L);
+ mallMemberCouponDto.setExpireTime(DateUtil.date());
+ List<Long> couponIds = couponGoodsMapper.selectByGoodId(10L);
+ List<MallMemberCouponVo> mallMemberCouponVos = new ArrayList<>();
+ if(CollUtil.isNotEmpty(couponIds)){
+ mallMemberCouponVos = mallMemberCouponMapper.selectListCreateInPage(mallMemberCouponDto,couponIds);
+ System.out.println(mallMemberCouponVos);
+ }
}
+
@Autowired
private MallOrderInfoMapper mallOrderInfoMapper;
@@ -203,8 +212,6 @@
}
@Autowired
private IXcxPayService iXcxPayService;
- @Autowired
- private MallGoodsMapper mallGoodsMapper;
@Autowired
private IAdminMallTeamLeaderService iAdminMallTeamLeaderService;
--
Gitblit v1.9.1