记得上下班打卡 | git大法好,push需谨慎

Commit 7814648f authored by jiangxiulong's avatar jiangxiulong

活动表增加新活动id标识;列表判断只能操作一次

parent 082e57ab
......@@ -37,6 +37,11 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
*/
private String title;
/**
* 延期后的新活动id
*/
private String newActivityId;
/**
* 创建时间
*/
......
......@@ -6,6 +6,7 @@
<result column="activity_id" property="activityId" jdbcType="VARCHAR"/>
<result column="uid" property="uid" jdbcType="VARCHAR"/>
<result column="title" property="title" jdbcType="VARCHAR"/>
<result column="new_activity_id" property="newActivityId" jdbcType="VARCHAR"/>
<result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
<result column="updated_at" property="updatedAt" jdbcType="TIMESTAMP"/>
</resultMap>
......@@ -17,7 +18,7 @@
</select>
<select id="selectPageList" resultMap="BaseResult">
select activity_id,uid,title,created_at from goblin_nft_ex_activity
select activity_id,uid,title,created_at,new_activity_id from goblin_nft_ex_activity
<where>
<if test="uid != null and uid != ''">
and uid = #{uid,jdbcType=VARCHAR}
......
......@@ -38,6 +38,8 @@ CREATE TABLE `goblin_nft_ex_activity`
PRIMARY KEY (`mid`) USING BTREE,
INDEX `idx_nft_activity_id`(`activity_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'NFT兑换活动表' ROW_FORMAT = Dynamic;
ALTER TABLE `goblin_nft_ex_activity` ADD `new_activity_id` varchar(64) NOT NULL DEFAULT '' COMMENT '延期后的新活动id' after title;
......
......@@ -153,15 +153,17 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
// 获取该活动最大的失效时间
goblinNftExActivityVo.setIsDelay(0);
List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectList(
Wrappers.lambdaQuery(GoblinNftExSku.class)
.eq(GoblinNftExSku::getActivityId, goblinNftExActivity.getActivityId())
.orderByDesc(GoblinNftExSku::getExStopTime)
);
if (!CollectionUtil.isEmpty(goblinNftExSkus)) {
LocalDateTime exStopTime = goblinNftExSkus.get(0).getExStopTime();
if (LocalDateTime.now().isAfter(exStopTime) && invalidNumber > 0) {
goblinNftExActivityVo.setIsDelay(1);
if (goblinNftExActivity.getNewActivityId().isEmpty()) {
List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectList(
Wrappers.lambdaQuery(GoblinNftExSku.class)
.eq(GoblinNftExSku::getActivityId, goblinNftExActivity.getActivityId())
.orderByDesc(GoblinNftExSku::getExStopTime)
);
if (!CollectionUtil.isEmpty(goblinNftExSkus)) {
LocalDateTime exStopTime = goblinNftExSkus.get(0).getExStopTime();
if (LocalDateTime.now().isAfter(exStopTime) && invalidNumber > 0) {
goblinNftExActivityVo.setIsDelay(1);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment