puzhibing
16 小时以前 fb1fa7a272d17790ae317ae40067c585dd88e6b4
修改bug
4个文件已修改
1个文件已添加
37 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/AddMemberCoupon.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.api.domain.dto.MerVerifyMemberCouponDto;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
import com.ruoyi.system.api.service.AddMemberCoupon;
import com.ruoyi.system.api.service.RemoteCouponService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +69,7 @@
            }
    
            @Override
            public R addMemberCoupon(String couponId, Integer number, Long userId) {
            public R addMemberCoupon(AddMemberCoupon addMemberCoupon) {
                return R.fail("手动添加用户优惠券失败:" + throwable.getMessage());
            }
        };
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/AddMemberCoupon.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.api.service;
import lombok.Data;
/**
 * @author zhibing.pu
 * @date 2025/7/29 11:04
 */
@Data
public class AddMemberCoupon {
    private String couponId;
    private Integer number;
    private Long userId;
}
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java
@@ -103,5 +103,5 @@
     * @return
     */
    @PostMapping("/coupon/addMemberCoupon")
    R addMemberCoupon(@RequestParam("couponId") String couponId, @RequestParam("number") Integer number, @RequestParam("userId") Long userId);
    R addMemberCoupon(@RequestBody AddMemberCoupon addMemberCoupon);
}
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -22,10 +22,7 @@
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.model.AddIntegralRecordVo;
import com.ruoyi.system.api.model.AddOrderVo;
import com.ruoyi.system.api.service.RemoteCouponService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.*;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -185,7 +182,11 @@
                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()) {
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
@@ -10,6 +10,7 @@
import com.ruoyi.system.api.domain.dto.MerVerifyMemberCouponDto;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
import com.ruoyi.system.api.service.AddMemberCoupon;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -151,7 +152,7 @@
     * @return
     */
    @PostMapping("/addMemberCoupon")
    public R addMemberCoupon(@RequestParam("couponId") String couponId, @RequestParam("number") Integer number, @RequestParam("userId") Long userId) {
        return memberCouponService.addMemberCoupon(couponId, number, userId);
    public R addMemberCoupon(@RequestBody AddMemberCoupon addMemberCoupon) {
        return memberCouponService.addMemberCoupon(addMemberCoupon.getCouponId(), addMemberCoupon.getNumber(), addMemberCoupon.getUserId());
    }
}