From 0440f99f2874e54532c80d644644e04febf51a50 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 29 七月 2025 14:59:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
index 65e76ea..0baeaeb 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -16,12 +16,13 @@
import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.goods.mapper.lottery.LotteryEventMapper;
import com.ruoyi.goods.service.lottery.*;
+import com.ruoyi.system.api.domain.dto.IntegralChangeDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.service.RemoteCouponService;
-import com.ruoyi.system.api.service.RemoteMemberService;
-import com.ruoyi.system.api.service.RemoteShopService;
+import com.ruoyi.system.api.model.AddIntegralRecordVo;
+import com.ruoyi.system.api.model.AddOrderVo;
+import com.ruoyi.system.api.service.*;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -67,6 +68,9 @@
@Resource
private ILotteryEventQuestionsService lotteryEventQuestionsService;
+
+ @Resource
+ private RemoteOrderService remoteOrderService;
/**
* 根据id查询抽奖活动信息
@@ -178,11 +182,19 @@
userLotteryEvent.setNumber(lotteryEventPrize.getNumber());
//中奖优惠券
if (1 == lotteryEventPrize.getPrizeType()) {
- remoteCouponService.addMemberCoupon(lotteryEventPrize.getObjectId(), lotteryEventPrize.getNumber(), userId);
+ AddMemberCoupon addMemberCoupon = new AddMemberCoupon();
+ addMemberCoupon.setCouponId(lotteryEventPrize.getObjectId());
+ addMemberCoupon.setNumber(lotteryEventPrize.getNumber());
+ addMemberCoupon.setUserId(userId);
+ remoteCouponService.addMemberCoupon(addMemberCoupon);
}
//中奖积分
if (4 == lotteryEventPrize.getPrizeType()) {
- remoteMemberService.addIntegralRecord(lotteryEventPrize.getNumber(), userId, id);
+ AddIntegralRecordVo addIntegralRecordVo = new AddIntegralRecordVo();
+ addIntegralRecordVo.setIntegral(lotteryEventPrize.getNumber());
+ addIntegralRecordVo.setUserId(userId);
+ addIntegralRecordVo.setOrderId(id);
+ remoteMemberService.addIntegralRecord(addIntegralRecordVo);
}
userLotteryEvent.setCreateTime(LocalDateTime.now());
userLotteryEventService.save(userLotteryEvent);
@@ -194,17 +206,29 @@
memberGiftRecord.setGiftId(userLotteryEvent.getId());
memberGiftRecord.setGiftFrom(1);
memberGiftRecord.setShopId(member.getRelationShopId());
+ memberGiftRecord.setVerifyStatus(1);
switch (lotteryEventPrize.getPrizeType()) {
case 1:
memberGiftRecord.setGiftType(1);
memberGiftRecord.setCouponId(userLotteryEvent.getObjectId());
memberGiftRecord.setCouponNumber(userLotteryEvent.getNumber());
+ memberGiftRecord.setCouponName(userLotteryEvent.getObjectName());
+ memberGiftRecord.setVerifyStatus(2);
+ memberGiftRecord.setVerifyTime(new Date());
break;
case 2:
memberGiftRecord.setGiftType(2);
memberGiftRecord.setGoodsId(userLotteryEvent.getObjectId());
- memberGiftRecord.setGiftName(userLotteryEvent.getObjectName());
memberGiftRecord.setGoodsNumber(userLotteryEvent.getNumber());
+ memberGiftRecord.setGoodsName(userLotteryEvent.getObjectName());
+ //添加待核销订单
+ AddOrderVo orderVo = new AddOrderVo();
+ orderVo.setShopId(member.getRelationShopId());
+ orderVo.setUserId(member.getUserId());
+ orderVo.setId(userLotteryEvent.getId());
+ orderVo.setGoodsId(userLotteryEvent.getObjectId());
+ orderVo.setGoodsNum(userLotteryEvent.getNumber());
+ remoteOrderService.addOrder(orderVo);
break;
case 3:
memberGiftRecord.setGiftType(4);
@@ -214,11 +238,12 @@
case 4:
memberGiftRecord.setGiftType(5);
memberGiftRecord.setIntegralNumber(userLotteryEvent.getNumber());
+ memberGiftRecord.setVerifyStatus(2);
+ memberGiftRecord.setVerifyTime(new Date());
break;
}
memberGiftRecord.setPrizeFrom(2);
memberGiftRecord.setCreateTime(new Date());
- memberGiftRecord.setVerifyStatus(1);
remoteMemberService.saveMemberGiftRecord(memberGiftRecord);
return R.ok(lotteryEventPrize);
}
--
Gitblit v1.7.1