bug修改

无关风月

1 天以前 b1fb83530b7105e4aa73e4101727dea945eb01c2

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

@@ -838,7 +838,7 @@
    public ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId) {
        ExchangeDetailsVo detailsVo = new ExchangeDetailsVo();
        List<ExchangeDetailsResponse> responses = new ArrayList<>();
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
                .eq("userId", appUserId).eq("payStatus", 2));

@@ -1110,7 +1110,7 @@
        PointDetailsVo detailsVo = new PointDetailsVo();

        if (speMercharsId.toString().contains("-1")){
            // 会员门票
            // 会员优惠券
            VipDetail vipDetail = vipDetailService.getById(Math.abs(speMercharsId));
            if (vipDetail.getType()==1){
                Coupon coupon = iCouponService.getById(vipDetail.getCouponId());