Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-11-05 cf9cf52301dcf206ab15cc239c41752f0984be0f

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

@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.dsh.activity.entity.*;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
@@ -17,10 +18,7 @@
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.GrantCoupon;
import com.dsh.activity.model.SendCouponReq;
import com.dsh.activity.service.CouponStoreService;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
import com.dsh.activity.service.VipDetailService;
import com.dsh.activity.service.*;
import com.dsh.activity.util.DateUtil;
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
@@ -51,6 +49,9 @@

    @Autowired
    private UserCouponService userCouponService;
    @Autowired
    private UserPointsMerchandiseService userPointsMerchandiseService;


    @Autowired
    private CouponStoreService csServie;
@@ -202,6 +203,36 @@
            return null;
        }
    }
    /**
     * 根据id修改门票使用状态
     *
     * @param id
     * @return
     */
    @PostMapping("/userCoupon/changeTicketStatus")
    @ResponseBody
    public void changeTicketStatus(String id){
        if (id.length()<=11){
            // 购买会员赠送的门票
            VipDetail vipDetail = vipDetailService.getById(Integer.valueOf(id));
            if (vipDetail!=null){
                vipDetail.setStatus(2);
                vipDetailService.updateById(vipDetail);
            }else{
                System.err.println("未查询到会员权益门票数据"+ id);
            }
        }else{
            // 积分商城门票
            UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(Long.valueOf(id));
            if (userPointsMerchandise!=null){
                userPointsMerchandise.setStatus(2);
                userPointsMerchandiseService.updateById(userPointsMerchandise);
            }else{
                System.err.println("未查询到积分商城门票数据"+ id);
            }
        }

    }

    @ResponseBody
    @PostMapping("/userCoupon/queryUserCouponById1")