修改完善订单，用户信息

yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java

@@ -17,126 +17,121 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.app.dto.UserCenterInfoDto;
 import com.yami.shop.bean.app.dto.UserDto;
 import com.yami.shop.bean.app.param.UserInfoParam;
-import com.yami.shop.bean.model.ShopAuditing;
-import com.yami.shop.bean.model.ShopDetail;
-import com.yami.shop.bean.model.User;
-import com.yami.shop.bean.model.UserExtension;
+import com.yami.shop.bean.model.*;
 import com.yami.shop.bean.param.UserParam;
 import com.yami.shop.config.WxConfig;
+import com.yami.shop.dao.ChannelMapper;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户信息
+ *
  * @author LGH
  */
 @RestController
 @RequestMapping("/p/user")
-@Api(tags="用户接口")
+@Api(tags = "用户接口")
 @AllArgsConstructor
 public class UserController {
 
-	private final UserService userService;
-
-	private final MapperFacade mapperFacade;
+    private final UserService userService;
 
-	private final OrderService orderService;
+    private final MapperFacade mapperFacade;
 
-	private final ShopDetailService shopDetailService;
+    private final OrderService orderService;
 
-	private final ShopAuditingService shopAuditingService;
+    private final ShopDetailService shopDetailService;
 
-	private final WxConfig wxConfig;
+    private final ShopAuditingService shopAuditingService;
 
-	private final UserExtensionService userExtensionService;
+    private final WxConfig wxConfig;
 
+    private final ChannelMapper channelMapper;
 
 
     /**
      * 查看用户接口
      */
     @GetMapping("/userInfo")
-    @ApiOperation(value="查看用户信息", notes="根据用户ID（userId）获取用户信息")
+    @ApiOperation(value = "查看用户信息", notes = "根据用户ID（userId）获取用户信息")
     public ResponseEntity<UserDto> userInfo() {
-    	String userId = SecurityUtils.getUser().getUserId();
-    	User user = userService.getUserByUserId(userId);
-		//获取用户等级积分详细表
-		UserExtension extension = userExtensionService.getOne(
-				new LambdaQueryWrapper<UserExtension>().eq(UserExtension::getUserId, SecurityUtils.getUser().getUserId()));
-    	UserDto userDto = mapperFacade.map(user, UserDto.class);
-		userDto.setLevel(extension.getLevel());
-		userDto.setGrowth(extension.getGrowth());
-		userDto.setScore(extension.getScore());
-		userDto.setLevelType(extension.getLevelType());
-		userDto.setBalance(extension.getBalance());
-		if(userDto.getUserMobile() != null){
-			userDto.setMobile(userDto.getUserMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"));
-		}
+        String userId = SecurityUtils.getUser().getUserId();
+        User user = userService.getUserByUserId(userId);
+        UserDto userDto = mapperFacade.map(user, UserDto.class);
+        Channel channel = channelMapper.selectById(user.getChannelId());
+        if (ObjectUtils.isNotEmpty(channel)) {
+            userDto.setEnterprise(channel.getChannelName());
+        }
+        if (userDto.getUserMobile() != null) {
+            userDto.setMobile(userDto.getUserMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+        }
 
         return ResponseEntity.ok(userDto);
     }
 
     @PutMapping("/setUserInfo")
-    @ApiOperation(value="设置用户信息", notes="设置用户信息")
+    @ApiOperation(value = "设置用户信息", notes = "设置用户信息")
     public ResponseEntity<Void> setUserInfo(@RequestBody UserInfoParam userInfoParam) {
         String userId = SecurityUtils.getUser().getUserId();
         User user = new User();
         user.setUserId(userId);
-        user.setPic(StrUtil.isBlank(userInfoParam.getAvatarUrl())?null :userInfoParam.getAvatarUrl());
-        user.setSex(userInfoParam.getSex() == null?user.getSex():userInfoParam.getSex());
-        user.setNickName(userInfoParam.getNickName() == null?user.getNickName():userInfoParam.getNickName());
-        user.setUserMobile(userInfoParam.getUserMobile() == null?user.getUserMobile():userInfoParam.getUserMobile());
-        user.setBirthDate(userInfoParam.getBirthDate() == null?user.getBirthDate():userInfoParam.getBirthDate());
-        user.setUserMail(StrUtil.isNotBlank(userInfoParam.getUserMail())?userInfoParam.getUserMail():user.getUserMail());
-        if(StrUtil.isNotBlank(userInfoParam.getNickName())){
+        user.setPic(StrUtil.isBlank(userInfoParam.getAvatarUrl()) ? null : userInfoParam.getAvatarUrl());
+        user.setSex(userInfoParam.getSex() == null ? user.getSex() : userInfoParam.getSex());
+        user.setNickName(userInfoParam.getNickName() == null ? user.getNickName() : userInfoParam.getNickName());
+        user.setUserMobile(userInfoParam.getUserMobile() == null ? user.getUserMobile() : userInfoParam.getUserMobile());
+        user.setBirthDate(userInfoParam.getBirthDate() == null ? user.getBirthDate() : userInfoParam.getBirthDate());
+        user.setUserMail(StrUtil.isNotBlank(userInfoParam.getUserMail()) ? userInfoParam.getUserMail() : user.getUserMail());
+        if (StrUtil.isNotBlank(userInfoParam.getNickName())) {
             user.setNickName(userInfoParam.getNickName());
         }
         userService.updateById(user);
         return ResponseEntity.ok().build();
     }
 
-	@GetMapping("/centerInfo")
-	@ApiOperation(value="个人中心信息", notes="获取用户个人中心信息")
-	public ResponseEntity<UserCenterInfoDto> centerInfo() {
-		String userId = SecurityUtils.getUser().getUserId();
-		UserCenterInfoDto userCenterInfoDto = new UserCenterInfoDto();
-		userCenterInfoDto.setOrderCountData(orderService.getOrderCount(userId));
+    @GetMapping("/centerInfo")
+    @ApiOperation(value = "个人中心信息", notes = "获取用户个人中心信息")
+    public ResponseEntity<UserCenterInfoDto> centerInfo() {
+        String userId = SecurityUtils.getUser().getUserId();
+        UserCenterInfoDto userCenterInfoDto = new UserCenterInfoDto();
+        userCenterInfoDto.setOrderCountData(orderService.getOrderCount(userId));
 
-		ShopAuditing shopAuditing = shopAuditingService.getShopAuditingByUserId(userId);
+        ShopAuditing shopAuditing = shopAuditingService.getShopAuditingByUserId(userId);
 
-		userCenterInfoDto.setShopAuditStatus(shopAuditing == null ? null : shopAuditing.getStatus());
+        userCenterInfoDto.setShopAuditStatus(shopAuditing == null ? null : shopAuditing.getStatus());
 
-		ShopDetail shopDetail = shopDetailService.getShopDetailByUserId(userId);
+        ShopDetail shopDetail = shopDetailService.getShopDetailByUserId(userId);
 
-		userCenterInfoDto.setIsSetPassword(shopDetail != null && StrUtil.isNotBlank(shopDetail.getPassword()));
+        userCenterInfoDto.setIsSetPassword(shopDetail != null && StrUtil.isNotBlank(shopDetail.getPassword()));
 
-		userCenterInfoDto.setShopId(shopDetail == null ?  null : shopDetail.getShopId());
-		userCenterInfoDto.setShopStatus(shopDetail == null ?  null : shopDetail.getShopStatus());
-		return ResponseEntity.ok(userCenterInfoDto);
-	}
+        userCenterInfoDto.setShopId(shopDetail == null ? null : shopDetail.getShopId());
+        userCenterInfoDto.setShopStatus(shopDetail == null ? null : shopDetail.getShopStatus());
+        return ResponseEntity.ok(userCenterInfoDto);
+    }
 
 
-	@GetMapping("/getPhoneNumber")
-	@ApiOperation(value="获取用户绑定手机号", notes="根据小程序的加密数据，iv获取当前用户的手机号")
-	public ResponseEntity<WxMaPhoneNumberInfo> getPhoneNumber(@RequestParam String encryptedData, @RequestParam String ivStr) {
+    @GetMapping("/getPhoneNumber")
+    @ApiOperation(value = "获取用户绑定手机号", notes = "根据小程序的加密数据，iv获取当前用户的手机号")
+    public ResponseEntity<WxMaPhoneNumberInfo> getPhoneNumber(@RequestParam String encryptedData, @RequestParam String ivStr) {
 
-		return ResponseEntity.ok(wxConfig.getWxMaService().getUserService().getPhoneNoInfo(SecurityUtils.getUser().getSessionKey(), encryptedData, ivStr));
-	}
+        return ResponseEntity.ok(wxConfig.getWxMaService().getUserService().getPhoneNoInfo(SecurityUtils.getUser().getSessionKey(), encryptedData, ivStr));
+    }
 
-	@GetMapping("/getUserScore")
-	@ApiOperation(value="获取用户积分", notes="返回用户的积分信息")
-	public ResponseEntity<UserParam> getUserScore() {
-		String userId = SecurityUtils.getUser().getUserId();
-		User user = userService.getById(userId);
-		UserParam userParam = mapperFacade.map(user,UserParam.class);
-		System.out.println();
-		return ResponseEntity.ok(userParam);
-	}
+    @GetMapping("/getUserScore")
+    @ApiOperation(value = "获取用户积分", notes = "返回用户的积分信息")
+    public ResponseEntity<UserParam> getUserScore() {
+        String userId = SecurityUtils.getUser().getUserId();
+        User user = userService.getById(userId);
+        UserParam userParam = mapperFacade.map(user, UserParam.class);
+        System.out.println();
+        return ResponseEntity.ok(userParam);
+    }
 
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java

@@ -10,56 +10,71 @@
 
 package com.yami.shop.bean.app.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class UserDto {
 
 
-	@ApiModelProperty(value = "用户状态：0禁用 1正常",required=true)
-	private Integer status;
+    @ApiModelProperty(value = "用户状态：0禁用 1正常", required = true)
+    private Integer status;
 
-	@ApiModelProperty(value = "用户昵称")
-	private String nickName;
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
 
-	@ApiModelProperty(value = "用户性别M(男 1) or F(女 0)")
-	private String sex;
+    @ApiModelProperty(value = "用户性别M(男 1) or F(女 0)")
+    private String sex;
 
-	@ApiModelProperty(value = "用户手机号")
-	private String userMobile;
+    @ApiModelProperty(value = "用户手机号")
+    private String userMobile;
 
-	@ApiModelProperty(value = "用户手机号隐藏位数")
-	private String mobile;
+    @ApiModelProperty(value = "用户手机号隐藏位数")
+    private String mobile;
 
-	@ApiModelProperty(value = "头像图片路径")
-	private String pic;
+    @ApiModelProperty(value = "头像图片路径")
+    private String pic;
+
+    @ApiModelProperty(value = "用户生日")
+    private String birthDate;
+    /**
+     * 用户等级
+     */
+    @ApiModelProperty(value = "用户等级")
+    private Integer level;
+    /**
+     * 等级条件 0 普通会员 1 付费会员
+     */
+    @ApiModelProperty(value = "等级条件 0 普通会员 1 付费会员")
+    private Integer levelType;
+    /**
+     * 用户当前成长值
+     */
+    @ApiModelProperty(value = "用户当前成长值")
+    private Integer growth;
+    /**
+     * 用户积分
+     */
+    @ApiModelProperty(value = "用户积分")
+    private Integer score;
+    /**
+     * 用户余额
+     */
+    @ApiModelProperty(value = "用户余额")
+    private Double balance;
+    /**
+     * 企业名字
+     */
+    @ApiModelProperty(value = "企业名字")
+    private String enterprise;
 
-	@ApiModelProperty(value = "用户生日")
-	private String birthDate;
-	/**
-	 * 用户等级
-	 */
-	@ApiModelProperty(value = "用户等级")
-	private Integer level;
-	/**
-	 * 等级条件 0 普通会员 1 付费会员
-	 */
-	@ApiModelProperty(value = "等级条件 0 普通会员 1 付费会员")
-	private Integer levelType;
-	/**
-	 * 用户当前成长值
-	 */
-	@ApiModelProperty(value = "用户当前成长值")
-	private Integer growth;
-	/**
-	 * 用户积分
-	 */
-	@ApiModelProperty(value = "用户积分")
-	private Integer score;
-	/**
-	 * 用户余额
-	 */
-	@ApiModelProperty(value = "用户余额")
-	private Double balance;
 }