Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserManagerController.java

@@ -61,6 +61,12 @@ public class MerchantUserManagerController extends BaseController {
     public ApiResult<Boolean> addMerchantUser(@Validated(Add.class) @RequestBody MerchantUserAddParam merchantUserAddParam) throws Exception {
         JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
 
+        // 查重
+        MerchantUser one = merchantUserService.getOne(new QueryWrapper<MerchantUser>().lambda().eq(MerchantUser::getUsername,merchantUserAddParam.getUsername()));
+        if (one !=null){
+            return ApiResult.fail();
+        }
+
         MerchantUser merchantUser = new MerchantUser();
         BeanUtils.copyProperties(merchantUserAddParam, merchantUser);
         merchantUser.setMcId(jwtToken.getMcId());

common/src/main/java/com/jumeirah/common/entity/AppUser.java

@@ -76,6 +76,9 @@ public class AppUser extends BaseEntity {
     @ApiModelProperty("头像")
     private String head;
 
+    @ApiModelProperty("推送token")
+    private String deviceToken;
+
     @ApiModelProperty("备注")
     private String remark;
 

common/src/main/resources/mapper/AppUserMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time
+        id, device_token,username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time
     </sql>
 
     <select id="getAppUserById" resultType="com.jumeirah.common.vo.AppUserQueryVo">

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/JwtTokenRedisVo.java

@@ -16,6 +16,7 @@
 
 package io.geekidea.springbootplus.framework.shiro.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -34,10 +35,19 @@ public class JwtTokenRedisVo implements Serializable {
     private static final long serialVersionUID = 1831633309466775223L;
 
     /**
-     * 客户端类型
+     * 用户平台类型
      */
     private String type;
 
+    @ApiModelProperty("设备推送token")
+    private String deviceToken;
+
+
+    /**
+     * 用户系统类型
+     */
+    private String clientType;
+
     /**
      * mcId
      */