From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 7de2ec7..99cf9c1 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());
@@ -466,7 +485,9 @@
})
public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
try {
- return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
+ PointDetailsVo pointDetailsVo = uicService.queryRedemptionDetails(detailsId);
+ pointDetailsVo.getPics().remove(0);
+ return ResultUtil.success(pointDetailsVo);
}catch (Exception e){
return ResultUtil.runErr();
}
--
Gitblit v1.7.1