登录注册接口开发

weiliwhereareyou@163.com
1 parent 5f71d667
Showing 12 changed files with 333 additions and 324 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/ErrorMessage.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/common/ResultCode.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/LoginResp.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/SellerRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/SellerRPCImpl.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/UserRPCImpl.java
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/UserService.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/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
@@ -45,6 +45,7 @@ public final class ErrorMessage {
     public static final String USER_NOT_LOGIN = "用户没有登录，请登录";
     public static final String USER_LOGIN_MULTI = "你的账号在其他设备登录，您被迫下线！";
     public static final String USER_NOT_EXIST = "用户信息不存在，请重新操作";
+    public static final String USER_SEARCH_FAILED = "查询用户信息失败";
     public static final String USER_PASSWORD_WRONG = "原始密码输入错误，请重新输入";
     public static final String USER_MOBILE_EXIST = "手机号码已经存在，请重新输入";
     public static final String USER_MOBILE_NOT_EXIST = "用户不存在，请重新输入";
@@ -63,7 +64,7 @@ public final class ErrorMessage {
     public static final String SELLER_NOT_OPEN_SHOP ="您还未开通店铺，请到网站进行开通";
     public static final String SELLER_SHOP_NOT_AUDIT ="您的店铺还未审核通过，请等待审核";
     public static final String USER_FAVORITE_ADD_ERROR ="添加收藏失败，请重新操作";
-    
+    public static final String BUYER_NOT_OPEN_SHOP ="您还未绑定店铺";
     /**
@@ -47,6 +47,8 @@ public final class ResultCode {
      * 用户电话已经存在
      */
     public static final int USER_MOBILE_EXIST = 1100;
+
+
     /**
      * 设置默认提货人失败
      */
@@ -52,8 +52,8 @@ public class LoginResp extends BaseResp {
     @ApiModelProperty(value = "当前绑定的店铺id")
     private Long currentShopId;
-    @ApiModelProperty(value = "店铺购买者ID")
-    private Long shopBuyerId;
+    //@ApiModelProperty(value = "店铺购买者ID")
+    //private Long shopBuyerId;
     public Long getBuyerId() {
@@ -73,13 +73,13 @@ public class LoginResp extends BaseResp {
         this.currentShopId = currentShopId;
     }
-    public Long getShopBuyerId() {
-        return shopBuyerId;
-    }
-
-    public void setShopBuyerId(Long shopBuyerId) {
-        this.shopBuyerId = shopBuyerId;
-    }
+    //public Long getShopBuyerId() {
+    //    return shopBuyerId;
+    //}
+    //
+    //public void setShopBuyerId(Long shopBuyerId) {
+    //    this.shopBuyerId = shopBuyerId;
+    //}
     /**
      * get value of LoginResp.accountName
 package com.diligrp.mobsite.getway.rpc;
+import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
+import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
 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;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
-import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
 import com.diligrp.mobsite.getway.rpc.base.BaseService;
 import java.util.Map;
@@ -22,7 +22,7 @@ import java.util.Map;
  */
 public interface PassportRPC extends BaseService {
-    SellerLoginResp sellerLogin(LoginReq req);
+    SellerInfoOutput sellerLogin(LoginReq req);
     UserRegisterResp register(UserRegisterReq req);
@@ -30,7 +30,7 @@ public interface PassportRPC extends BaseService {
     SellerRegisterResp sellerRegister(SellerRegisterReq req);
-    LoginResp buyerLogin(LoginReq req);
+    BuyerInfoOutput buyerLogin(LoginReq req);
     boolean sendVeriCodeOfSeller(String mobile,Integer msgType);
 package com.diligrp.mobsite.getway.rpc;
-import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
-import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
-import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
-
-import java.util.List;
 /**
@@ -35,14 +30,7 @@ public interface SellerRPC {
     boolean checkMobile(String mobile);
-    /**
-     * 修改进货单数量
-     * @param req
-     * @return
-     * @createTime 2015年3月9日 下午2:49:27
-     * @author zhangshirui
-     */
-    boolean modifyAmount(ModifyAmountReq req);
+
     /**
      * 修改密码
@@ -54,44 +42,11 @@ public interface SellerRPC {
      */
     boolean modifyPwd(String accountName, String newPassword);
-    Long addConsignee(PickInfo pickInfo, Long userId);
-
-    boolean updateConsignee(PickInfo pickInfo, Long userId);
-    PickInfo getConsignee(Long id);
-
-    boolean delConsignee(Long id);
-
-    List<PickInfo> getConsigneeByUserId(Long userId);
-
-    PickInfo getDefaultConsignee(Long userId);
-
-    boolean setDefaultConsignee(Long id, Long userId);
-
-
-    /**
-     * 密码加密
-     * @param pwd
-     * @return
-     * @createTime 2014年9月19日 上午10:04:35
-     * @author zhangshirui
-     */
-    String getEncryptPwd(String pwd);
-
-
-
-    /**
-     * 验证用户密码
-     * @param userId
-     * @param password
-     * @return
-     * @createTime 2015年6月24日 下午1:45:53
-     * @author zhangshirui
-     */
-	boolean checkPassword(Long userId, String password);
-
-
-    BuyerInfoOutput getUserByMobile(String accountName);
     SellerInfoOutput getSellerByMobile(String accountName);
+
+    //ShopOutput getShopBySellerId(Long id);
+    //
+    //ShopOutput getShopById(Long id);
 }
@@ -4,18 +4,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
-import com.diligrp.mobsite.getway.domain.common.Constant;
-import com.diligrp.mobsite.getway.domain.common.RedisKey;
+import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
 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.login.SendVeriCodeReq;
 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;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
-import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
@@ -52,58 +49,64 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     @Value("${passport.login.passportSign}")
     private String passportSign;
-    /**
-     * 登录超时时间：秒
-     */
-    @Value("${login.timeout.second}")
-    private int loginExpireTime;
+
     public PassportRPCImpl(String token, String baseUrl) {
         super(token, baseUrl);
     }
     @Override
-    public SellerLoginResp sellerLogin(LoginReq req) {
-        Map<String,String> params = new HashMap<String, String>();
+    public SellerInfoOutput sellerLogin(LoginReq req) {
+        Map<String,String> params = new HashMap<>();
         params.put("username", req.getAccountName());
         params.put("password", req.getPassword());
         BaseOutput<SellerInfoOutput> output = null;
         try {
             output = super.httpPost("/api/login/sellerLogin", params, new TypeReference<BaseOutput<SellerInfoOutput>>(){});
         } catch (Exception e) {
-        	log.error("调用passport卖家登录接口失败",e);
+        	log.error("error:调用passport卖家登录接口失败",e);
             throw new ServiceException();
         }
         SellerInfoOutput sellerInfo = output.getData();
-        SellerLoginResp resp = new SellerLoginResp();
         if (output.getCode()!=ResultCode.SUCCESS){
-			log.error("调用passport卖家登录接口失败：msg={}",output.getResult());
-			throw new ServiceException(ResultCode.BUSINESS_FAILED,"登录失败请重新登录");
-		}
+            log.error("error:调用passport买家登录失败[mobile=,code=,msg=]",new Object[]{req.getAccountName(),output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        if (Validator.isNull(sellerInfo)||Validator.isNull(sellerInfo.getId())){
+            log.error("error:买家登录返回用户信息为空[accountName=]",req.getAccountName());
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
+        }
+        return sellerInfo;
+    }
-        resp.setSellerId(sellerInfo.getId());
-        resp.setPhone(sellerInfo.getMobilePhone());
-        resp.setShopId(1L);
-        resp.setShopLogo("sds.jpg");
-        resp.setShopName("张三的水果店铺");
-        resp.setShopAuthCode(457854);
+    @Override
+    public BuyerInfoOutput buyerLogin(LoginReq req) {
-        //缓存userId
-        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
-        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getSellerId()), loginExpireTime);
+        Map<String,String> params = new HashMap<>();
+        params.put("username", req.getAccountName());
+        params.put("password", req.getPassword());
+        BaseOutput<BuyerInfoOutput > output = null;
+        try {
+            output = super.httpPost("/api/login/buyerLogin", params, new TypeReference<BaseOutput<BuyerInfoOutput>>(){});
+        } catch (Exception e) {
+            log.error("error:调用passport买家登录接口失败",e);
+            throw new ServiceException();
+        }
+        BuyerInfoOutput  buyerInfo = output.getData();
+        if (output.getCode()!=ResultCode.SUCCESS){
+            log.error("error:调用passport买家登录失败[mobile=,code=,msg=]",new Object[]{req.getAccountName(),output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+
+        if (Validator.isNull(buyerInfo)||Validator.isNull(buyerInfo.getId())){
+            log.error("error:买家登录返回用户信息为空[accountName=]",req.getAccountName());
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
+        }
+        return buyerInfo;
-        //缓存shopId
-        //String shopIdKey = redisUtil.makeKey(RedisKey.USER_SELLER_SHOPID, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
-        //redisUtil.setStringByExpire(shopIdKey, String.valueOf(resp.getShopId()), loginExpireTime);
-        //缓存设备id,userId作为key
-        if (!Validator.isNull(req.getDeviceId())) {
-            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
-            redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
-        }
-        return resp;
     }
     @Override
@@ -118,7 +121,7 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         	output = super.httpPost("/api/register/buyerRegister.html", params,null);
         } catch (Exception e) {
-        	log.error("调用passport注册接口失败",e);
+        	log.error("error:调用passport注册接口失败",e);
             throw new ServiceException();
         }
@@ -146,11 +149,11 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         	output = super.httpPost("/api/forgot/updateSellerPasswordByPhoneNumber", params,null);
         } catch (Exception e) {
-        	log.error("调用passport修改密码接口失败",e);
+        	log.error("error:调用passport修改密码接口失败",e);
         	throw new ServiceException();
         }
         if (Validator.isNull(output)) {
-        	log.error("调用passport修改密码接口失败");
+        	log.error("error:调用passport修改密码接口失败");
 			throw new ServiceException(ResultCode.BUSINESS_FAILED);
 		}
         return output.getData();
@@ -163,86 +166,29 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         params.put("accountPwd", req.getPassword());
         params.put("validCode",req.getVeriCode());
         params.put("appType",req.getAppType()+"");
-        BaseOutput<String> output = null;
+        BaseOutput<SellerInfoOutput > output = null;
         try {
-            output = super.httpPost("/api/register/sellerRegister", params,null);
-
+            output = super.httpPost("/api/register/sellerRegister", params,new TypeReference<BaseOutput<SellerInfoOutput>>(){});
         } catch (Exception e) {
-            log.error("调用passport注册接口失败",e);
+            log.error("error:调用passport卖家注册接口失败",e);
             throw new ServiceException();
         }
         SellerRegisterResp resp = new SellerRegisterResp();
-        JSONObject jsonBody = JSONObject.parseObject(output.getData());
-        int code = jsonBody.getIntValue("code");
-        //成功
-        if(code == ResultCode.SUCCESS){
-            resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
-        }else{
-            resp.setResultFlag(UserRegisterResp.RESULT_FLAG_FAILED);
-        }
-        resp.setMsg(jsonBody.getString("msg"));
-
-        log.info("注册用户信息:msg={}"+jsonBody.getString("msg"));
-
-        return resp;
-    }
-    @Override
-    public LoginResp buyerLogin(LoginReq req) {
-
-        Map<String,String> params = new HashMap<String, String>();
-        params.put("username", req.getAccountName());
-        params.put("password", req.getPassword());
-        BaseOutput<BuyerInfoOutput > output = null;
-        try {
-            output = super.httpPost("/api/login/buyerLogin", params, new TypeReference<BaseOutput<BuyerInfoOutput>>(){});
-        } catch (Exception e) {
-            log.error("调用passport卖家登录接口失败",e);
-            throw new ServiceException();
-        }
-        BuyerInfoOutput  buyerInfo = output.getData();
         if (output.getCode()!=ResultCode.SUCCESS){
-            log.error("调用passport买家登录接口失败：msg={}",output.getResult());
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,"登录失败请重新登录");
-        }
-
-        LoginResp resp = new LoginResp();
-        resp.setBuyerId(buyerInfo.getId());
-        resp.setHeadImg(buyerInfo.getFace());
-        resp.setMobile(buyerInfo.getMobilePhone());
-        resp.setAccountName("");
-        resp.setCurrentShopId(123L);
-        resp.setShopBuyerId(122L);
-
-        //缓存userId
-        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
-        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(resp.getBuyerId()), loginExpireTime);
-
-        //缓存设备id,userId作为key
-        if (!Validator.isNull(req.getDeviceId())) {
-            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
-            redisUtil.setStringByExpire(onlyOneLoginRedisKey, req.getDeviceId(), loginExpireTime);
+            log.error("error:调用passport卖家注册失败[mobile=,code=,msg=]",new Object[]{req.getMobile(),output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
         }
-
-        //缓存currentShopId
-        //if (!Validator.isNull(resp.getCurrentShopId())){
-        //    String currentShopIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_CURRENTSHOPID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
-        //    redisUtil.setStringByExpire(currentShopIdKey, String.valueOf(resp.getCurrentShopId()), loginExpireTime);
-        //}
-
-
-        //缓存shopBuyerId
-        //if (!Validator.isNull(resp.getShopBuyerId())){
-        //    String shopUserIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_SHOPUSERID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
-        //    redisUtil.setStringByExpire(shopUserIdKey, String.valueOf(resp.getShopBuyerId()), loginExpireTime);
-        //}
-
+        //成功
+        resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
         return resp;
     }
+
+
     @Override
     public boolean sendVeriCodeOfSeller(String mobile,Integer msgType) {
         BaseOutput<String> output = null;
@@ -256,12 +202,22 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
                 output = super.httpGet("/api/forgot/sendSellerForgotPasswordSMS/"+mobile,  null, new TypeReference<BaseOutput<String>>(){} );
             }
         } catch (Exception e) {
-            log.error("调用passport卖家注册发送短信失败",e);
+            if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+                log.error("error:调用passport卖家注册发送验证码短信失败",e);
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+                log.error("error:调用passport卖家忘记密码发送验证码短信失败",e);
+            }
             throw new ServiceException();
         }
-
         if (output.getCode()!= 200){
-            log.error("调用passport卖家注册发送短信失败[mobile=,msg=]",mobile,output.getResult());
+            if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+                log.error("error:调用passport卖家注册发送验证码短信失败[mobile=,code=,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+                log.error("error:调用passport卖家忘记密码发送验证码短信失败[mobile=,code,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
+            }
+            
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -283,12 +239,31 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
                 output = super.httpGet("/api/forgot/sendBuyerForgotPasswordSMS/"+mobile, null, null);
             }
         } catch (Exception e) {
-            log.error("调用passport买家注册发送短信失败",e);
+            
+            if (msgType== SendVeriCodeReq.MSG_TYPE_LOGIN){
+                log.error("error:调用passport买家登录发送验证码短信失败",e);
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+                log.error("error:调用passport买家注册发送验证码短信失败",e);
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+                log.error("error:调用passport买家忘记密码发送验证码短信失败",e);
+            }
             throw new ServiceException();
         }
         if (output.getCode()!= 200){
-            log.error("调用passport买家注册发送短信失败[mobile=,msg=]",mobile,output.getResult());
+
+            if (msgType== SendVeriCodeReq.MSG_TYPE_LOGIN){
+                log.error("error:调用passport买家注册发送验证码短信失败[mobile=,code,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+                log.error("error:调用passport买家注册发送验证码短信失败[mobile=,code,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
+            }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+                log.error("error:调用passport买家忘记密码发送验证码短信失败[mobile=,code,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
+            }
+            
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -326,12 +301,12 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         try {
             output = super.httpPost("/api/forgot/verifyBuyerSmsCode", params, null);
         } catch (Exception e) {
-            log.error("passport校验买家短信验证码失败",e);
+            log.error("error:调用passport校验买家短信验证码失败",e);
             throw new ServiceException();
         }
         if (output.getCode()!= 200){
-            log.error("passport校验买家短信验证码失败[mobile=,msg=]",mobile,output.getResult());
+            log.error("error:调用passport校验买家短信验证码失败[mobile=,msg=]",mobile,output.getResult());
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -2,6 +2,7 @@ package com.diligrp.mobsite.getway.rpc.impl;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
 import com.b2c.myapp.common.utils.BaseOutput;
 import com.b2c.myapp.sdk.MyAppClient;
 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
@@ -68,83 +69,16 @@ public class SellerRPCImpl implements SellerRPC {
         return flag;
     }
-    @Override
-    public boolean modifyAmount(ModifyAmountReq req) {
-        return false;
-    }
-
-    @Override
-    public boolean modifyPwd(String accountName, String newPassword) {
-        return false;
-    }
-
-    @Override
-    public Long addConsignee(PickInfo pickInfo, Long userId) {
-        return null;
-    }
-
-    @Override
-    public boolean updateConsignee(PickInfo pickInfo, Long userId) {
-        return false;
-    }
-    @Override
-    public PickInfo getConsignee(Long id) {
-        return null;
-    }
     @Override
-    public boolean delConsignee(Long id) {
-        return false;
-    }
-
-    @Override
-    public List<PickInfo> getConsigneeByUserId(Long userId) {
-        return null;
-    }
-
-    @Override
-    public PickInfo getDefaultConsignee(Long userId) {
-        return null;
-    }
-
-    @Override
-    public boolean setDefaultConsignee(Long id, Long userId) {
+    public boolean modifyPwd(String accountName, String newPassword) {
         return false;
     }
-    @Override
-    public String getEncryptPwd(String pwd) {
-        return null;
-    }
-    @Override
-    public boolean checkPassword(Long userId, String password) {
-        return false;
-    }
-    @Override
-    public BuyerInfoOutput getUserByMobile(String accountName) {
-        BaseOutput<BuyerInfoOutput> output = null;
-        boolean flag = false;
-        try {
-            output = userClient.getBuyerInfoService().getBuyerInfoByMobilePhone(accountName);
-        } catch (Exception e) {
-            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
-            throw new ServiceException();
-        }
-
-        if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
-            logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{accountName,output.getCode(),output.getResult()});
-            throw new ServiceException();
-        }
-        if(Validator.isNull(output.getData())){
-            logger.info("查询用户为空：[mobile={}]",new Object[]{accountName});
-            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_NOT_EXIST);
-        }
-        return output.getData();
-    }
     @Override
     public SellerInfoOutput getSellerByMobile(String accountName) {
@@ -169,4 +103,49 @@ public class SellerRPCImpl implements SellerRPC {
         return output.getData();
     }
+    //@Override
+    //public ShopOutput getShopBySellerId(Long id) {
+    //    BaseOutput<ShopOutput> output = null;
+    //    boolean flag = false;
+    //    try {
+    //        output = userClient.getShopInfoService().getShopBySellerId(id);
+    //    } catch (Exception e) {
+    //        logger.error("调用根据id查询店铺接口挂掉",e);
+    //        throw new ServiceException();
+    //    }
+    //
+    //    if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+    //        logger.error("根据id查询店铺异常：[userId={},code={},result={}]",new Object[]{id,output.getCode(),output.getResult()});
+    //        throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_SEARCH_FAILED);
+    //    }
+    //
+    //    if(Validator.isNull(output.getData())){
+    //        logger.info("查询用户为空：[userId={}]",new Object[]{id});
+    //        throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.SHOP_NOT_EXIST);
+    //    }
+    //    return output.getData();
+    //}
+    //
+    //@Override
+    //public ShopOutput getShopById(Long id) {
+    //    BaseOutput<ShopOutput> output = null;
+    //    try {
+    //        output = userClient.getShopInfoService().getShopByShopId(id);
+    //    } catch (Exception e) {
+    //        logger.error("调用根据id查询店铺接口挂掉：msg={}",e.getMessage());
+    //        throw new ServiceException();
+    //    }
+    //
+    //    if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
+    //        logger.error("根据id查询店铺接口挂掉：[userId={},code={},result={}]",new Object[]{id,output.getCode(),output.getResult()});
+    //        throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_SEARCH_FAILED);
+    //    }
+    //
+    //    if(Validator.isNull(output.getData())){
+    //        logger.info("查询店铺为空：[userId={}]",new Object[]{id});
+    //        throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.SHOP_NOT_EXIST);
+    //    }
+    //    return output.getData();
+    //}
+
 }
@@ -8,11 +8,8 @@ import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
-import com.diligrp.mobsite.getway.rpc.GoodsRPC;
 import com.diligrp.mobsite.getway.rpc.UserRPC;
-import com.diligrp.website.util.redis.RedisUtil;
 import com.diligrp.website.util.security.Validator;
-import com.diligrp.website.web.interfaces.WebsiteClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -35,13 +32,8 @@ public class UserRPCImpl implements UserRPC {
     @Resource
-    private RedisUtil redisUtil;
-    @Resource
     private MyAppClient myAppClient;
-    @Resource
-    private WebsiteClient websiteClient;
-    @Resource
-    private GoodsRPC goodsRPC;
+
     private static final Logger logger = LoggerFactory.getLogger(UserRPCImpl.class);
@@ -90,20 +82,6 @@ public class UserRPCImpl implements UserRPC {
         return false;
     }
-    @Override
-    public boolean modifyPwd(String accountName, String newPassword) {
-        return false;
-    }
-
-    @Override
-    public String getEncryptPwd(String pwd) {
-        return null;
-    }
-
-    @Override
-    public boolean checkPassword(Long userId, String password) {
-        return false;
-    }
     @Override
     public BuyerInfoOutput getUserByMobile(String accountName) {
@@ -112,7 +90,7 @@ public class UserRPCImpl implements UserRPC {
         try {
             output = myAppClient.getBuyerInfoService().getBuyerInfoByMobilePhone(accountName);
         } catch (Exception e) {
-            logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
+            logger.error("手机号查询买家接口挂掉：msg={}",e.getMessage());
             throw new ServiceException();
         }
@@ -127,4 +105,21 @@ public class UserRPCImpl implements UserRPC {
         }
         return output.getData();
     }
+
+    @Override
+    public boolean modifyPwd(String accountName, String newPassword) {
+        return false;
+    }
+
+    @Override
+    public String getEncryptPwd(String pwd) {
+        return null;
+    }
+
+    @Override
+    public boolean checkPassword(Long userId, String password) {
+        return false;
+    }
+
+
 }
@@ -27,7 +27,7 @@ public interface UserService {
      * @createTime 2014年8月26日 下午5:37:05
      * @author zhangshirui
      */
-    LoginResp login(LoginReq req);
+    LoginResp buyerlogin(LoginReq req);
     /**
      * 验证用户名是否合法
@@ -23,6 +23,7 @@ import com.diligrp.website.web.interfaces.domain.output.DataDictionaryResp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -64,42 +65,94 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private MessageRPC messageRPC;
+    /**
+     * 登录超时时间：秒
+     */
+    @Value("${login.timeout.second}")
+    private int loginExpireTime;
+
     private static Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
     @Override
-    public LoginResp login(LoginReq req) {
-        LoginResp resp = (LoginResp) passportRPC.buyerLogin(req);
-
-        if (!Validator.isEmpty(req.getRegisterNo())) {
-            // 缓存
-            String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
-                    String.valueOf(resp.getBuyerId()));
+    public LoginResp buyerlogin(LoginReq req) {
+        BuyerInfoOutput userInfo =  passportRPC.buyerLogin(req);
-            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.getBuyerId());
-            mapper.setUserType(Constant.USER_ROLE_BUYER);
-            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,
-                        "绑定极光推送系统注册号失败");
-            }
+        //缓存用户信息
+        cacheUserInfo(userInfo.getId(),req.getDeviceId());
+        if (Validator.isEmpty(req.getRegisterNo())){
+            logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
+        }else{
+            //绑定用户激光推送id
+            bindUserRegisterNo(userInfo.getId(),req);
+        }
+        Long currentShopId = userInfo.getCurrentShopId();
+        LoginResp resp = new LoginResp();
+        if (Validator.isNull(currentShopId)){
+            logger.info("用户未绑定店铺[buyerId=]",userInfo.getId());
+            resp.setMsg(ErrorMessage.BUYER_NOT_OPEN_SHOP);
         }
+        resp.setBuyerId(userInfo.getId());
+        resp.setHeadImg(userInfo.getFace());
+        resp.setMobile(userInfo.getMobilePhone());
+        resp.setAccountName(userInfo.getAccountName());
+        resp.setCurrentShopId(userInfo.getCurrentShopId());
         return resp;
     }
+    private void bindUserRegisterNo(Long id, LoginReq req) {
+        // 缓存
+        String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
+                String.valueOf(id));
+
+        GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
+                GetRegisterNoResp.class);
+        // 绑定极光ID
+        RegisterNoMapper mapper = new RegisterNoMapper();
+        mapper.setRegisterNo(req.getRegisterNo());
+        mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+        mapper.setUserid(id);
+        mapper.setUserType(Constant.USER_ROLE_BUYER);
+        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,
+                    "绑定极光推送系统注册号失败");
+        }
+    }
+
+    private void cacheUserInfo(Long id, String deviceId) {
+
+        //缓存userId
+        String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(id));
+        redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(id), loginExpireTime);
+
+        //缓存设备id,userId作为key
+        if (!Validator.isNull(deviceId)) {
+            String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_BUYER+String.valueOf(id));
+            redisUtil.setStringByExpire(onlyOneLoginRedisKey, deviceId, loginExpireTime);
+        }
+
+        //缓存currentShopId
+        //if (!Validator.isNull(resp.getCurrentShopId())){
+        //    String currentShopIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_CURRENTSHOPID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+        //    redisUtil.setStringByExpire(currentShopIdKey, String.valueOf(resp.getCurrentShopId()), loginExpireTime);
+        //}
+
+
+        //缓存shopBuyerId
+        //if (!Validator.isNull(resp.getShopBuyerId())){
+        //    String shopUserIdKey = redisUtil.makeKey(RedisKey.USER_BUYER_SHOPUSERID, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
+        //    redisUtil.setStringByExpire(shopUserIdKey, String.valueOf(resp.getShopBuyerId()), loginExpireTime);
+        //}
+    }
+
     /**
      * 清除当前极光号下userid缓存
@@ -2,8 +2,10 @@ package com.diligrp.mobsite.getway.service.seller.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
 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;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
@@ -17,13 +19,13 @@ import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
 import com.diligrp.mobsite.getway.domain.protocol.user.*;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.*;
-import com.diligrp.mobsite.getway.rpc.utils.UserRedisUtil;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -50,8 +52,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 	private GoodsRPC goodsRPC;
 	@Autowired
 	private RedisUtilImpl redisUtil;
-	@Autowired
-	private UserRedisUtil userRedisUtil;
+
 	@Resource
 	private RegisterNoMapperManager registerNoMapperManager;
@@ -65,42 +66,90 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Autowired
 	private MessageRPC messageRPC;
+	/**
+	 * 登录超时时间：秒
+	 */
+	@Value("${login.timeout.second}")
+	private int loginExpireTime;
+
 	private static Logger logger = LoggerFactory.getLogger(SellerUserServiceImpl.class);
 	@Override
 	public SellerLoginResp sellerLogin(SellerLoginReq req) throws RuntimeException {
-		SellerLoginResp resp =  passportRPC.sellerLogin(req);
+		SellerInfoOutput userInfo = passportRPC.sellerLogin(req);
+
+		//缓存用户信息
+		cacheUserInfo(userInfo.getId(),req.getDeviceId());
+		if (Validator.isEmpty(req.getRegisterNo())){
+			logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
+		}else{
+			//绑定用户激光推送id
+			bindUserRegisterNo(userInfo.getId(),req);
+		}
-		if (!Validator.isEmpty(req.getRegisterNo())) {
-			// 缓存
-			String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_SELLER+
-					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.setUserType(Constant.USER_ROLE_SELLER);
-			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,
-						"绑定极光推送系统注册号失败");
-			}
+		SellerLoginResp resp = new SellerLoginResp();
+		ShopOutput shop = shopRPC.getShopBySellerId(userInfo.getId());
+		if (Validator.isNull(shop)||Validator.isNull(shop.getId())){
+			logger.info("卖家未开通店铺[sellerId=]",userInfo.getId());
+			resp.setShopId(null);
+			resp.setMsg(ErrorMessage.SELLER_NOT_OPEN_SHOP);
+			return resp;
 		}
+		resp.setSellerId(userInfo.getId());
+		resp.setPhone(shop.getServiceTel());
+		resp.setShopId(shop.getId());
+		resp.setShopLogo(shop.getShopLogo());
+		resp.setShopName(shop.getShopName());
+		resp.setShopAuthCode(shop.getPromoCode().intValue());
 		return resp;
 	}
+	private void bindUserRegisterNo(Long id, LoginReq req) {
+		// 缓存
+		String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_SELLER+
+				String.valueOf(id));
+
+		GetRegisterNoResp mappers = redisUtil.getObject(redisKey,
+				GetRegisterNoResp.class);
+		// 绑定极光ID
+		RegisterNoMapper mapper = new RegisterNoMapper();
+		mapper.setRegisterNo(req.getRegisterNo());
+		mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
+		mapper.setUserid(id);
+		mapper.setUserType(Constant.USER_ROLE_SELLER);
+		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,
+					"绑定极光推送系统注册号失败");
+		}
+	}
+
+	private void cacheUserInfo(Long userId,String deviceId) {
+		//缓存userId
+		String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(userId));
+		redisUtil.setStringByExpire(cookieRedisKey, String.valueOf(userId), loginExpireTime);
+
+		//缓存shopId
+		//String shopIdKey = redisUtil.makeKey(RedisKey.USER_SELLER_SHOPID, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
+		//redisUtil.setStringByExpire(shopIdKey, String.valueOf(resp.getShopId()), loginExpireTime);
+
+
+		//缓存设备id,userId作为key
+		if (!Validator.isNull(deviceId)) {
+			String onlyOneLoginRedisKey = redisUtil.makeKey(RedisKey.USER_DEVICEID,  Constant.USER_ROLE_SIGN_SELLER+String.valueOf(deviceId));
+			redisUtil.setStringByExpire(onlyOneLoginRedisKey, deviceId, loginExpireTime);
+		}
+	}
+
 	/**
 	 * 清除当前极光号下userid缓存
 	 * @param mapper
@@ -52,7 +52,7 @@ public class UserController extends BaseApiController {
         LoginReq req = super.getRequest(LoginReq.class);
         try {
             BeanValidator.validator(req);
-            LoginResp resp = userService.login(req);
+            LoginResp resp = userService.buyerlogin(req);
             super.sendSuccessResp(resp);
 	        LOGGER.info(String.format("用户登陆：[ 设备id<%s>用户名<%s>用户id<%s>ip<%s> ]"
 			        , req.getDeviceId(), req.getAccountName(), req.getUserId(), request.getRemoteAddr()));
@@ -80,7 +80,7 @@ public class UserController extends BaseApiController {
         try {
             BeanValidator.validator(req);
             req.setPassword(decodeStr(req.getPassword()));
-            LoginResp resp = userService.login(req);
+            LoginResp resp = userService.buyerlogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",