修改bug

Pu Zhibing

9 天以前 3244b550596e0330031b3f4547356927df83b0ad

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java

@@ -1,15 +1,19 @@
package com.ruoyi.account.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.account.api.model.TAppUserVipDetail;
import com.ruoyi.account.api.model.TVip;
import com.ruoyi.account.api.vo.GetAppUserVipDetail;
import com.ruoyi.account.service.TAppUserVipDetailService;
import com.ruoyi.account.util.VipInfoDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.dto.VipCouponDto;
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.other.api.feignClient.VipClient;
@@ -48,12 +52,8 @@
            .last(" and now() between start_time and end_time"));
      return R.ok(one);
   }

   @Resource
   private VipClient vipClient;
   @Resource
   private OtherClient otherClient;

	
	
   @GetMapping("/getVipUseDetail")
   @ApiOperation(value = "生效会员列表", tags = {"小程序-个人中心"})
   public R<List<TAppUserVipDetail>> getVipUseDetail(){
@@ -62,8 +62,11 @@

      for (TAppUserVipDetail tAppUserVipDetail : list) {
            if(null != tAppUserVipDetail.getVipId()){
                TVip data = vipClient.getInfo1(tAppUserVipDetail.getVipId()).getData();
                tAppUserVipDetail.setVipName(data.getName());
            TVip tVip = JSONObject.parseObject(tAppUserVipDetail.getVipJson(), TVip.class);
//            TVip data = vipClient.getInfo1(tAppUserVipDetail.getVipId()).getData();
                tAppUserVipDetail.setVipName(tVip.getName());
            tAppUserVipDetail.setType(tVip.getType());
            tAppUserVipDetail.setVip(tVip);
            }
        }