Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -44,6 +44,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -173,6 +175,35 @@
        try {
            Coupon coupon = couponService.getById(id);
            return coupon;
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
    }


    @Autowired
    private UserCouponService userCouponService;
    @ResponseBody
    @PostMapping("/coupon/queryCouponByUid")
    public List<Coupon> queryCouponByUid(@RequestBody Integer uid){
        try {
            LocalDateTime currentTime = LocalDateTime.now();
            LocalDateTime oneMinuteAgo = currentTime.minusSeconds(20);

            List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", uid).ge("insertTime", oneMinuteAgo));
            List<Integer> ids = new ArrayList<>();
            for (UserCoupon userCoupon : list) {
                ids.add(userCoupon.getCouponId());
            }

            if (ids.size()>0){
            List<Coupon> userId = couponService.list(new QueryWrapper<Coupon>().in("id",ids));
                return userId;

            }

            return null;
        }catch (Exception e){
            e.printStackTrace();
            return null;
@@ -578,10 +609,7 @@
                    case 1:
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                        break;
                    case 2:
                        coupon.setCash(dataVo.getRequiredCash());
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                        break;

                    case 3:
                        coupon.setCash(dataVo.getRequiredCash());
                        break;