From 70f71b80d7862e6af04d1c62e9fd178d0922ec68 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 20 May 2022 12:14:46 +0800
Subject: [PATCH] 20220518
---
src/test/java/cc/mrbird/febs/AgentTest.java | 26 +++++++++++++++++++++++++-
src/main/resources/mapper/modules/MallActWinRecordMapper.xml | 6 +++---
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml
index 6fc92fd..326c7ff 100644
--- a/src/main/resources/mapper/modules/MallActWinRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallActWinRecordMapper.xml
@@ -18,14 +18,14 @@
<where>
<if test="record != null">
<if test="record.actId != null and record.actId != ''">
- and a.act_id = #{actId}
+ and a.act_id = #{record.actId}
</if>
<if test="record.memberId != null and record.memberId != ''">
- and a.member_id = #{memberId}
+ and a.member_id = #{record.memberId}
</if>
</if>
</where>
- order by a.act_start_time desc
+ order by a.create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index a2f3a42..584839e 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -5,16 +5,20 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.AgentLevelUpdateDto;
+import cc.mrbird.febs.mall.dto.ApiMallActWinDetailsDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.quartz.ProfitJob;
import cc.mrbird.febs.mall.service.IAgentService;
+import cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo;
import cc.mrbird.febs.mall.vo.ApiMallAwardDetailsVo;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.loadtime.Agent;
import org.junit.jupiter.api.Test;
@@ -127,7 +131,7 @@
BigDecimal multiply = totalProbability.multiply(new BigDecimal(100));
BigDecimal failureScope = new BigDecimal(100).subtract(multiply);
- int randomInt = RandomUtil.randomInt(1, 100);
+ int randomInt = 90;
//小于failureScope这个数字，则没中奖
if(new BigDecimal(randomInt).compareTo(failureScope) <= 0){
//抽奖记录
@@ -501,6 +505,26 @@
@Test
public void agentTest() {
// agentProducer.sendDelayMsg(1L, 10000L);
+
+ ApiMallActWinDetailsDto apiMallActWinDetailsDto = new ApiMallActWinDetailsDto();
+ apiMallActWinDetailsDto.setActId(1L);
+ apiMallActWinDetailsDto.setPageNow(1);
+ apiMallActWinDetailsDto.setPageSize(10);
+ Long memberId = 4L;
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
+ throw new FebsException("用户不存在");
+ }
+ apiMallActWinDetailsDto.setMemberId(memberId);
+
+ Long actId = apiMallActWinDetailsDto.getActId();
+ MallActSet mallActSet = mallActSetMapper.selectById(actId);
+ if(ObjectUtil.isEmpty(mallActSet)){
+ throw new FebsException("活动不存在");
+ }
+ Page<ApiMallActWinDetailsVo> page = new Page<>(apiMallActWinDetailsDto.getPageNow(), apiMallActWinDetailsDto.getPageSize());
+ IPage<ApiMallActWinDetailsVo> apiMallActWinDetailsVoIPage = mallActWinRecordMapper.selectApiMallActWinDetailsListInPage(apiMallActWinDetailsDto, page);
+ System.out.println(apiMallActWinDetailsVoIPage);
}
@Test
--
Gitblit v1.9.1