From 73372f312e8b8bae98623006640b016f9a433988 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 15:12:49 +0800
Subject: [PATCH] 10.16
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..b0f28e2 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
@@ -90,10 +90,19 @@
detailsVo.setUserImage(tAppUser.getHeadImg());
detailsVo.setUserName(tAppUser.getName());
detailsVo.setUserPhone(tAppUser.getPhone());
- detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
- detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
+ 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){
@@ -433,7 +442,7 @@
@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){
+ public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
try {
return ResultUtil.success(uicService.queryRedemptionDetails(detailsId));
}catch (Exception e){
--
Gitblit v1.7.1