From 61e3917c5b0d667d23430890f45396a9bb7731ac Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 26 九月 2025 18:39:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java
index cf3782d..b85c97a 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreCouponServiceImpl.java
@@ -15,6 +15,7 @@
import cn.lili.modules.lmk.mapper.StoreCouponMapper;
import cn.lili.modules.lmk.service.StoreCouponService;
import cn.lili.base.Result;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.lili.modules.lmk.domain.form.StoreCouponForm;
@@ -33,6 +34,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -108,8 +110,12 @@
*/
@Override
public Result page(StoreCouponQuery query) {
- IPage<StoreCouponVO> page = PageUtil.getPage(query, StoreCouponVO.class);
- baseMapper.getPage(page, query);
+ IPage<StoreCoupon> page = PageUtil.getPage(query, StoreCoupon.class);
+ LambdaQueryWrapper<StoreCoupon> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Objects.nonNull(query.getStoreId()), StoreCoupon::getStoreId, query.getStoreId());
+ wrapper.eq(StringUtils.isNotBlank(query.getStatus()), StoreCoupon::getStatus, query.getStatus());
+ wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), StoreCoupon::getGenerateStatus, query.getGenerateStatus());
+ this.page(page, wrapper);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -159,7 +165,7 @@
public Result addStoreCoupon(StoreCouponForm storeCoupon) {
StoreCoupon entity = StoreCouponForm.getEntityByForm(storeCoupon, null);
entity.setStatus(StoreCouponStausEnum.ENABLE.name());
- entity.setCouponClaimNum(storeCoupon.getCouponNum());
+ entity.setCouponClaimNum(0);
entity.setGenerateStatus(GenerateCouponStausEnum.NOT_GENERATE.name());
Coupon coupon = couponService.getById(entity.getCouponId());
Integer publishNum = coupon.getPublishNum();
@@ -212,6 +218,13 @@
redissonLock.unlock();
}
}
+ @Override
+ public void afterCompletion(int status) {
+ // 纭繚鍗充娇鍦ㄤ簨鍔″洖婊氱殑鎯呭喌涓嬩篃鑳介噴鏀鹃攣
+ if (redissonLock.isHeldByCurrentThread()) {
+ redissonLock.unlock();
+ }
+ }
});
}
}
--
Gitblit v1.8.0