From a96c5eddcd63fa6f09e4cdce9e28c7b846068f0c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 九月 2024 16:45:51 +0800
Subject: [PATCH] 9.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserVipDetailController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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..47aab16 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
@@ -6,6 +6,8 @@
import com.ruoyi.account.service.TAppUserVipDetailService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.feignClient.VipClient;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -39,13 +41,32 @@
return R.ok(one);
}
+ @Resource
+ private VipClient vipClient;
+
@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();
+
+ 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