卖家登录接口开发

weiliwhereareyou@163.com
1 parent 6929451b
Showing 9 changed files with 292 additions and 98 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/LoginResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/user/SellerLoginResp.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PassportRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.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/SellerUserService.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerUserServiceImpl.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/user/SellerUserController.java
@@ -11,42 +11,13 @@ import io.swagger.annotations.ApiModelProperty;
  * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  * <B>Company</B> 地利集团
  * @createTime Aug 12, 2014 7:57:28 PM
- * @author wujianjun
+ * @author weili
  */
 @SuppressWarnings("serial")
 @ApiModel("返回参数")
 public class LoginResp extends BaseResp {
-    /**
-     * 个人用户
-     */
-    public static final Integer USER_TYPE_PERSONAL = 1;
-    /**
-     * 企业用户
-     */
-    public static final Integer USER_TYPE_COMPANY = 2;
-    
-    
-    /**
-     * 账户状态-正常
-     */
-    public static final Integer ACCOUNT_STATE_NORMAL = 1;
-    /**
-     * 账户状态-锁定
-     */
-    public static final Integer ACCOUNT_STATE_LOCK = 2;
-    /**
-     * 账户状态-未激活
-     */
-    public static final Integer ACCOUNT_STATE_INACTIVE = 3;
-    /**
-     * 账户状态-用户名或密码错误
-     */
-    public static final Integer ACCOUNT_STATE_PWD_ERROR = 4;
-    /**
-     * 账户状态-卖家没有开通店铺
-     */
-    public static final Integer ACCOUNT_STATE_NO_SHOP = 11;
+
     /**
      * 用户信息是否完善：1-完善 0-不完善
      */
@@ -78,23 +49,12 @@ public class LoginResp extends BaseResp {
     private String headImg;
-    ///**
-    // * 登录之后，passport返回
-    // * 用于支付鉴权
-    // */
-    //@ApiModelProperty(value = "token")
-    //private String token;
-
-    ///**
-    // * 用户信息是否完善:1-完善  0-不完善
-    // */
-    //@ApiModelProperty(value = "用户信息是否完善:1-完善  0-不完善")
-    //private Integer infoCompleteFlag;
+    
     /**
      * get value of LoginResp.accountId
      * @return the accountId
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public Long getAccountId() {
         return accountId;
@@ -104,7 +64,7 @@ public class LoginResp extends BaseResp {
      * set value of LoginResp.accountId
      * @param accountId the accountId to set
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public void setAccountId(Long accountId) {
         this.accountId = accountId;
@@ -114,7 +74,7 @@ public class LoginResp extends BaseResp {
      * get value of LoginResp.accountName
      * @return the accountName
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public String getAccountName() {
         return accountName;
@@ -124,7 +84,7 @@ public class LoginResp extends BaseResp {
      * set value of LoginResp.accountName
      * @param accountName the accountName to set
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public void setAccountName(String accountName) {
         this.accountName = accountName;
@@ -134,7 +94,7 @@ public class LoginResp extends BaseResp {
      * get value of LoginResp.mobile
      * @return the mobile
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public String getMobile() {
         return mobile;
@@ -144,7 +104,7 @@ public class LoginResp extends BaseResp {
      * set value of LoginResp.mobile
      * @param mobile the mobile to set
      * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
+     * @author weili
      */
     public void setMobile(String mobile) {
         this.mobile = mobile;
 package com.diligrp.mobsite.getway.domain.protocol.saler.user;
-import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import io.swagger.annotations.ApiModelProperty;
 /**
@@ -12,56 +13,83 @@ import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
  * @author zhangshirui
  */
 @SuppressWarnings("serial")
-public class SellerLoginResp extends LoginResp {
+public class SellerLoginResp extends BaseResp {
-    /**
-     * 店铺id
-     */
+
+
+    @ApiModelProperty(value = "卖家id" )
+    private Long sellerId;
+    @ApiModelProperty(value = "店铺id" )
     private Long shopId;
-    /**
-     * 店铺名称
-     */
+    @ApiModelProperty(value = "店铺名称")
     private String shopName;
-    /**
-     * 店铺状态
-     */
-    private Integer shopState;
+    @ApiModelProperty(value = "店铺logo")
+    private String shopLogo;
+
+    @ApiModelProperty(value = "店铺地址")
+    private String shopAddr;
-	/**
-	 * 店铺来源
-	 */
-	private Integer shopSourceId;
+    @ApiModelProperty(value = "客服电话")
+    private String phone;
+
+    @ApiModelProperty(value = "店铺分享码" )
+    private Integer shopAuthCode;
+
+
+    public Long getSellerId() {
+        return sellerId;
+    }
+
+    public void setSellerId(Long sellerId) {
+        this.sellerId = sellerId;
+    }
     public Long getShopId() {
         return shopId;
     }
-    
+
     public void setShopId(Long shopId) {
         this.shopId = shopId;
     }
-    
+
     public String getShopName() {
         return shopName;
     }
-    
+
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
-    public Integer getShopState() {
-        return shopState;
+    public String getShopLogo() {
+        return shopLogo;
+    }
+
+    public void setShopLogo(String shopLogo) {
+        this.shopLogo = shopLogo;
     }
-    public void setShopState(Integer shopState) {
-        this.shopState = shopState;
+    public String getShopAddr() {
+        return shopAddr;
     }
-	public Integer getShopSourceId() {
-		return shopSourceId;
-	}
+    public void setShopAddr(String shopAddr) {
+        this.shopAddr = shopAddr;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
-	public void setShopSourceId(Integer shopSourceId) {
-		this.shopSourceId = shopSourceId;
-	}
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getShopAuthCode() {
+        return shopAuthCode;
+    }
+
+    public void setShopAuthCode(Integer shopAuthCode) {
+        this.shopAuthCode = shopAuthCode;
+    }
 }
 package com.diligrp.mobsite.getway.rpc;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
@@ -21,11 +22,13 @@ import java.util.Map;
  */
 public interface PassportRPC extends BaseService {
-    SellerLoginResp login(LoginReq req);
+    SellerLoginResp sellerLogin(LoginReq req);
     UserRegisterResp register(UserRegisterReq req);
 	String modifyPwd(Map<String, String> params);
     SellerRegisterResp sellerRegister(SellerRegisterReq req);
+
+    LoginResp buyerLogin(LoginReq req);
 }
@@ -6,6 +6,7 @@ import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
+import com.diligrp.mobsite.getway.domain.protocol.login.LoginResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.SellerRegisterResp;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
@@ -58,7 +59,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     }
     @Override
-    public SellerLoginResp login(LoginReq req) {
+    public SellerLoginResp sellerLogin(LoginReq req) {
         Map<String,String> params = new HashMap<String, String>();
         params.put("userName", req.getAccountName());
         params.put("password", req.getPassword());
@@ -92,21 +93,22 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         //resp.setToken(jsonBody.getString("token"));
         JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
-        resp.setAccountId(jsonUser.getLong("accountId"));
-        resp.setMobile(jsonUser.getString("mobile"));
-        resp.setAccountName(jsonUser.getString("accountName"));
-        resp.setMsg(msg);
-        resp.setHeadImg(jsonUser.getString("face"));
+        resp.setSellerId(jsonUser.getLong("accountId"));
+        resp.setPhone(jsonUser.getString("mobile"));
         resp.setShopId(jsonUser.getLong("shopId"));
-
+        resp.setShopLogo("sds.jpg");
+        resp.setShopName("张三的水果店铺");
+        resp.setShopAuthCode(457854);
+        resp.setCode(code);
+        resp.setMsg(msg);
         //缓存userId
-        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(resp.getAccountId()));
-        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getAccountId()), loginExpireTime);
+        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
+        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getSellerId()), loginExpireTime);
         //缓存设备id,userId作为key
         if (!Validator.isNull(req.getDeviceId())) {
-            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SELLER+String.valueOf(resp.getAccountId()));
+            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SELLER+String.valueOf(resp.getSellerId()));
             redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
         }
         return resp;
@@ -192,4 +194,10 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         return resp;
     }
+    @Override
+    public LoginResp buyerLogin(LoginReq req) {
+
+        return null;
+    }
+
 }
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.service.buyer.user.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.diligrp.mobsite.getway.domain.RegisterNoMapper;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
@@ -24,7 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -65,9 +68,70 @@ public class UserServiceImpl implements UserService {
     @Override
     public LoginResp login(LoginReq req) {
-        return null;
+        LoginResp resp = (LoginResp) passportRPC.buyerLogin(req);
+
+        if (!Validator.isEmpty(req.getRegisterNo())) {
+            // 缓存
+            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+                    String.valueOf(resp.getAccountId()));
+
+            GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
+                    GetRegisterNoResp.class);
+            // 绑定极光ID
+            RegisterNoMapper mapper = new RegisterNoMapper();
+            mapper.setRegisterNo(req.getRegisterNo());
+            mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+            mapper.setUserid(resp.getAccountId());
+            mapper.setDeviceType(req.getDeviceType());
+            try {
+                //清除当前极光号userid缓存
+                cleanOldredis(mapper);
+                //构建缓存信息
+                buildRedisInfo(mappers, mapper);
+                redisUtil.setObjectByExpire(redisKey, mappers,
+                        RedisKey.REGISTERNO_EXPIRE_TIME);
+            } catch (Exception e) {
+                throw new ServiceException(ResultCode.PUSH_MESSAGE_NO,
+                        "绑定极光推送系统注册号失败");
+            }
+        }
+        return resp;
     }
+
+    /**
+     * 清除当前极光号下userid缓存
+     * @param mapper
+     */
+    private void cleanOldredis(RegisterNoMapper mapper) {
+        RegisterNoMapper oldmapper = registerNoMapperManager
+                .bindRegisterNo(mapper);
+        if (!Validator.isNull(oldmapper)){
+            String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+                    String.valueOf(oldmapper.getUserid()));
+            redisUtil.deleteByKey(oldKey);
+        }
+    }
+
+    /**
+     * 建立缓存信息
+     * @param mappers
+     * @param mapper
+     */
+    private void buildRedisInfo(GetRegisterNoResp mappers,
+                                RegisterNoMapper mapper) {
+        // 如果缓存没有重新建
+        List<RegisterNoMapper> renolist = new ArrayList<RegisterNoMapper>();
+
+        if (Validator.isNull(mappers)) {
+            mappers = new GetRegisterNoResp();
+        }
+        renolist.add(mapper);
+        mappers.setRegisterNos(renolist);
+    }
+
+
+
     @Override
     public CheckUserInvalidResp checkUserInvalid(CheckUserInvalidReq req) {
         return null;
@@ -343,7 +407,29 @@ public class UserServiceImpl implements UserService {
     @Override
     public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
-        return null;
+        GetRegisterNoResp resp = new GetRegisterNoResp();
+        if (Validator.isNull(req.getUserId())) {
+            resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
+            resp.setMsg("用户ID不能为空");
+            return resp;
+        }
+        //先从缓存取
+        String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, 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());
+            if (!Validator.isEmpty(mapppers)) {
+
+                resp.setRegisterNos(mapppers);
+                redisUtil.setObjectByExpire(redisKey, resp, RedisKey.REGISTERNO_EXPIRE_TIME);
+            }else {
+                resp.setCode(ResultCode.BUSINESS_FAILED);
+                resp.setMsg("该用户没有绑定极光号");
+            }
+        }
+        return resp;
     }
     @Override
@@ -24,7 +24,7 @@ public interface SellerUserService {
      * @createTime 2015年4月16日 下午4:33:09
      * @author duanyugen
      */
-    SellerLoginResp login(SellerLoginReq req) throws RuntimeException;
+    SellerLoginResp sellerLogin(SellerLoginReq req) throws RuntimeException;
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.service.seller.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.diligrp.mobsite.getway.domain.RegisterNoMapper;
 import com.diligrp.mobsite.getway.domain.common.Constant;
 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
@@ -26,7 +27,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
@@ -66,14 +69,69 @@ public class SellerUserServiceImpl implements SellerUserService {
 	private static Logger logger = LoggerFactory.getLogger(SellerUserServiceImpl.class);
 	@Override
-	public SellerLoginResp login(SellerLoginReq req) throws RuntimeException {
-		SellerLoginResp resp =  passportRPC.login(req);
+	public SellerLoginResp sellerLogin(SellerLoginReq req) throws RuntimeException {
+		SellerLoginResp resp =  passportRPC.sellerLogin(req);
+
+		if (!Validator.isEmpty(req.getRegisterNo())) {
+			// 缓存
+			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					String.valueOf(resp.getSellerId()));
+
+			GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
+					GetRegisterNoResp.class);
+			// 绑定极光ID
+			RegisterNoMapper mapper = new RegisterNoMapper();
+			mapper.setRegisterNo(req.getRegisterNo());
+			mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+			mapper.setUserid(resp.getSellerId());
+			mapper.setDeviceType(req.getDeviceType());
+			try {
+				//清除当前极光号userid缓存
+				cleanOldredis(mapper);
+				//构建缓存信息
+				buildRedisInfo(mappers, mapper);
+				redisUtil.setObjectByExpire(redisKey, mappers,
+						RedisKey.REGISTERNO_EXPIRE_TIME);
+			} catch (Exception e) {
+				throw new ServiceException(ResultCode.PUSH_MESSAGE_NO,
+						"绑定极光推送系统注册号失败");
+			}
+		}
+		return resp;
+	}
+
+	/**
+	 * 清除当前极光号下userid缓存
+	 * @param mapper
+	 */
+	private void cleanOldredis(RegisterNoMapper mapper) {
+		RegisterNoMapper oldmapper = registerNoMapperManager
+				.bindRegisterNo(mapper);
+		if (!Validator.isNull(oldmapper)){
+			String oldKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,
+					String.valueOf(oldmapper.getUserid()));
+			redisUtil.deleteByKey(oldKey);
+		}
+	}
-		//判断卖家是否创建店铺
+	/**
+	 * 建立缓存信息
+	 * @param mappers
+	 * @param mapper
+	 */
+	private void buildRedisInfo(GetRegisterNoResp mappers,
+								RegisterNoMapper mapper) {
+		// 如果缓存没有重新建
+		List<RegisterNoMapper> renolist = new ArrayList<RegisterNoMapper>();
-		return resp;
+		if (Validator.isNull(mappers)) {
+			mappers = new GetRegisterNoResp();
+		}
+		renolist.add(mapper);
+		mappers.setRegisterNos(renolist);
 	}
+
 	@Override
 	public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
 		SendVeriCodeResp resp = new SendVeriCodeResp();
@@ -273,4 +331,32 @@ public class SellerUserServiceImpl implements SellerUserService {
 	public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
 		return null;
 	}
+
+
+
+	public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
+		GetRegisterNoResp resp = new GetRegisterNoResp();
+		if (Validator.isNull(req.getUserId())) {
+			resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
+			resp.setMsg("用户ID不能为空");
+			return resp;
+		}
+		//先从缓存取
+		String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, 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());
+			if (!Validator.isEmpty(mapppers)) {
+
+				resp.setRegisterNos(mapppers);
+				redisUtil.setObjectByExpire(redisKey, resp, RedisKey.REGISTERNO_EXPIRE_TIME);
+			}else {
+				resp.setCode(ResultCode.BUSINESS_FAILED);
+				resp.setMsg("该用户没有绑定极光号");
+			}
+		}
+		return resp;
+	}
 }
@@ -388,6 +388,29 @@ public class UserController extends BaseApiController {
     ///**
+    // * 查询极光推送号
+    // *
+    // * getRegisterNo
+    // */
+    //@RequestMapping("/getRegisterNo")
+    //@ResponseBody
+    //public void getRegisterNo() {
+    //    GetRegisterNoReq req = getRequest(GetRegisterNoReq.class);
+    //    try {
+    //        GetRegisterNoResp resp = userService.getRegisterNo(req);
+    //        sendSuccessResp(resp);
+    //    } catch (ServiceException e){
+    //        LOGGER.error(String.format("Code=%s,ErrorMessage=%s",
+    //                e.getCode(), e.getMessage()), e);
+    //        sendError(e.getCode(), e.getMessage());
+    //    } catch (Exception e) {
+    //        LOGGER.error(String.format("ErrorMessage=%s", e.getMessage()), e);
+    //        sendError(e.getMessage());
+    //    }
+    //}
+
+
+    ///**
     // * 查看交易记录
     // * @createTime 2016年8月24日 下午10:55:03
     // * @author weili
@@ -55,7 +55,7 @@ public class SellerUserController extends BaseApiController {
     public void sellerLogin(@RequestBody SellerLoginReq temp){
         SellerLoginReq req = super.getRequest(SellerLoginReq.class);
         try {
-            SellerLoginResp resp = sellerUserService.login(req);
+            SellerLoginResp resp = sellerUserService.sellerLogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
@@ -81,7 +81,7 @@ public class SellerUserController extends BaseApiController {
         try {
             BeanValidator.validator(req);
             req.setPassword(decodeStr(req.getPassword()));
-            SellerLoginResp resp = sellerUserService.login(req);
+            SellerLoginResp resp = sellerUserService.sellerLogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",