登录接口和绑定激光推送号 ,T_REGISTER_NO_MAPPER 增加userType字段

weiliwhereareyou@163.com
1 parent 4c2380a3
Showing 9 changed files with 85 additions and 40 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/RegisterNoMapper.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/Constant.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNoReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetRegisterNobyUidsReq.java
mobsite-getway-manager/src/main/java/com/diligrp/mobsite/getway/manager/common/RegisterNoMapperManager.java
mobsite-getway-manager/src/main/java/com/diligrp/mobsite/getway/manager/common/impl/RegisterNoMapperManagerImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerUserServiceImpl.java
mobsite-getway-web/src/main/resources/mybatis/sqlmap/RegisterNoMapperDao.xml
@@ -23,6 +23,10 @@ public class RegisterNoMapper extends BaseDomain {
 	 */
 	private Long userid;
 	/**
+	 * 用户类型:10-买家，20-卖家
+	 */
+	private Integer userType;
+	/**
 	 * 注册ID
 	 */
 	private String registerNo;
@@ -36,6 +40,15 @@ public class RegisterNoMapper extends BaseDomain {
 	 */
 	private Integer deviceType;
+
+	public Integer getUserType() {
+		return userType;
+	}
+
+	public void setUserType(Integer userType) {
+		this.userType = userType;
+	}
+
 	public void setUserid(Long userid) {
 		this.userid = userid;
 	}
@@ -121,8 +121,11 @@ public class Constant {
     /**
      * 用户
      */
-    public static final long USER_ROLE_BUYER = 10L;//买家
-    public static final long USER_ROLE_SELLER = 20L;//卖家
+    public static final int USER_ROLE_BUYER = 10;//买家
+    public static final int USER_ROLE_SELLER = 20;//卖家
+
+    public static final String USER_ROLE_SIGN_BUYER = "buyer";//买家
+    public static final String USER_ROLE_SIGN_SELLER = "seller";//卖家
     public static final int USER_TYPE_PERSONAL = 1;
     public static final int USER_TYPE_COMPANY = 2;
     public static final int USER_AUTH_RESULT_NOTAUTH = 100;//未认证
@@ -21,15 +21,15 @@ public class GetRegisterNoReq {
 	private Long userId;
 	@ApiModelProperty(value = "用户角色：10买家,20卖家")
-	private Long userRole;
+	private Long userType;
-	public Long getUserRole() {
-		return userRole;
+	public Long getUserType() {
+		return userType;
 	}
-	public void setUserRole(Long userRole) {
-		this.userRole = userRole;
+	public void setUserType(Long userType) {
+		this.userType = userType;
 	}
 	public Long getUserId() {
@@ -26,15 +26,15 @@ public class GetRegisterNobyUidsReq  {
 	private Integer platform;
 	@ApiModelProperty(value = "用户角色：10买家,20卖家")
-	private Long userRole;
+	private Long userType;
-	public Long getUserRole() {
-		return userRole;
+	public Long getUserType() {
+		return userType;
 	}
-	public void setUserRole(Long userRole) {
-		this.userRole = userRole;
+	public void setUserType(Long userType) {
+		this.userType = userType;
 	}
 	public List<Long> getUserIds() {
@@ -32,12 +32,13 @@ public interface RegisterNoMapperManager {
     RegisterNoMapper bindRegisterNo(RegisterNoMapper mapper);
     void unBindRegisterNo(RegisterNoMapper mapper);
-    public List<RegisterNoMapper> getRegisterNo(Long userid);
+   // public List<RegisterNoMapper> getRegisterNo(Long userid);
     /**
      * 批量查询
      * @param baseQuery
      * @return
      */
     public List<RegisterNoMapper> batchQuery(Map<String, Object> baseQuery);
-    
+
+    List<RegisterNoMapper> getRegisterNo(Long userType, Long userId);
 }
@@ -59,9 +59,11 @@ public class RegisterNoMapperManagerImpl implements RegisterNoMapperManager {
     public RegisterNoMapper bindRegisterNo(RegisterNoMapper mapper) {
         final List<RegisterNoMapper> registerNoMappers = registerNoMapperDao.listByConditionNoYn(new BaseQuery()
                 .addParam("registerNo", mapper.getRegisterNo())
+                .addParam("userType", mapper.getUserType()+"")
                 .addParam("sysFlag", mapper.getSysFlag() + ""));
         final List<RegisterNoMapper> otherRegisterNoMappers = findByQuery(new BaseQuery()
                 .addParam("userid", mapper.getUserid().toString())
+                .addParam("userType", mapper.getUserType()+"")
                 .addParam("sysFlag", mapper.getSysFlag() + ""));
         if (!Validator.isEmpty(otherRegisterNoMappers)) {
             for (RegisterNoMapper registerNoMapper : otherRegisterNoMappers) {
@@ -75,8 +77,9 @@ public class RegisterNoMapperManagerImpl implements RegisterNoMapperManager {
         if (!Validator.isEmpty(registerNoMappers)) {
         	oldMapper = registerNoMappers.get(0);
         	newMapper = new RegisterNoMapper();
-            newMapper.setUserid(mapper.getUserid());
             newMapper.setId(oldMapper.getId());
+            newMapper.setUserid(mapper.getUserid());
+            newMapper.setUserType(mapper.getUserType());
             newMapper.setRegisterNo(mapper.getRegisterNo());
             newMapper.setSysFlag(mapper.getSysFlag());
             newMapper.setDeviceType(mapper.getDeviceType());
@@ -87,17 +90,6 @@ public class RegisterNoMapperManagerImpl implements RegisterNoMapperManager {
             }else {
                 return oldMapper;
             }
-//        	if (mapper.getUserid().equals(oldMapper.getUserid())) {
-//        		return null;
-//			}else {
-//        		newMapper.setUserid(mapper.getUserid());
-//        		newMapper.setId(oldMapper.getId());
-//        		newMapper.setRegisterNo(mapper.getRegisterNo());
-//        		newMapper.setSysFlag(mapper.getSysFlag());
-//        		newMapper.setDeviceType(mapper.getDeviceType());
-//			}
-//        	update(newMapper);
-//        	return oldMapper;
         }
         save(mapper);
         return null;
@@ -108,6 +100,7 @@ public class RegisterNoMapperManagerImpl implements RegisterNoMapperManager {
         final List<RegisterNoMapper> registerNoMappers = findByQuery(new BaseQuery()
                 .addParam("userid", mapper.getUserid().toString())
+                .addParam("userType", mapper.getUserType().toString())
                 .addParam("sysFlag", mapper.getSysFlag() + ""));
         if (!Validator.isEmpty(registerNoMappers)) {
             for (RegisterNoMapper registerNoMapper : registerNoMappers) {
@@ -117,11 +110,19 @@ public class RegisterNoMapperManagerImpl implements RegisterNoMapperManager {
         }
     }
-	@Override
-	public List<RegisterNoMapper> getRegisterNo(Long userid) {
-		return registerNoMapperDao.getByUserId(userid);
-	}
+	//@Override
+	//public List<RegisterNoMapper> getRegisterNo(Long userid) {
+	//	return registerNoMapperDao.getByUserId(userid);
+	//}
+    @Override
+    public List<RegisterNoMapper> getRegisterNo(Long userType, Long userId) {
+        final List<RegisterNoMapper> registerNoMappers = findByQuery(new BaseQuery()
+                .addParam("userid", userId+"")
+                .addParam("userType", userType+"")
+                 );
+        return registerNoMappers;
+    }
     @Override
@@ -130,4 +131,6 @@ public class RegisterNoMapperManagerImpl implements RegisterNoMapperManager {
 		return registerNoMapperDao.batchQuery(baseQuery);
 	}
+
+
 }
@@ -73,7 +73,7 @@ public class UserServiceImpl implements UserService {
         if (!Validator.isEmpty(req.getRegisterNo())) {
             // 缓存
-            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_BUYER+
+            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
                     String.valueOf(resp.getAccountId()));
             GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
@@ -83,6 +83,7 @@ public class UserServiceImpl implements UserService {
             mapper.setRegisterNo(req.getRegisterNo());
             mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
             mapper.setUserid(resp.getAccountId());
+            mapper.setUserType(Constant.USER_ROLE_BUYER);
             mapper.setDeviceType(req.getDeviceType());
             try {
                 //清除当前极光号userid缓存
@@ -108,7 +109,7 @@ public class UserServiceImpl implements UserService {
         RegisterNoMapper oldmapper = registerNoMapperManager
                 .bindRegisterNo(mapper);
         if (!Validator.isNull(oldmapper)){
-            String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+            String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
                     String.valueOf(oldmapper.getUserid()));
             redisUtil.deleteByKey(oldKey);
         }
@@ -357,12 +358,13 @@ public class UserServiceImpl implements UserService {
             String userId = req.getUserId().toString();
             //先清缓存再清数据库
-            String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_BUYER+userId);
+            String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_BUYER+userId);
             RegisterNoMapper mapper = new RegisterNoMapper();
             mapper.setRegisterNo(req.getRegisterNo());
             mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
             mapper.setUserid(req.getUserId());
+            mapper.setUserType(Constant.USER_ROLE_BUYER);
             mapper.setDeviceType(req.getDeviceType());
             try {
                 redisUtil.deleteByKey(reNOCache);
@@ -433,18 +435,23 @@ public class UserServiceImpl implements UserService {
     @Override
     public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
         GetRegisterNoResp resp = new GetRegisterNoResp();
-        if (Validator.isNull(req.getUserId())||Validator.isNull(req.getUserRole())) {
+        if (Validator.isNull(req.getUserId())||Validator.isNull(req.getUserType())) {
             resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
-            resp.setMsg("用户ID和用户角色不能为空");
+            resp.setMsg("用户ID和用户类型不能为空");
             return resp;
         }
         //先从缓存取
-        String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, req.getUserRole()+String.valueOf(req.getUserId()));
+        String redisKey="";
+        if (req.getUserType()==Constant.USER_ROLE_BUYER){
+            redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(req.getUserId()));
+        }else if (req.getUserType()==Constant.USER_ROLE_SELLER){
+            redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(req.getUserId()));
+        }
         GetRegisterNoResp recache = redisUtil.getObject(redisKey, GetRegisterNoResp.class);
         if (!Validator.isNull(recache) && !Validator.isEmpty(recache.getRegisterNos())) {
             resp.setRegisterNos(recache.getRegisterNos());
         }else {
-            List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserId());
+            List<RegisterNoMapper> mapppers = registerNoMapperManager.getRegisterNo(req.getUserType(),req.getUserId());
             if (!Validator.isEmpty(mapppers)) {
                 resp.setRegisterNos(mapppers);
@@ -462,6 +469,7 @@ public class UserServiceImpl implements UserService {
         GetRegisterNobyUidsResp resp = new GetRegisterNobyUidsResp();
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("userids", req.getUserIds());
+        param.put("userType",req.getUserType());
         if (!Validator.isNull(req.getPlatform())) {
             param.put("device_type",req.getPlatform().toString());
         }
@@ -74,7 +74,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 		if (!Validator.isEmpty(req.getRegisterNo())) {
 			// 缓存
-			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SELLER+
+			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_SELLER+
 					String.valueOf(resp.getSellerId()));
 			GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
@@ -84,6 +84,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 			mapper.setRegisterNo(req.getRegisterNo());
 			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
 			mapper.setUserid(resp.getSellerId());
+			mapper.setUserType(Constant.USER_ROLE_SELLER);
 			mapper.setDeviceType(req.getDeviceType());
 			try {
 				//清除当前极光号userid缓存
@@ -108,7 +109,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 		RegisterNoMapper oldmapper = registerNoMapperManager
 				.bindRegisterNo(mapper);
 		if (!Validator.isNull(oldmapper)){
-			String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+			String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_SELLER+
 					String.valueOf(oldmapper.getUserid()));
 			redisUtil.deleteByKey(oldKey);
 		}
@@ -327,12 +328,13 @@ public class SellerUserServiceImpl implements SellerUserService {
 			String userId = req.getUserId().toString();
 			//先清缓存再清数据库
-			String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SELLER+userId);
+			String reNOCache = redisUtil.makeKey(RedisKey.USER_REGISTERNO, Constant.USER_ROLE_SIGN_SELLER+userId);
 			RegisterNoMapper mapper = new RegisterNoMapper();
 			mapper.setRegisterNo(req.getRegisterNo());
 			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
 			mapper.setUserid(req.getUserId());
+			mapper.setUserType(Constant.USER_ROLE_SELLER);
 			mapper.setDeviceType(req.getDeviceType());
 			try {
 				redisUtil.deleteByKey(reNOCache);
@@ -7,6 +7,7 @@
             <result property="registerNo" column="register_no"/>
             <result property="sysFlag" column="sys_flag"/>
             <result property="deviceType" column="device_type"/>
+             <result property="userType" column="user_type"/>
             <result property="yn" column="yn"/>
             <result property="created" column="created"/>
             <result property="modified" column="modified"/>
@@ -55,11 +56,13 @@
                     ,register_no
                     ,sys_flag
                     ,device_type
+                     ,user_type
 		) VALUES(
                     #{userid}
                     ,#{registerNo}
                     ,#{sysFlag}
                     ,#{deviceType}
+                     ,#{userType}
 		)
 		]]>
 	</insert>
@@ -88,6 +91,9 @@
             <if test="param.userid != null and param.userid != ''">
             and userid = #{param.userid}
             </if>
+            <if test="param.userType != null and param.userType != ''">
+                and userType = #{param.userType}
+            </if>
             <if test="param.registerNo != null and param.registerNo != ''">
             and register_no = #{param.registerNo}
             </if>
@@ -126,6 +132,9 @@
                 <if test="param.userid != null and param.userid != ''">
                     and userid = #{param.userid}
                 </if>
+                <if test="param.userType != null and param.userType != ''">
+                    and userType = #{param.userType}
+                </if>
                 <if test="param.registerNo != null and param.registerNo != ''">
                     and register_no = #{param.registerNo}
                 </if>
@@ -170,6 +179,9 @@
             <if test="param.userid != null and param.userid != ''">
                 and userid = #{param.userid}
             </if>
+            <if test="param.userType != null and param.userType != ''">
+                and userType = #{param.userType}
+            </if>
             <if test="param.registerNo != null and param.registerNo != ''">
                 and register_no = #{param.registerNo}
             </if>
@@ -212,6 +224,9 @@
 			#{userid}
 			</foreach>
 		</if>
+        <if test="param.userType != null and param.userType != ''">
+            and userType = #{param.userType}
+        </if>
 		<if test="device_type != null and device_type != ''">
 			and device_type = #{device_type}
 		</if>