From 16ba89a014b484b7031bb1a1a0354d30c34712b8 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 28 Sep 2018 17:30:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=AD=89=E7=BA=A7][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E8=BF=94=E5=9B=9E=E7=BB=99C=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserGrantController.java | 14 ++++++++----- .../java/com/iformall/domain/po/WxCUser.java | 12 ----------- .../com/iformall/domain/vo/WxCUserVo.java | 21 +++++++++++++++++++ 3 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 962b0dfcd..9a2b335aa 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.WxLevelConfig; +import com.iformall.domain.vo.WxCUserVo; import com.iformall.service.WxCUserCarService; import com.iformall.service.WxCUserService; import com.iformall.service.WxLevelConfigService; @@ -332,17 +333,20 @@ public class WxUserGrantController extends BaseController { @GetMapping("/userinfo") public ResultData getUserInfo() { WxCUser user = getUser(); - if (user.getScore() == null || user.getScore() == 0) { - user.setLevelName("无"); + WxCUserVo userVo = new WxCUserVo(); + org.springframework.beans.BeanUtils.copyProperties(user, userVo); + if (userVo.getScore() == null || userVo.getScore() == 0) { + userVo.setLevelName("无"); } else { + userVo.setLevelName("无"); List levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); for(WxLevelConfig levelConfig: levelList) { - if (user.getScore() > levelConfig.getPoints()) { - user.setLevelName(levelConfig.getLevel()); + if (userVo.getScore() > levelConfig.getPoints()) { + userVo.setLevelName(levelConfig.getLevel()); } } } - return new ResultData(Result.SUCCESS,"查询成功",user); + return new ResultData(Result.SUCCESS,"查询成功", userVo); } @ApiOperation("当前用户名下是否有车") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 7cf97dd6a..a5bf31114 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -134,10 +134,6 @@ public class WxCUser implements Serializable { @Transient protected String sceneDescription; - //等级名称 - @Transient - private String levelName; - public String getChannelName() { return channelName; } @@ -323,14 +319,6 @@ public class WxCUser implements Serializable { this.sceneDescription = sceneDescription; } - public String getLevelName() { - return levelName; - } - - public void setLevelName(String levelName) { - this.levelName = levelName; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java new file mode 100644 index 000000000..ccd165016 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java @@ -0,0 +1,21 @@ +package com.iformall.domain.vo; + + +import com.iformall.domain.po.WxCUser; + +/** + * Created by syf on 2018/8/30. + */ +public class WxCUserVo extends WxCUser { + + // 等级名称 + private String levelName; + + public String getLevelName() { + return levelName; + } + + public void setLevelName(String levelName) { + this.levelName = levelName; + } +}