Pu Zhibing
2025-06-18 eb45851190d1853c4c439b8f2404bdc1e0747f4c
修改bug
2个文件已修改
1 文件已重命名
22 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/LotteryEvent.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/LotteryEventController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/domain/LotteryEvent.java
@@ -132,6 +132,7 @@
    @TableField("update_time")
    private LocalDateTime updateTime;
    
    @TableField(exist = false)
    @ApiModelProperty("奖品列表")
    private List<LotteryEventPrize> prizes;
}
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/LotteryEventController.java
File was renamed from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/MerLotteryEventController.java
@@ -15,7 +15,7 @@
 */
@RestController
@RequestMapping("/lotteryEvent")
public class MerLotteryEventController {
public class LotteryEventController {
    
    @Resource
    private ILotteryEventService lotteryEventService;
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -31,6 +31,7 @@
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteGoodsService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -58,28 +59,30 @@
    @Resource
    private CouponRelGoodsService couponRelGoodsService;
    @Resource
    private CouponMapper couponMapper;
    @Resource
    private RemoteGoodsService remoteGoodsService;
    @Resource
    private CouponTotalService couponTotalService;
    @Lazy
    @Resource
    private MemberService memberService;
    @Lazy
    @Resource
    private MemberCouponService memberCouponService;
    @Resource
    private RemoteActivityService remoteActivityService;
    @Resource
    private MemberCouponRecordService memberCouponRecordService;
    @Resource
    private RemoteShopService remoteShopService;