From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 3a1ec1d..c107e9f 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
@@ -14,10 +14,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -90,14 +87,15 @@
detailsVo.setUserImage(tAppUser.getHeadImg());
detailsVo.setUserName(tAppUser.getName());
detailsVo.setUserPhone(tAppUser.getPhone());
+ detailsVo.setIsVip(tAppUser.getIsVip());
if(tAppUser.getGender()!=null){
-
detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
}
System.out.println("============="+tAppUser);
if (tAppUser.getBirthday()!=null){
- detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));}
+ detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
+ }
detailsVo.setAddress(tAppUser.getProvince()+tAppUser.getCity());
if(tAppUser.getVipEndTime()!=null){
@@ -287,6 +285,7 @@
})
public ResultUtil<List<Goods>> pointsMallList(MallRequest request){
try {
+ System.out.println("======request========"+request);
return ResultUtil.success(tauService.queryAppUserIntegral(request));
}catch (Exception e){
return ResultUtil.runErr();
@@ -308,6 +307,23 @@
public ResultUtil<ProductDetailsVo> productDetails(Integer goodId, Integer goodsType){
try {
return ResultUtil.success(tauService.productDetails(goodId,goodsType));
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/useBenefit/goodsDetailsOne")
+ @ApiOperation(value = "积分商城-商品详情", tags = {"APP-使用福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "商品id", name = "goodId", required = true, dataType = "int"),
+ })
+ public ResultUtil<ProductDetailsVo> goodsDetailsOne(Integer goodId){
+ try {
+ return ResultUtil.success(tauService.goodsDetailsOne(goodId));
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -371,7 +387,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
+ public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
--
Gitblit v1.7.1