登录忘记密码接口开发

weiliwhereareyou@163.com
1 parent a30c7e98
Showing 19 changed files with 235 additions and 493 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/GetShopByIdReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/AuthLoginReq.java
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/login/SendVeriCodeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/login/SendVeriCodeResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/register/CheckMobileResp.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/UserRPC.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/shop/impl/ShopServiceImpl.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/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
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 public class GetShopByIdReq extends BaseReq{
-    @ApiModelProperty(value = "店铺id",required = true)
+    @ApiModelProperty(value = "买家绑定的店铺id",required = true)
     private Long id;
@@ -34,6 +34,14 @@ public class AuthLoginReq extends BaseReq {
     private String registerNo;
+    public String getAuthCode() {
+        return authCode;
+    }
+
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode;
+    }
+
     public AuthLoginReq() {
     }
@@ -52,6 +52,8 @@ public class LoginResp extends BaseResp {
     @ApiModelProperty(value = "当前绑定的店铺id")
     private Long currentShopId;
+
+
     //@ApiModelProperty(value = "店铺购买者ID")
     //private Long shopBuyerId;
@@ -37,7 +37,7 @@ public class SendVeriCodeReq extends BaseReq {
     /**
      * 消息类型
      */
-    @ApiModelProperty(value = "消息类型:1登录，2注册，3找回密码，4修改新电话号码，5验证旧电话号码",required = true)
+    @ApiModelProperty(value = "消息类型:1登录，2注册，3找回密码",required = true)
     private Integer msgType;
@@ -30,11 +30,11 @@ public class SendVeriCodeResp extends BaseResp {
      */
     @ApiModelProperty(value = "发送结果:1成功")
     private Integer sendCode = SEND_CODE_ERROR;
-    /**
-     * 万能验证码
-     */
-    @ApiModelProperty(value = "万能验证码")
-    private String passKey;
+    ///**
+    // * 万能验证码
+    // */
+    //@ApiModelProperty(value = "万能验证码")
+    //private String passKey;
     /**
      * get value of SendVeriCodeResp.sendCode
@@ -59,12 +59,4 @@ public class SendVeriCodeResp extends BaseResp {
     }
-	public String getPassKey() {
-		return passKey;
-	}
-
-
-	public void setPassKey(String passKey) {
-		this.passKey = passKey;
-	}
 }
@@ -28,7 +28,7 @@ public class CheckMobileResp extends BaseResp {
     /**
      * 验证手机号码结果：1-可用，2-不可用
      */
-    private Integer checkFlag;
+    private Integer checkFlag = CHECK_FLAG_OK;
     /**
@@ -2,15 +2,13 @@ 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.AuthLoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
 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.user.ModifyPwdReq;
 import com.diligrp.mobsite.getway.rpc.base.BaseService;
-import java.util.Map;
-
 /**
  * <B>Description</B> Passport登陆 <br />
@@ -24,11 +22,12 @@ public interface PassportRPC extends BaseService {
     SellerInfoOutput sellerLogin(LoginReq req);
-    UserRegisterResp register(UserRegisterReq req);
+    BuyerInfoOutput buyerRegister(UserRegisterReq req);
-	String modifyPwd(Map<String, String> params);
+    boolean modifyPwdBuyer(ModifyPwdReq req);
+    boolean modifyPwdSeller(ModifyPwdReq req);
-    SellerRegisterResp sellerRegister(SellerRegisterReq req);
+    SellerInfoOutput sellerRegister(SellerRegisterReq req);
     BuyerInfoOutput buyerLogin(LoginReq req);
@@ -41,4 +40,5 @@ public interface PassportRPC extends BaseService {
     boolean verifyBuyerSmsCode(String mobile, String veriCode);
+    BuyerInfoOutput authlogin(AuthLoginReq req);
 }
@@ -27,7 +27,7 @@ public interface SellerRPC {
      * @createTime 2014年8月27日 下午2:31:07
      * @author zhangshirui
      */
-    boolean checkMobile(String mobile);
+    SellerInfoOutput checkMobile(String mobile);
@@ -52,7 +52,7 @@ public interface UserRPC {
      * @createTime 2014年8月27日 下午2:31:07
      * @author zhangshirui
      */
-    boolean checkMobile(String mobile);
+    BuyerInfoOutput checkMobile(String mobile);
     /**
 package com.diligrp.mobsite.getway.rpc.impl;
-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.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.AuthLoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.login.LoginReq;
 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.user.ModifyPwdReq;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
@@ -110,57 +109,72 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     }
     @Override
-    public UserRegisterResp register(UserRegisterReq req) {
+    public BuyerInfoOutput buyerRegister(UserRegisterReq req) {
         Map<String,String> params = new HashMap<String, String>();
-        params.put("mobile", req.getMobile());
-        params.put("password", req.getPassword());
-        //   params.put("accountName", req.getAccountName());
-        //    params.put("source", PASSPORT_REGIST_SOURCE_PNR);
-        BaseOutput<String> output = null;
+        params.put("mobilePhone", req.getMobile());
+        params.put("accountPwd", req.getPassword());
+        params.put("validCode",req.getVeriCode());
+        params.put("accountName",req.getMobile());
+        BaseOutput<BuyerInfoOutput > output = null;
         try {
-        	output = super.httpPost("/api/register/buyerRegister.html", params,null);
-            
+            output = super.httpPost("/api/register/buyerRegister", params,new TypeReference<BaseOutput<BuyerInfoOutput>>(){});
         } catch (Exception e) {
-        	log.error("error:调用passport注册接口失败",e);
+            log.error("error:调用passport卖家注册接口失败",e);
             throw new ServiceException();
         }
-        
-        UserRegisterResp resp = new UserRegisterResp();
-        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);
+
+        if (output.getCode()!=ResultCode.SUCCESS){
+            log.error("error:调用passport卖家注册失败[mobile={},code={},msg={}]",new Object[]{req.getMobile(),output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
         }
-        resp.setMsg(jsonBody.getString("msg"));
-        
-		log.info("注册用户信息:msg={}"+jsonBody.getString("msg"));
-        
-        return resp;
+        return output.getData();
     }
     @Override
-    public String modifyPwd(Map<String,String> params){
-    	
-    	BaseOutput<String> output = null;
+    public boolean modifyPwdBuyer(ModifyPwdReq req){
+        Map<String,String> params = new HashMap<>();
+        params.put("password", req.getPassword());
+        params.put("phoneNumber", req.getAccountName());
+
+        BaseOutput<String> output = null;
         try {
-        	output = super.httpPost("/api/forgot/updateSellerPasswordByPhoneNumber", params,null);
+        	output = super.httpPost("/api/forgot/updateBuyerPasswordByPhoneNumber", params,null);
         } catch (Exception e) {
-        	log.error("error:调用passport修改密码接口失败",e);
+        	log.error("error:调用passport买家修改密码接口失败",e);
         	throw new ServiceException();
         }
-        if (Validator.isNull(output)) {
-        	log.error("error:调用passport修改密码接口失败");
-			throw new ServiceException(ResultCode.BUSINESS_FAILED);
+        int code = output.getCode();
+        if (code!=ResultCode.SUCCESS) {
+        	log.error("error:调用passport买家修改密码接口失败[mobile={},password={}]",req.getAccountName(),req.getPassword());
+			throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
 		}
-        return output.getData();
+        return code==ResultCode.SUCCESS;
+    }
+
+    @Override
+    public boolean modifyPwdSeller(ModifyPwdReq req){
+        Map<String,String> params = new HashMap<>();
+        params.put("password", req.getPassword());
+        params.put("phoneNumber", req.getAccountName());
+
+        BaseOutput<String> output = null;
+        try {
+            output = super.httpPost("/api/forgot/updateSellerPasswordByPhoneNumber", params,null);
+
+        } catch (Exception e) {
+            log.error("error:调用passport卖家修改密码接口失败",e);
+            throw new ServiceException();
+        }
+        if (output.getCode()!=ResultCode.SUCCESS) {
+            log.error("error:调用passport卖家修改密码接口失败[mobile={},password={}]",req.getAccountName(),req.getPassword());
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
+        }
+        return output.getCode()==ResultCode.SUCCESS;
     }
     @Override
-    public SellerRegisterResp  sellerRegister(SellerRegisterReq req) {
+    public SellerInfoOutput  sellerRegister(SellerRegisterReq req) {
         Map<String,String> params = new HashMap<String, String>();
         params.put("mobilePhone", req.getMobile());
         params.put("accountPwd", req.getPassword());
@@ -174,17 +188,14 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             throw new ServiceException();
         }
-        SellerRegisterResp resp = new SellerRegisterResp();
         if (output.getCode()!=ResultCode.SUCCESS){
             log.error("error:调用passport卖家注册失败[mobile=,code=,msg=]",new Object[]{req.getMobile(),output.getCode(),output.getResult()});
             throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
         }
-        //成功
-        resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
-        return resp;
+        return output.getData();
     }
@@ -312,4 +323,30 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         return output.getCode().equals("200");
     }
+
+    @Override
+    public BuyerInfoOutput authlogin(AuthLoginReq req) {
+        Map<String,String> params = new HashMap<>();
+        params.put("username", req.getAccountName());
+        params.put("code", req.getAuthCode());
+        BaseOutput<BuyerInfoOutput > output = null;
+        try {
+            output = super.httpPost("/api/login/buyerSMSLogin", 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;
+
+    }
 }
 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;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
 import com.diligrp.mobsite.getway.domain.except.ServiceException;
-import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
-import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
 import com.diligrp.mobsite.getway.rpc.GoodsRPC;
 import com.diligrp.mobsite.getway.rpc.SellerRPC;
 import com.diligrp.website.util.redis.RedisUtil;
@@ -20,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import java.util.List;
 /**
@@ -51,9 +46,8 @@ public class SellerRPCImpl implements SellerRPC {
     @Override
-    public boolean checkMobile(String mobile) {
+    public SellerInfoOutput checkMobile(String mobile) {
         BaseOutput<SellerInfoOutput> output = null;
-        boolean flag = false;
         try {
             output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(mobile);
         } catch (Exception e) {
@@ -63,10 +57,9 @@ public class SellerRPCImpl implements SellerRPC {
         if (output==null||!output.getCode().equals("200")){
             logger.error("手机号查询卖家接口失败：[userId={},code={},result={}]",new Object[]{mobile,output.getCode(),output.getResult()});
-            throw new ServiceException();
+            throw new ServiceException(output.getResult());
         }
-        flag = !Validator.isNull(output.getData());
-        return flag;
+        return output.getData();
     }
@@ -54,9 +54,8 @@ public class UserRPCImpl implements UserRPC {
     }
     @Override
-    public boolean checkMobile(String mobile) {
+    public BuyerInfoOutput checkMobile(String mobile) {
         BaseOutput<BuyerInfoOutput> output = null;
-        boolean flag = false;
         try {
             output = myAppClient.getBuyerInfoService().getBuyerInfoByMobilePhone(mobile);
         } catch (Exception e) {
@@ -66,15 +65,10 @@ public class UserRPCImpl implements UserRPC {
         if (output==null||!output.getCode().equals(ResultCode.SUCCESS)){
             logger.error("手机号查询买家接口失败：[userId={},code={},result={}]",new Object[]{mobile,output.getCode(),output.getResult()});
-            throw new ServiceException();
-        }
-        flag = !Validator.isNull(output.getData());
-        if(flag){
-            logger.info("success：电话号码没有被注册：mobile={}",mobile);
-        }else {
-            logger.info("error:电话号码已经被注册：mobile={}",mobile);
+            throw new ServiceException(output.getResult());
         }
-        return flag;
+
+        return output.getData();
     }
     @Override
 package com.diligrp.mobsite.getway.service.buyer.shop.impl;
+import com.b2c.myapp.common.api.shop.output.ShopOutput;
+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.detail.BindToShopReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.BindToShopResp;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetShopByIdReq;
 import com.diligrp.mobsite.getway.domain.protocol.detail.GetShopByIdResp;
+import com.diligrp.mobsite.getway.rpc.impl.ShopRPCImpl;
 import com.diligrp.mobsite.getway.service.buyer.shop.ShopService;
+import com.diligrp.website.util.security.Validator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
 /**
  * <B>Description</B> ShopServiceImpl <br />
@@ -18,6 +28,13 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ShopServiceImpl implements ShopService {
+
+	@Resource
+	private ShopRPCImpl shopRPC;
+
+
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
 	@Override
 	public BindToShopResp bindToShop(BindToShopReq req) {
 		return null;
@@ -25,6 +42,22 @@ public class ShopServiceImpl implements ShopService {
 	@Override
 	public GetShopByIdResp getShopById(GetShopByIdReq req) {
-		return null;
+
+		ShopOutput shop = shopRPC.getShopByShopId(req.getId());
+		if (Validator.isNull(shop)||Validator.isNull(shop.getId())){
+			logger.error("查询买家绑定的店铺信息为空[buyerId=%s,shopId=%s]",req.getUserId(),req.getId());
+			throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.SHOP_NOT_EXIST);
+		}
+		GetShopByIdResp resp = new GetShopByIdResp();
+		resp.setShopId(shop.getId());
+		resp.setPhone(shop.getServiceTel());
+		resp.setShopId(shop.getId());
+		resp.setShopLogo(shop.getShopLogo());
+		resp.setShopName(shop.getShopName());
+		resp.setShopNotices(shop.getShopNotices());
+		resp.setCityCode(shop.getAddressId());
+		resp.setCityName(shop.getAddressText());
+		resp.setShopAddr(shop.getAddressDetail());
+		return resp;
 	}
 }
 package com.diligrp.mobsite.getway.service.buyer.user;
 import com.diligrp.mobsite.getway.domain.protocol.login.*;
-import com.diligrp.mobsite.getway.domain.protocol.register.CheckAccountNameReq;
-import com.diligrp.mobsite.getway.domain.protocol.register.CheckAccountNameResp;
-import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileReq;
-import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileResp;
 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.user.*;
@@ -29,14 +25,6 @@ public interface UserService {
      */
     LoginResp buyerlogin(LoginReq req);
-    /**
-     * 验证用户名是否合法
-     * @param req
-     * @return
-     * @createTime 2014年8月26日 下午6:32:14
-     * @author zhangshirui
-     */
-    CheckUserInvalidResp checkUserInvalid(CheckUserInvalidReq req);
     /**
      * 验证手机收到的验证码
@@ -63,23 +51,6 @@ public interface UserService {
      */
     UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req);
-    /**
-     * 
-     * @createTime 2014年8月28日 下午3:45:48
-     * @author zhangshirui
-     * @param req 
-     * @return 
-     */
-    CheckAccountNameResp checkAccountName(CheckAccountNameReq req);
-
-    /**
-     * 验证手机号
-     * @param req
-     * @return
-     * @createTime 2014年8月28日 下午4:03:59
-     * @author zhangshirui
-     */
-    CheckMobileResp checkMobile(CheckMobileReq req);
     /**
      *用户注册 
@@ -92,23 +63,6 @@ public interface UserService {
     GetUserInfoResp getUserIntroduction(GetUserInfoReq req);
-    UpdateMobileResp updateMobile(UpdateMobileReq req);
-
-    SubmitIdentityAuthResp submitIdentityAuth(SubmitIdentityAuthReq req);
-
-    SubmitEnterpriseAuthResp submitEnterpriseAuth(SubmitEnterpriseAuthReq req);
-
-    GetFavoriteProductResp getFavoriteProducts(GetFavoriteProductReq req);
-
-    GetFavoriteShopResp getFavoriteShop(GetFavoriteShopReq req);
-
-    DelFavoriteShopResp delFavoriteShop(DelFavoriteShopReq req);
-
-    DelFavoriteProductResp delFavoriteProduct(DelFavoriteProductReq req);
-
-    GetIdentityAuthResp getIdentityAuth(GetIdentityAuthReq req);
-
-    GetEnterpriseAuthResp getEnterpriseAuth(GetEnterpriseAuthReq req);
 	LogoutResp logout(LogoutReq req);
@@ -121,37 +75,8 @@ public interface UserService {
 	 */
     ModifyPwdResp modifyPwd(ModifyPwdReq req);
-    /**
-     * 查询用户认证信息
-     * @param req
-     * @return
-     * @createTime 2015年7月9日 上午11:04:45
-     * @author zhangshirui
-     */
-	GetAuthInfoResp getAuthInfo(GetAuthInfoReq req);
 	/**
-	 * 删除收藏的信息
-	 * @param req
-	 * @return
-	 */
-	DelFavoriteInfoResp delFavoriteInfo(DelFavoriteInfoReq req);
-
-	/**
-	 * 查询收藏的信息
-	 * @param req
-	 * @return
-	 */
-	GetFavoriteInfoResp getFavoriteInfo(GetFavoriteInfoReq req);
-
-	/**
-	 * 添加收藏信息
-	 * @param req
-	 * @return
-	 */
-	AddFavoriteInfoResp addFavoriteInfo(AddFavoriteInfoReq req);
-	
-	/**
      * 查询用户极光号
      * @param req
      * @return
@@ -167,13 +92,11 @@ public interface UserService {
      */
 	GetRegisterNobyUidsResp getRegisterNobyUids(GetRegisterNobyUidsReq req);
-	GetMemberListResp getMemberList(GetMemberListReq req);
-	UpdateUserInfoResp completeUserInfo(CompleteUserInfoReq req);
 	GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req);
-	TradeRecordResp getTradeRecord(TradeRecordReq req);
+
 	SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req);
 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;
@@ -9,17 +8,16 @@ 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.*;
-import com.diligrp.mobsite.getway.domain.protocol.register.*;
+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.user.*;
 import com.diligrp.mobsite.getway.domain.protocol.user.model.RegisterNoPlatform;
 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.rpc.PassportRPC;
+import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
-import com.diligrp.mobsite.getway.service.common.utils.PassportUtils;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
-import com.diligrp.website.web.interfaces.domain.output.DataDictionaryResp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,24 +44,14 @@ public class UserServiceImpl implements UserService {
     @Resource
     private UserRPC userRPC;
-    @Resource
-    private GoodsRPC goodsRPC;
     @Autowired
     private RedisUtilImpl redisUtil;
-    @Autowired
-    private UserRedisUtil userRedisUtil;
     @Resource
     private RegisterNoMapperManager registerNoMapperManager;
     @Resource
     private PassportRPC passportRPC;
-    @Resource
-    private ConfigRPC configRPC;
-    @Resource
-    private ShopRPC shopRPC;
-    @Autowired
-    private MessageRPC messageRPC;
     /**
      * 登录超时时间：秒
@@ -84,7 +72,7 @@ public class UserServiceImpl implements UserService {
             logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
         }else{
             //绑定用户激光推送id
-            bindUserRegisterNo(userInfo.getId(),req);
+            bindUserRegisterNo(userInfo.getId(),req.getRegisterNo(),req.getDeviceType());
         }
         Long currentShopId = userInfo.getCurrentShopId();
         LoginResp resp = new LoginResp();
@@ -100,7 +88,7 @@ public class UserServiceImpl implements UserService {
         return resp;
     }
-    private void bindUserRegisterNo(Long id, LoginReq req) {
+    private void bindUserRegisterNo(Long id,String registerNo,Integer deviceType) {
         // 缓存
         String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO,Constant.USER_ROLE_SIGN_BUYER+
                 String.valueOf(id));
@@ -109,11 +97,11 @@ public class UserServiceImpl implements UserService {
                 GetRegisterNoResp.class);
         // 绑定极光ID
         RegisterNoMapper mapper = new RegisterNoMapper();
-        mapper.setRegisterNo(req.getRegisterNo());
+        mapper.setRegisterNo(registerNo);
         mapper.setSysFlag(RegisterNoMapper.SYS_FLAG_JPUSH);
         mapper.setUserid(id);
         mapper.setUserType(Constant.USER_ROLE_BUYER);
-        mapper.setDeviceType(req.getDeviceType());
+        mapper.setDeviceType(deviceType);
         try {
             //清除当前极光号userid缓存
             cleanOldredis(mapper);
@@ -187,78 +175,34 @@ public class UserServiceImpl implements UserService {
-    @Override
-    public CheckUserInvalidResp checkUserInvalid(CheckUserInvalidReq req) {
-        return null;
-    }
     @Override
     public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
-        CheckVeriCodeResp resp = new CheckVeriCodeResp();
-
-        //checkVeriCode(req.getVeriCode(), req.getMobile(),req.getMsgType());
+        passportRPC.verifyBuyerSmsCode(req.getMobile(),req.getVeriCode());
-        return resp;
+        return new CheckVeriCodeResp();
     }
     @Override
     public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
-        SendVeriCodeResp resp = new SendVeriCodeResp();
-
         String mobile = req.getMobile();
-        boolean existFlag = !userRPC.checkMobile(mobile);
-
+        BuyerInfoOutput userinfo = userRPC.checkMobile(mobile);
         Integer msgType = req.getMsgType();
-        String code = null;
-        String message = null;
-
-        String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
-        String veriCode = redisUtil.getString(redisKey);
-
-        if (Validator.isEmpty(veriCode)) {
-            //生成验证码
-            veriCode = PassportUtils.generateMobileRandomNumber();
-            redisUtil.setStringByExpire(redisKey, String.valueOf(veriCode), RedisKey.USER_SEND_VERICODE_EXPIRE_TIME);
-        }
-
-            if (msgType==SendVeriCodeReq.MSG_TYPE_REGISTER) {
-                //注册，电话号码已经存在
-                if(existFlag){
-                    throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_MOBILE_EXIST);
-                }
-                String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
-                resp.setPassKey(passkey);
-
-                messageRPC.sendSMSMsg(mobile, veriCode, Constant.SMS_CONTENT_ACCOUNT_REGISTRATION);
-                resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-                return resp;
-            }else if(msgType==SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD) {
-                //找回密码，电话号码没有存在
-                if (!existFlag) {
-                    throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
+        if (msgType== SendVeriCodeReq.MSG_TYPE_LOGIN||msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+            if (Validator.isNull(userinfo)){
+                if (Validator.isNull(userinfo)){
+                    throw new ServiceException(ErrorMessage.USER_MOBILE_NOT_EXIST);
                 }
-                messageRPC.sendSMSMsg(mobile, veriCode,Constant.SMS_CONTENT_RETRIEVE_PASSWORD);
-                resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-                return resp;
-            }else if(msgType==SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE) {
-                //修改手机号，电话号码已经存在
-                if (existFlag) {
-                    throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
-                }
-                code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
-            }else if (msgType==SendVeriCodeReq.MSG_TYPE_CHECK_OLD_MOBILE) {
-                //验证旧的手机号，手机不存在
-                if (!existFlag) {
-                    throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
-                }
-                code = Constant.SMS_CONTENT_MODIFY_OLD_PHONE;
             }
-            DataDictionaryResp dataDic = configRPC.getMessageTemplate(Constant.DIC_SMS_CONTENT);
-            message = dataDic.getValueByCode(code).getRemark().replace("{code}", veriCode);
-
-
+        }
+        if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+            if (!Validator.isNull(userinfo)){
+                throw new ServiceException(ErrorMessage.USER_MOBILE_EXIST);
+            }
+        }
+        passportRPC.sendVeriCodeOfBuyer(mobile,req.getMsgType());
+        SendVeriCodeResp resp = new SendVeriCodeResp();
         resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-
         return resp;
     }
@@ -267,134 +211,31 @@ public class UserServiceImpl implements UserService {
         return null;
     }
-    @Override
-    public CheckAccountNameResp checkAccountName(CheckAccountNameReq req) {
-        return null;
-    }
-    @Override
-    public CheckMobileResp checkMobile(CheckMobileReq req) {
-        return null;
-    }
     @Override
     public UserRegisterResp userRegister(UserRegisterReq req) {
-        UserRegisterResp resp = new UserRegisterResp();
-
         //手机号码和账号验证、验证码
         //if (!checkRegisterInfo(resp, req)) {
         //   return resp;
         //}
-
-        resp = passportRPC.register(req);
-
+        passportRPC.buyerRegister(req);
+        UserRegisterResp resp = new UserRegisterResp();
+        resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
         return resp;
     }
-    /**
-     * 检测注册信息是否正确
-     * 1.电话号码
-     * 2.账号，会员名
-     * 3.验证码
-     * @createTime 2014年10月31日 下午2:37:16
-     * @author zhangshirui
-     */
-    private boolean checkRegisterInfo(UserRegisterResp resp, UserRegisterReq req){
-        if(!userRPC.checkMobile(req.getMobile())){
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_EXIST);
-        }
-        //验证万能验证码
-        String passkey = configRPC.getSystemConfig(Constant.USER_REGISTER_PASS_KEY);
-        if (req.getVeriCode().equals(passkey)) {
-            return true;
-        }
-
-        checkVeriCode(req.getVeriCode(), req.getMobile(),SendVeriCodeReq.MSG_TYPE_REGISTER);
-
-        return true;
-    }
-
-    /**
-     * 根据验证码和电话号码，验证收到的验证码
-     *
-     * @param code
-     * @param mobile
-     * @return
-     * @createTime 2014年8月28日 下午5:44:48
-     * @author zhangshirui
-     */
-    private void checkVeriCode(String code, String mobile,Integer msgType) {
-
-        String redisKey = redisUtil.makeKey(RedisKey.USER_AUTH_CODE + String.valueOf(msgType), mobile);
-        String redisCode = redisUtil.getString(redisKey);
-        if(Validator.isEmpty(code)){
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_EMPTY);
-        }
-        //验证码为空
-        if (Validator.isEmpty(redisCode)) {
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_OVERTIME);
-        }
-
-        //验证码不为空，并且和redis中的验证码相同
-        if (!code.equals(redisCode)) {
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_AUTH_CODE_WRONG);
-        }
-
-    }
     @Override
     public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
         return null;
     }
-    @Override
-    public UpdateMobileResp updateMobile(UpdateMobileReq req) {
-        return null;
-    }
-    @Override
-    public SubmitIdentityAuthResp submitIdentityAuth(SubmitIdentityAuthReq req) {
-        return null;
-    }
-
-    @Override
-    public SubmitEnterpriseAuthResp submitEnterpriseAuth(SubmitEnterpriseAuthReq req) {
-        return null;
-    }
-
-    @Override
-    public GetFavoriteProductResp getFavoriteProducts(GetFavoriteProductReq req) {
-        return null;
-    }
-
-    @Override
-    public GetFavoriteShopResp getFavoriteShop(GetFavoriteShopReq req) {
-        return null;
-    }
-
-    @Override
-    public DelFavoriteShopResp delFavoriteShop(DelFavoriteShopReq req) {
-        return null;
-    }
-
-    @Override
-    public DelFavoriteProductResp delFavoriteProduct(DelFavoriteProductReq req) {
-        return null;
-    }
-
-    @Override
-    public GetIdentityAuthResp getIdentityAuth(GetIdentityAuthReq req) {
-        return null;
-    }
-
-    @Override
-    public GetEnterpriseAuthResp getEnterpriseAuth(GetEnterpriseAuthReq req) {
-        return null;
-    }
     @Override
     public LogoutResp logout(LogoutReq req) {
@@ -430,55 +271,22 @@ public class UserServiceImpl implements UserService {
     public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
         BuyerInfoOutput userInfo = userRPC.getUserByMobile(req.getAccountName());
         Long userId = userInfo.getId();
-
-
-        Map<String,String> params = new HashMap<String, String>();
-        params.put("password", req.getPassword());
-        params.put("accountId", String.valueOf(userId));
-
-
-        String result = passportRPC.modifyPwd(params);
-
-        JSONObject jsonBody = JSONObject.parseObject(result);
-        int code = jsonBody.getIntValue("code");
+        boolean result = passportRPC.modifyPwdBuyer(req);
         ModifyPwdResp resp = new ModifyPwdResp();
-        resp.setMsg(jsonBody.getString("msg"));
-
-        if(code != ResultCode.SUCCESS){
+        if(!result){
             //失败
             resp.setCode(ResultCode.BUSINESS_FAILED);
             resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
             return resp;
         }else {
             //修改成功，退出所有账号信息
-            String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_BUYER+String.valueOf(userId));
+            String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(userId));
             redisUtil.deleteByKey(cookieRedisKey);
         }
-
-        logger.info("修改用户密码"+jsonBody.getString("msg"));
-
         return resp;
     }
-    @Override
-    public GetAuthInfoResp getAuthInfo(GetAuthInfoReq req) {
-        return null;
-    }
-
-    @Override
-    public DelFavoriteInfoResp delFavoriteInfo(DelFavoriteInfoReq req) {
-        return null;
-    }
-
-    @Override
-    public GetFavoriteInfoResp getFavoriteInfo(GetFavoriteInfoReq req) {
-        return null;
-    }
-    @Override
-    public AddFavoriteInfoResp addFavoriteInfo(AddFavoriteInfoReq req) {
-        return null;
-    }
     @Override
     public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
@@ -551,25 +359,13 @@ public class UserServiceImpl implements UserService {
         return resp;
     }
-    @Override
-    public GetMemberListResp getMemberList(GetMemberListReq req) {
-        return null;
-    }
-    @Override
-    public UpdateUserInfoResp completeUserInfo(CompleteUserInfoReq req) {
-        return null;
-    }
     @Override
     public GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req) {
         return null;
     }
-    @Override
-    public TradeRecordResp getTradeRecord(TradeRecordReq req) {
-        return null;
-    }
     @Override
     public SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req) {
@@ -578,6 +374,27 @@ public class UserServiceImpl implements UserService {
     @Override
     public LoginResp authlogin(AuthLoginReq req) {
-        return null;
+        BuyerInfoOutput userInfo =  passportRPC.authlogin(req);
+
+        //缓存用户信息
+        cacheUserInfo(userInfo.getId(),req.getDeviceId());
+        if (Validator.isEmpty(req.getRegisterNo())){
+            logger.error("卖家登录激光推送id为空[userId=]",userInfo.getId());
+        }else{
+            //绑定用户激光推送id
+            bindUserRegisterNo(userInfo.getId(),req.getRegisterNo(),req.getDeviceType());
+        }
+        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;
     }
 }
@@ -44,7 +44,5 @@ public interface SellerUserService {
     LogoutResp logout(LogoutReq req);
-    UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req);
-    GetUserInfoResp getUserIntroduction(GetUserInfoReq req);
 }
 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;
@@ -10,15 +9,16 @@ 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.*;
-import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileReq;
-import com.diligrp.mobsite.getway.domain.protocol.register.CheckMobileResp;
-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.*;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.*;
+import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNoResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
-import com.diligrp.mobsite.getway.rpc.*;
+import com.diligrp.mobsite.getway.rpc.PassportRPC;
+import com.diligrp.mobsite.getway.rpc.SellerRPC;
+import com.diligrp.mobsite.getway.rpc.ShopRPC;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
 import com.diligrp.website.util.redis.impl.RedisUtilImpl;
 import com.diligrp.website.util.security.Validator;
@@ -30,9 +30,7 @@ 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;
 /**
@@ -48,8 +46,6 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Resource
 	private SellerRPC sellerRPC;
-	@Resource
-	private GoodsRPC goodsRPC;
 	@Autowired
 	private RedisUtilImpl redisUtil;
@@ -58,13 +54,9 @@ public class SellerUserServiceImpl implements SellerUserService {
 	private RegisterNoMapperManager registerNoMapperManager;
 	@Resource
 	private PassportRPC passportRPC;
-	@Resource
-	private ConfigRPC configRPC;
 	@Resource
 	private ShopRPC shopRPC;
-	@Autowired
-	private MessageRPC messageRPC;
 	/**
 	 * 登录超时时间：秒
@@ -184,21 +176,24 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public SendVeriCodeResp sendVeriCode(SendVeriCodeReq req) {
-		SendVeriCodeResp resp = new SendVeriCodeResp();
-
 		String mobile = req.getMobile();
-		boolean existFlag = !sellerRPC.checkMobile(mobile);
+		SellerInfoOutput userinfo = sellerRPC.checkMobile(mobile);
 		Integer msgType = req.getMsgType();
-		if (Validator.isNull(msgType)) {
-
+		if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
+			if (Validator.isNull(userinfo)){
+				if (Validator.isNull(userinfo)){
+					throw new ServiceException(ErrorMessage.USER_MOBILE_NOT_EXIST);
+				}
+			}
 		}
-		passportRPC.sendVeriCodeOfSeller(req.getMobile(),req.getMsgType());
-		//验证旧的手机号，手机不存在
-		//if (!existFlag) {
-		//	throw new ServiceException(ResultCode.BUSINESS_FAILED,ErrorMessage.USER_MOBILE_NOT_EXIST);
-		//}
+		if (msgType== SendVeriCodeReq.MSG_TYPE_REGISTER){
+			if (!Validator.isNull(userinfo)){
+				throw new ServiceException(ErrorMessage.USER_MOBILE_EXIST);
+			}
+		}
+		passportRPC.sendVeriCodeOfSeller(mobile,req.getMsgType());
+		SendVeriCodeResp resp = new SendVeriCodeResp();
 		resp.setSendCode(SendVeriCodeResp.SEND_CODE_SUCCESS);
-
 		return resp;
 	}
@@ -206,20 +201,20 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public CheckVeriCodeResp checkVeriCode(CheckVeriCodeReq req) {
-		CheckVeriCodeResp resp = null;
-		boolean ispass = passportRPC.verifySellerSmsCode(req.getMobile(),req.getVeriCode());
+		passportRPC.verifySellerSmsCode(req.getMobile(),req.getVeriCode());
-		return null;
+		return new CheckVeriCodeResp();
 	}
 	@Override
 	public CheckMobileResp checkMobile(CheckMobileReq req) {
+		SellerInfoOutput userinfo = sellerRPC.checkMobile(req.getMobile());
+			if (Validator.isNull(userinfo)){
+				if (Validator.isNull(userinfo)){
+					throw new ServiceException(ErrorMessage.USER_MOBILE_NOT_EXIST);
+				}
+			}
 		CheckMobileResp resp = new CheckMobileResp();
-
-		boolean flag = sellerRPC.checkMobile(req.getMobile());
-
-		resp.setCheckFlag(flag ? CheckMobileResp.CHECK_FLAG_OK : CheckMobileResp.CHECK_FLAG_ERROR);
-
 		return resp;
 	}
@@ -227,21 +222,9 @@ public class SellerUserServiceImpl implements SellerUserService {
 	public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
 		SellerInfoOutput userInfo = sellerRPC.getSellerByMobile(req.getAccountName());
 		Long userId = userInfo.getId();
-
-
-		Map<String,String> params = new HashMap<String, String>();
-		params.put("password", req.getPassword());
-		params.put("phoneNumber", req.getAccountName());
-
-
-		String result = passportRPC.modifyPwd(params);
-
-		JSONObject jsonBody = JSONObject.parseObject(result);
-		int code = jsonBody.getIntValue("code");
+		boolean result = passportRPC.modifyPwdSeller(req);
 		ModifyPwdResp resp = new ModifyPwdResp();
-		resp.setMsg(jsonBody.getString("msg"));
-
-		if(code != ResultCode.SUCCESS){
+		if(!result){
 			//失败
 			resp.setCode(ResultCode.BUSINESS_FAILED);
 			resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
@@ -251,16 +234,16 @@ public class SellerUserServiceImpl implements SellerUserService {
 			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(userId));
 			redisUtil.deleteByKey(cookieRedisKey);
 		}
-
-		logger.info("修改用户密码"+jsonBody.getString("msg"));
-
 		return resp;
 	}
 	@Override
 	public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
-		SellerRegisterResp resp =  passportRPC.sellerRegister(req);
+		passportRPC.sellerRegister(req);
+		//成功
+		SellerRegisterResp resp = new SellerRegisterResp();
+		resp.setResultFlag(UserRegisterResp.RESULT_FLAG_SUCCESS);
 		return resp;
 	}
@@ -296,41 +279,7 @@ public class SellerUserServiceImpl implements SellerUserService {
 		return resp;
 	}
-	@Override
-	public UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req) {
-		return null;
-	}
-
-	@Override
-	public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
-		return null;
-	}
-	//public GetRegisterNoResp getRegisterNo(GetRegisterNoReq req) {
-	//	GetRegisterNoResp resp = new GetRegisterNoResp();
-	//	if (Validator.isNull(req.getUserId())||Validator.isNull(req.getUserRole())) {
-	//		resp.setCode(ResultCode.REQUET_PARAMS_ERROR);
-	//		resp.setMsg("用户ID和用户角色不能为空");
-	//		return resp;
-	//	}
-	//	//先从缓存取
-	//	String redisKey = redisUtil.makeKey(RedisKey.USER_REGISTERNO, req.getUserRole()+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;
-	//}
 }
@@ -193,7 +193,7 @@ public class UserController extends BaseApiController {
      * @createTime 2014年8月24日 下午10:55:03
      * @author weili
      */
-    @ApiOperation(value = "找回密码-设置用户新密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
+    @ApiOperation(value = "找回密码-设置买家新密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
     @RequestMapping(value = "/modifyPwd",method = RequestMethod.POST)
     @ResponseBody
     public void modifyPwd(@RequestBody  ModifyPwdReq temp){
@@ -95,7 +95,7 @@ public class SellerUserController extends BaseApiController {
     /**
-     * 验证手机号是否已经被注册
+     * 找回密码：验证手机号是否已经被注册
      * @createTime 2017年1月9日 下午3:41:02
      * @author weili
      */
@@ -106,11 +106,7 @@ public class SellerUserController extends BaseApiController {
         CheckMobileReq req = super.getRequest(CheckMobileReq.class);
         CheckMobileResp resp = null;
         try {
-            if(!Validator.isNull(req) && !Validator.isNull(req.getMobile())){
-                resp = sellerUserService.checkMobile(req);
-            } else {
-                resp = new CheckMobileResp();
-            }
+            resp = sellerUserService.checkMobile(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",