From a00dbefc3837ab7781f9d50cd8ddb1261a416b79 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 23 十月 2024 09:54:20 +0800
Subject: [PATCH] marge

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java
index e1d3052..6802f7c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java
@@ -1,15 +1,25 @@
 package com.ruoyi.account.controller;
 
 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.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.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;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,13 +49,38 @@
 		return R.ok(one);
 	}
 
+	@Resource
+	private VipClient vipClient;
+	@Resource
+	private OtherClient otherClient;
+
 	@GetMapping("/getVipUseDetail")
 	@ApiOperation(value = "生效会员列表", tags = {"小程序-个人中心"})
 	public R<List<TAppUserVipDetail>> getVipUseDetail(){
         Long userId = tokenService.getLoginUserApplet().getUserId();
-        List<TAppUserVipDetail> list = appUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, userId).last(" and now() between start_time and end_time order by start_time desc").list();
+        List<TAppUserVipDetail> list = appUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, userId).last(" and now() <= end_time order by start_time asc").list();
+
+		for (TAppUserVipDetail tAppUserVipDetail : list) {
+            if(null != tAppUserVipDetail.getVipId()){
+                TVip data = vipClient.getInfo1(tAppUserVipDetail.getVipId()).getData();
+                tAppUserVipDetail.setVipName(data.getName());
+            }
+        }
+
+
+
+
         return R.ok(list);
 	}
-
+	
+	
+	/**
+	 * 修改会员明细
+	 * @param appUserVipDetail
+	 */
+	@PostMapping("/updateAppUserVipDetail")
+	public void updateAppUserVipDetail(@RequestBody TAppUserVipDetail appUserVipDetail){
+		appUserVipDetailService.updateById(appUserVipDetail);
+	}
 	
 }

--
Gitblit v1.7.1