From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index c107e9f..6959633 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -2,6 +2,7 @@
import com.dsh.account.entity.TAppUser;
+import com.dsh.account.feignclient.activity.model.IntegralCommodity;
import com.dsh.account.feignclient.other.SysLogClient;
import com.dsh.account.model.vo.userBenefitDetail.*;
import com.dsh.account.service.RechargeRecordsService;
@@ -54,14 +55,22 @@
@ApiOperation(value = "福利主页", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(name = "lat",value = "经度",dataType = "string"),
+ @ApiImplicitParam(name = "lon",value = "纬度",dataType = "string")
})
- public ResultUtil<IndexOfUserBenefirVo> queryAppUserUser(){
+ public ResultUtil<IndexOfUserBenefirVo> queryAppUserUser(String lon,String lat){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(tauService.queryBenefitDetails(appUserId));
+ IndexOfUserBenefirVo indexOfUserBenefirVo = tauService.queryBenefitDetails(appUserId,lon,lat);
+ List<IntegralCommodity> commodities = indexOfUserBenefirVo.getCommodities();
+ if (commodities.size() > 5) {
+ commodities = commodities.subList(0, 5);
+ }
+ indexOfUserBenefirVo.setCommodities(commodities);
+ return ResultUtil.success(indexOfUserBenefirVo);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -73,6 +82,9 @@
@ApiOperation(value = "用户个人信息", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(name = "lat",value = "经度",dataType = "string"),
+ @ApiImplicitParam(name = "lon",value = "纬度",dataType = "string")
+
})
public ResultUtil<AppUserDetailsVo> queryAppUserDetails(){
try {
@@ -82,6 +94,13 @@
return ResultUtil.tokenErr();
}
TAppUser tAppUser = tauService.getBaseMapper().selectById(appUserId);
+ if (tAppUser.getCode()==null){
+ detailsVo.setNeedChange(1);
+ }else {
+ detailsVo.setNeedChange(0);
+ }
+
+
if (null != tAppUser){
detailsVo.setUserId(appUserId);
detailsVo.setUserImage(tAppUser.getHeadImg());
@@ -284,12 +303,12 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<Goods>> pointsMallList(MallRequest request){
- try {
+// try {
System.out.println("======request========"+request);
return ResultUtil.success(tauService.queryAppUserIntegral(request));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
@@ -465,11 +484,13 @@
@ApiImplicitParam(value = "记录id", name = "detailsId", required = true, dataType = "string"),
})
public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
- try {
- return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+// try {
+ PointDetailsVo pointDetailsVo = uicService.queryRedemptionDetails(detailsId);
+ pointDetailsVo.getPics().remove(0);
+ return ResultUtil.success(pointDetailsVo);
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1