From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 19:19:47 +0800
Subject: [PATCH] 10.12

---
 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java |   13 ++++++++++---
 1 files changed, 10 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 2e5a5b4..bc36b4a 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
@@ -86,13 +86,20 @@
             }
             TAppUser tAppUser = tauService.getBaseMapper().selectById(appUserId);
             if (null != tAppUser){
+                detailsVo.setUserId(appUserId);
                 detailsVo.setUserImage(tAppUser.getHeadImg());
                 detailsVo.setUserName(tAppUser.getName());
                 detailsVo.setUserPhone(tAppUser.getPhone());
-                detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
+                if(tAppUser.getGender()!=null){
+
+                    detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
+                }
                 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){
@@ -432,7 +439,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