java/qijisheng.git

			@@ -13,9 +13,13 @@
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.bean.BeanUtils;
			import com.ruoyi.account.api.vo.PaymentUserCoupon;
			import com.ruoyi.other.api.domain.Goods;
			import com.ruoyi.other.api.feignClient.GoodsClient;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.List;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.other.api.domain.CouponInfo;
			@@ -48,6 +52,8 @@

			@Resource
			private UserPointService userPointService;
			@Resource
			private GoodsClient goodsClient;



			@@ -65,6 +71,25 @@
			CouponInfo data = couponClient.detail(record.getCouponId()).getData();
			CouponInfoVo vo = new CouponInfoVo();
			BeanUtils.copyProperties(data,vo);
			//如果是商品券，将商品名称返回
			if (vo.getCouponType()==4){
			List<String> goodNames = new ArrayList<>();
			if (vo.getForGoodIds().equals("-1")){
			goodNames.add("全部商品");
			}else{
			String[] split = vo.getForGoodIds().split(",");
			R<List<Goods>> goodsById = goodsClient.getGoodsById(split);
			if (goodsById.getData()!=null){
			for (Goods datum : goodsById.getData()) {
			goodNames.add(datum.getName());
			}
			}
			vo.setGoodNames(goodNames);
			}
			}



			record.setCouponInfoVo(vo);
			if (record.getUseTime()==null){
			record.setStatus(1);