bug：测试问题统一修改

刘帅

2026-09-21 86ce1aaf6819a6d62cfba4233219fa4661aacbff

 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;
@@ -15,12 +16,11 @@
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.CouponDeductionQuery;
import com.dsh.activity.model.CouponDeductionVO;
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 +51,9 @@

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


    @Autowired
    private CouponStoreService csServie;
@@ -66,11 +69,25 @@
    private StoreClient storeClient;
    @Autowired
    private SiteClient siteClient;
    @Autowired
    private PointsMerchandiseService pointsMerchandiseService;




    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");

    /**
     * 批量查询已核销优惠券的抵扣金额，供运营数据统计使用。
     *
     * @param query 用户优惠券领取记录 ID 集合
     * @return 每条领取记录对应的抵扣金额
     */
    @ResponseBody
    @PostMapping("/base/userCoupon/queryDeductionAmounts")
    public List<CouponDeductionVO> queryDeductionAmounts(@RequestBody CouponDeductionQuery query) {
        return userCouponService.queryDeductionAmounts(query);
    }

    @PostMapping("/base/userConpon/getStuOfConpons")
    public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId) {
@@ -169,8 +186,34 @@
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
            if(!StringUtils.hasLength(lon)){
                return ResultUtil.success(new ArrayList<>());
            }
            if (lon.equals("0.0")){
                return ResultUtil.success(new ArrayList<>());

            }
            List<CouponListVo> listVos = userCouponService.querySiteCouponList(uid, siteId, price, lon, lat);
            return ResultUtil.success(listVos);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }

    @ResponseBody
    @PostMapping("/api/coupon/queryStoreCouponList")
    @ApiOperation(value = "订单支付页可用优惠券列表（购买门票、购买惠民卡）")
    public ResultUtil<List<CouponListVo>> queryStoreCouponList(Integer storeId, Double price, String lon, String lat) {
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if (uid == null) {
                return ResultUtil.tokenErr();
            }
            if (storeId == null || price == null || price < 0) {
                return ResultUtil.error("门店和订单金额不能为空");
            }
            return ResultUtil.success(userCouponService.queryStoreCouponList(uid, storeId, price, lon, lat));
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -194,6 +237,55 @@
            e.printStackTrace();
            return null;
        }
    }


    /**
     * 根据id修改门票使用状态
     *
     * @param id
     * @return
     */
    @GetMapping("/userCoupon/changeTicketStatus/{id}/{storeId}/{siteId}")
    public void changeTicketStatus(@PathVariable("id") String id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId){
        System.err.println("数据id"+id);
        if (id.length()<=11){
            // 购买会员赠送的门票
            System.err.println("会员赠送门票");
            VipDetail vipDetail = vipDetailService.getById(Integer.valueOf(id));
            System.err.println("会员权益门票数据"+ vipDetail);
            if (vipDetail!=null){
                System.err.println("修改使用状态");
                vipDetail.setStatus(2);
                vipDetail.setUseStoreId(storeId);
                vipDetail.setUseSiteId(siteId);
                vipDetailService.updateById(vipDetail);
            }else{
                System.err.println("未查询到会员权益门票数据"+ id);
            }
        }else{
            // 积分商城门票
            System.err.println("积分商城门票id");
            UserPointsMerchandise userPointsMerchandise = userPointsMerchandiseService.getById(id);
            System.err.println("积分商城门票数据"+ userPointsMerchandise);
            if (userPointsMerchandise!=null){
                PointsMerchandise pointsMerchandise = pointsMerchandiseService.getById(userPointsMerchandise.getPointsMerchandiseId());
                if (pointsMerchandise!=null){
                    if (pointsMerchandise.getCardType()==1){
                        System.err.println("日卡修改使用状态");
                        userPointsMerchandise.setUserId(null);
                        userPointsMerchandise.setVerificationTime(new Date());
                        userPointsMerchandise.setVerifiStoreId(storeId);
                        userPointsMerchandise.setStatus(2);
                        userPointsMerchandiseService.updateById(userPointsMerchandise);
                    }
                }

            }else{
                System.err.println("未查询到积分商城门票数据"+ id);
            }
        }

    }

    @ResponseBody
@@ -375,6 +467,13 @@
        List<VipDetail> list = vipDetailService.lambdaQuery().eq(VipDetail::getVipPaymentId, id).list();
        for (VipDetail vipDetail : list) {
            vipDetail.setStatus(3);
            if (vipDetail.getType()==1){
                // 将优惠券修改为过期
                UserCoupon userCoupon = userCouponService.getById(vipDetail.getUserCouponId());
                userCoupon.setUserId(null);
                userCoupon.setStatus(3);
                userCouponService.updateById(userCoupon);
            }
        }
        vipDetailService.updateBatchById(list);
    }