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 | 94 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 21 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 0657af9..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;
@@ -14,10 +15,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;
@@ -57,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();
}
@@ -76,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 {
@@ -85,15 +94,32 @@
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());
detailsVo.setUserName(tAppUser.getName());
detailsVo.setUserPhone(tAppUser.getPhone());
- detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
+ 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.setAddress(tAppUser.getProvince()+tAppUser.getCity());
- detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
+ if(tAppUser.getVipEndTime()!=null){
+
+ detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
+ }
}
return ResultUtil.success(detailsVo);
}catch (Exception e){
@@ -277,11 +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();
+// }
}
@@ -299,6 +326,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();
}
@@ -362,7 +406,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){
@@ -409,14 +453,20 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "使用状态 （1已使用 2未使用）", name = "useType", required = false, dataType = "string"),
@ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodType", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "page", name = "页数", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "size", name = "size", required = true, dataType = "int"),
})
- public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType){
+ public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType,Integer page,Integer size){
try {
+ if(page==null || size==null){
+ page=1;
+ size=10;
+ }
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(uicService.queryExchangeGoodsdetails(userIdFormRedis,useType,goodType));
+ return ResultUtil.success(uicService.queryExchangeGoodsdetails1(userIdFormRedis,useType,goodType,page,size));
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -433,12 +483,14 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "记录id", name = "detailsId", required = true, dataType = "string"),
})
- public ResultUtil<PointDetailsVo> redemptionDetails(Integer detailsId){
- try {
- return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+ public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
+// try {
+ PointDetailsVo pointDetailsVo = uicService.queryRedemptionDetails(detailsId);
+ pointDetailsVo.getPics().remove(0);
+ return ResultUtil.success(pointDetailsVo);
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1