From f827be041253b7aef34196a432c625b9c4f6cd94 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 11 九月 2025 16:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index 9d38114..cdc97da 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -27,8 +27,10 @@
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.lmk.domain.entity.CouponVirtual;
import cn.lili.modules.lmk.domain.vo.OrderCountVO;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.lmk.service.CouponVirtualService;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.member.mapper.MemberMapper;
@@ -47,7 +49,9 @@
import cn.lili.modules.permission.entity.dos.AdminUser;
import cn.lili.modules.permission.service.AdminUserService;
import cn.lili.modules.permission.service.RoleService;
+import cn.lili.modules.promotion.entity.dos.Coupon;
import cn.lili.modules.promotion.entity.dos.Pintuan;
+import cn.lili.modules.promotion.service.CouponService;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;
import cn.lili.modules.store.service.StoreDetailService;
@@ -87,6 +91,7 @@
import org.apache.poi.ss.util.CellRangeAddressList;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -199,8 +204,18 @@
@Resource
private RedisTemplate<Object,Object> redisTemplate;
+ @Autowired
+ private CouponService couponService;
+
+ @Autowired
+ private CouponVirtualService couponVirtualService;
+
+ @Autowired
+ private RedissonClient redissonClient;
+
private final static String LOCK_ORDER_NO_MQ="lock_order_no_mq:";
private final static String LOCK_EDIT_ORDER_ADDRESS="lock_edit_order_address:";
+ private final static String LOCK_COUPON_CARD="lock_coupon_card:";
@Override
@Transactional(rollbackFor = Exception.class)
public void intoDB(TradeDTO tradeDTO) {
@@ -786,17 +801,71 @@
@OrderLogPoint(description = "'璁㈠崟['+#orderSn+']鏍搁攢锛屾牳閿�鐮乕'+#verificationCode+']'", orderSn = "#orderSn")
@Transactional(rollbackFor = Exception.class)
public Order take(String orderSn, String verificationCode) {
+ Order order;
+ RLock lock = redissonClient.getLock(LOCK_COUPON_CARD + orderSn);
+ try {
+ lock.lock();
+ //鑾峰彇璁㈠崟淇℃伅
+ order = this.getBySn(orderSn);
+ //妫�娴嬭櫄鎷熻鍗曚俊鎭�
+ checkVerificationOrder(order, verificationCode);
+ order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
+ //璁㈠崟瀹屾垚
+ //鑾峰彇鎵�鏈夌殑璁㈠崟瀛愰」鐢ㄤ簬鐢熸垚浼樻儬鍗疯鍗曚俊鎭�
+ List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+ List<CouponVirtual> couponVirtuals = new ArrayList<>();
+ for (OrderItem orderItem : orderItems) {
+ String couponId = orderItem.getCouponId();
+ if (StringUtils.isBlank(couponId)) {
+ continue;
+ }
+ String storeId = order.getStoreId();
+ Coupon one = couponService.getOne(Wrappers.<Coupon>lambdaQuery().eq(Coupon::getStoreId, storeId).eq(Coupon::getId, couponId));
+ if (one == null) {
+ log.error("褰撳墠璁㈠崟璁㈠崟鍙蜂负:{}涓嶅瓨鍦ㄤ腑鐨勪紭鎯犲嵎涓嶅瓨鍦�----------------------->{}",order.getId(),orderItem.getOrderSn());
+ }else {
+ Integer num = orderItem.getNum();
+ //褰撹喘涔版暟閲忛儴浣嶇┖鐨勬椂鍊欒繘琛�
+ if (num != null) {
+ for (int i = 1; i <= num; i++) {
+ CouponVirtual couponVirtual = getCouponVirtual(orderItem);
+ couponVirtual.setCouponNo(String.format("%08d", i));
+ couponVirtuals.add(couponVirtual);
+ }
+ }
- //鑾峰彇璁㈠崟淇℃伅
- Order order = this.getBySn(orderSn);
- //妫�娴嬭櫄鎷熻鍗曚俊鎭�
- checkVerificationOrder(order, verificationCode);
- order.setOrderStatus(OrderStatusEnum.COMPLETED.name());
- //璁㈠崟瀹屾垚
- this.complete(orderSn);
+ }
+ }
+ if (!couponVirtuals.isEmpty()) {
+ order.setCouponFlag(CouPonFlagEnum.COUPON.name());
+ couponVirtualService.saveBatch(couponVirtuals);
+ //鏇存柊鐘舵�佺敤浜庡悗缁皬绋嬪簭鍒ゆ柇寮瑰嚭鍗峰垪琛�
+ this.updateById(order);
+ }
+ this.complete(orderSn);
+ } finally {
+ assert lock != null;
+ if (lock.isHeldByCurrentThread()) {
+ lock.unlock();
+ }
+ }
return order;
}
+ private static CouponVirtual getCouponVirtual(OrderItem orderItem) {
+ CouponVirtual couponVirtual = new CouponVirtual();
+ couponVirtual.setOrderId(orderItem.getSn());
+ couponVirtual.setCouponId(orderItem.getCouponId());
+ couponVirtual.setCouponName(orderItem.getCouponName());
+ couponVirtual.setGoodsId(orderItem.getGoodsId());
+ couponVirtual.setSkuId(orderItem.getSkuId());
+ couponVirtual.setItemOrderId(orderItem.getId());
+ couponVirtual.setSkuName(orderItem.getGoodsName());
+ couponVirtual.setName(orderItem.getCouponName());
+ couponVirtual.setShareStatus(ShareStatusEnum.NOT_SHARE.name());
+ couponVirtual.setClaimStatus(ClaimStatusEnum.NOT_CLAIM.name());
+ return couponVirtual;
+ }
@Override
public Order take(String verificationCode) {
String storeId = OperationalJudgment.judgment(UserContext.getCurrentUser()).getStoreId();
--
Gitblit v1.8.0