bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

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

@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.entity.CouponStore;
import com.dsh.activity.entity.TStudent;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
import com.dsh.activity.feignclient.model.QueryUserCouponByIdAndUserId;
import com.dsh.activity.model.CouponListVo;
@@ -21,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -43,9 +48,16 @@
    @Autowired
    private UserCouponService userCouponService;


    @Autowired
    private CouponStoreService csServie;

    @Resource
    private AppUserClient appUserClient;

    @Resource
    private StudentClient studentClient;




    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
@@ -159,7 +171,7 @@
    /**
     * 根据id获取用户优惠券数据
     *
     * @param id
     * @param
     * @return
     */
    @ResponseBody
@@ -202,6 +214,28 @@
            String couponIds = sendCouponReq.getCouponIds();
            for (String s : couponIds.split(",")) {
                Coupon coupon = couponService.getById(s);
                Integer userId = sendCouponReq.getUserId();
                if(coupon.getAuditStatus() != 2){
                    continue;
                }
                if(coupon.getStatus() != 2){
                    continue;
                }
                if(coupon.getState() != 1){
                    continue;
                }
                if(coupon.getUserPopulation() == 2){
                    AppUser appUser = appUserClient.queryAppUser(userId);
                    if(appUser.getIsVip() == 0){
                        continue;
                    }
                }
                if(coupon.getUserPopulation() == 3){
                    List<TStudent> tStudents = studentClient.queryStudentList(userId);
                    if(tStudents.size() == 0){
                        continue;
                    }
                }
                if (new Date().before(coupon.getStartTime()) && new Date().after(coupon.getEndTime())) {
                    continue;
                }
@@ -212,6 +246,10 @@
                if (coupon.getQuantityIssued() <= counts) {
                    continue;
                }
                counts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", s).eq("userId", userId));
                if (coupon.getPickUpQuantity() <= counts) {
                    continue;
                }

                UserCoupon userCoupon = new UserCoupon();
                userCoupon.setCouponId(Integer.valueOf(s));