From db7f0be6a4f8d3e76ddd726fd2f3648d0e0a2e6e Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 28 七月 2025 20:06:43 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..eeda868 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,6 +16,7 @@
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;
@@ -194,17 +195,20 @@
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);
break;
case 2:
memberGiftRecord.setGiftType(2);
memberGiftRecord.setGoodsId(userLotteryEvent.getObjectId());
- memberGiftRecord.setGiftName(userLotteryEvent.getObjectName());
memberGiftRecord.setGoodsNumber(userLotteryEvent.getNumber());
+ memberGiftRecord.setGoodsName(userLotteryEvent.getObjectName());
break;
case 3:
memberGiftRecord.setGiftType(4);
@@ -214,11 +218,11 @@
case 4:
memberGiftRecord.setGiftType(5);
memberGiftRecord.setIntegralNumber(userLotteryEvent.getNumber());
+ memberGiftRecord.setVerifyStatus(2);
break;
}
memberGiftRecord.setPrizeFrom(2);
memberGiftRecord.setCreateTime(new Date());
- memberGiftRecord.setVerifyStatus(1);
remoteMemberService.saveMemberGiftRecord(memberGiftRecord);
return R.ok(lotteryEventPrize);
}
--
Gitblit v1.7.1