初始化工程-接口定义

weiliwhereareyou@163.com
1 parent 19148fe1
Showing 14 changed files with 371 additions and 166 deletions
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/LoginReq.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/register/SellerRegisterReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/register/SellerRegisterResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/ModifyPwdReq.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerRPCImpl.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
+package com.diligrp.mobsite.getway.domain.protocol.login;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <B>Description</B> 登录请求 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime Aug 12, 2014 7:57:01 PM
+ * @author wujianjun
+ */
+public class AuthLoginReq extends BaseReq {
+
+    /**
+     * 会员名称
+     */
+    @NotNull(message = "账号不能为空")
+    @ApiModelProperty(value = "登录账号",required = true)
+    private String accountName;
+
+    /**
+     * 验证码
+     */
+    @ApiModelProperty(value = "验证码",required = true)
+    private String authCode;
+
+
+    //极光ID
+    @ApiModelProperty(value = "极光ID")
+    private String registerNo;
+
+
+    public AuthLoginReq() {
+    }
+
+    public String getRegisterNo() {
+        return registerNo;
+    }
+
+    public void setRegisterNo(String registerNo) {
+        this.registerNo = registerNo;
+    }
+
+    /**
+     * get value of LoginReq.accountName
+     * @return the accountName
+     * @createTime Aug 12, 2014 7:58:27 PM
+     * @author wujianjun
+     */
+    public String getAccountName() {
+        return accountName;
+    }
+
+    /**
+     * set value of LoginReq.accountName
+     * @param accountName the accountName to set
+     * @createTime Aug 12, 2014 7:58:27 PM
+     * @author wujianjun
+     */
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+
+}
@@ -28,14 +28,15 @@ public class LoginReq extends BaseReq {
     @ApiModelProperty(value = "登录密码",required = true)
     private String password;
-    /**
-     * 密码
-     */
-    @ApiModelProperty(value = "验证码")
-    private String authCode;
+    ///**
+    // * 验证码
+    // */
+    //@ApiModelProperty(value = "验证码")
+    //private String authCode;
     //极光ID
+    @ApiModelProperty(value = "极光ID")
     private String registerNo;
@@ -57,7 +57,7 @@ public class LoginResp extends BaseResp {
     /**
      * 账户ID
      */
-    @ApiModelProperty(value = "账号")
+    @ApiModelProperty(value = "用户id")
     private Long accountId;
     /**
      * 账户名
@@ -69,25 +69,25 @@ public class LoginResp extends BaseResp {
      */
     @ApiModelProperty(value = "手机号码")
     private String mobile;
-    /**
-     * 邮箱地址
-     */
-    @ApiModelProperty(value = "邮箱")
-    private String email;
-    /**
-     * 1:个人用户, 2:企业用户
-     */
-    @ApiModelProperty(value = "用户类型：个人用户,2:企业用户")
-    private Integer userType;
-    /**
-     * 1 登入  -1 登出 （出场验货专用）
-     */
-    private Integer accountState;
-    /**
-     * 真实姓名
-     */
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
+    ///**
+    // * 邮箱地址
+    // */
+    //@ApiModelProperty(value = "邮箱")
+    //private String email;
+    ///**
+    // * 1:个人用户, 2:企业用户
+    // */
+    //@ApiModelProperty(value = "用户类型：个人用户,2:企业用户")
+    //private Integer userType;
+    ///**
+    // * 1 登入  -1 登出 （出场验货专用）
+    // */
+    //private Integer accountState;
+    ///**
+    // * 真实姓名
+    // */
+    //@ApiModelProperty(value = "真实姓名")
+    //private String realName;
     /**
      * 登录之后，passport返回
      * 用于支付鉴权
@@ -165,67 +165,9 @@ public class LoginResp extends BaseResp {
         this.mobile = mobile;
     }
-    /**
-     * get value of LoginResp.email
-     * @return the email
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public String getEmail() {
-        return email;
-    }
-
-    /**
-     * set value of LoginResp.email
-     * @param email the email to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public void setEmail(String email) {
-        this.email = email;
-    }
-    /**
-     * get value of LoginResp.userType
-     * @return the userType
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public Integer getUserType() {
-        return userType;
-    }
-    /**
-     * set value of LoginResp.userType
-     * @param userType the userType to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public void setUserType(Integer userType) {
-        this.userType = userType;
-    }
-
-    /**
-     * get value of LoginResp.accountState
-     * @return the accountState
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public Integer getAccountState() {
-        return accountState;
-    }
-
-    /**
-     * set value of LoginResp.accountState
-     * @param accountState the accountState to set
-     * @createTime Aug 13, 2014 9:58:39 AM
-     * @author wujianjun
-     */
-    public void setAccountState(Integer accountState) {
-        this.accountState = accountState;
-    }
-
-    public String getToken() {
+     public String getToken() {
         return token;
     }
@@ -234,17 +176,7 @@ public class LoginResp extends BaseResp {
         this.token = token;
     }
-    
-    public String getRealName() {
-        return realName;
-    }
-
-    
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-    
     public String getHeadImg() {
         return headImg;
     }
+package com.diligrp.mobsite.getway.domain.protocol.register;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <B>Description</B> 注册个人用户请求 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime Aug 12, 2014 7:48:27 PM
+ * @author wujianjun
+ */
+@ApiModel(value = "请求参数")
+public class SellerRegisterReq extends BaseReq {
+
+	public static final int USER_TYPE_BUSINESS = 1;//市场商户,企业单位,个体经营,个人
+	
+	public static final int USER_TYPE_COMPANY = 2;
+
+    public static final int USER_TYPE_PERSONMANAGE = 3;
+
+    public static final int USER_TYPE_PERSON = 4;
+
+    public static final int APPTYPE_SHEQU = 1;
+
+    public static final int APPTYPE_LIANSUO = 2;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码",required = true)
+    protected String mobile;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value = "密码",required = true)
+    protected String password;
+
+    /**
+     * 手机验证码
+     */
+    @ApiModelProperty(value = "手机验证码",required = true)
+    private String veriCode;
+
+    /**
+     * 手机验证码
+     */
+    @ApiModelProperty(value = "app类型（1:社区店版,2:连锁店 ,默认传1）")
+    private Integer appType = APPTYPE_SHEQU;
+
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getVeriCode() {
+        return veriCode;
+    }
+
+    public void setVeriCode(String veriCode) {
+        this.veriCode = veriCode;
+    }
+
+    public Integer getAppType() {
+        return appType;
+    }
+
+    public void setAppType(Integer appType) {
+        this.appType = appType;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.register;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+import io.swagger.annotations.ApiModelProperty;
+
+
+/**
+ * <B>Description</B> 注册个人用户请求响应 <br />
+ * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime Aug 12, 2014 7:48:58 PM
+ * @author wujianjun
+ */
+@SuppressWarnings("serial")
+public class SellerRegisterResp extends BaseResp {
+    
+    /**
+     * 注册结果
+     * 注册成功-1
+     */
+    public static final int RESULT_FLAG_SUCCESS=1;
+    /**
+     * 注册失败-2
+     */
+    public static final int RESULT_FLAG_FAILED=2;
+    /**
+     * 验证码错误-3
+     */
+    public static final int RESULT_FLAG_VERICODE_WRONG=3;
+    /**
+     * 手机号已经注册-4
+     */
+    public static final int RESULT_FLAG_PHONE_REGISTERED=4;
+    /**
+     * 账号已经被注册-5
+     */
+    public static final Integer RESULT_FLAG_ACCOUNTNAME_REGISTERED=5;
+    
+    
+    /**
+     * 注册结果
+     */
+    @ApiModelProperty(value = "注册结果")
+    private Integer resultFlag = RESULT_FLAG_SUCCESS;
+    
+    /**
+     * get value of RegisterPersonalResp.resultFlag
+     * @return the resultFlag
+     * @createTime 2014年8月28日 下午5:19:41
+     * @author zhangshirui
+     */
+    public Integer getResultFlag() {
+        return resultFlag;
+    }
+    
+    /**
+     * set value of RegisterPersonalResp.resultFlag
+     * @param resultFlag the resultFlag to set
+     * @createTime 2014年8月28日 下午5:19:41
+     * @author zhangshirui
+     */
+    public void setResultFlag(Integer resultFlag) {
+        this.resultFlag = resultFlag;
+    }
+
+}
@@ -19,8 +19,8 @@ public class ModifyPwdReq extends BaseReq {
     /**
      * 验证码
      */
-    @ApiModelProperty(value = "验证码",required = true)
-    private String authCode;
+    //@ApiModelProperty(value = "验证码",required = true)
+    //private String authCode;
     /**
      * 新的密码
@@ -28,11 +28,11 @@ public class ModifyPwdReq extends BaseReq {
     @ApiModelProperty(value = "新密码",required = true)
     private String password;
-    /**
-     * 重复新密码
-     */
-    @ApiModelProperty(value = "重复新密码",required = true)
-    private String repPassword;
+    ///**
+    // * 重复新密码
+    // */
+    //@ApiModelProperty(value = "重复新密码",required = true)
+    //private String repPassword;
     /**
      * 手机号
@@ -83,32 +83,32 @@ public class ModifyPwdReq extends BaseReq {
     }
-    /**
-     * get value of ModifyPwdReq.authCode
-     * @return the authCode
-     * @createTime 2015年1月24日 下午4:50:08
-     * @author zhangshirui
-     */
-    public String getAuthCode() {
-        return authCode;
-    }
+    ///**
+    // * get value of ModifyPwdReq.authCode
+    // * @return the authCode
+    // * @createTime 2015年1月24日 下午4:50:08
+    // * @author zhangshirui
+    // */
+    //public String getAuthCode() {
+    //    return authCode;
+    //}
+    //
+    //
+    ///**
+    // * set value of ModifyPwdReq.authCode
+    // * @param authCode the authCode to set
+    // * @createTime 2015年1月24日 下午4:50:08
+    // * @author zhangshirui
+    // */
+    //public void setAuthCode(String authCode) {
+    //    this.authCode = authCode;
+    //}
-    
-    /**
-     * set value of ModifyPwdReq.authCode
-     * @param authCode the authCode to set
-     * @createTime 2015年1月24日 下午4:50:08
-     * @author zhangshirui
-     */
-    public void setAuthCode(String authCode) {
-        this.authCode = authCode;
-    }
-
-    public String getRepPassword() {
-        return repPassword;
-    }
-
-    public void setRepPassword(String repPassword) {
-        this.repPassword = repPassword;
-    }
+    //public String getRepPassword() {
+    //    return repPassword;
+    //}
+    //
+    //public void setRepPassword(String repPassword) {
+    //    this.repPassword = repPassword;
+    //}
 }
 package com.diligrp.mobsite.getway.rpc.seller;
 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.ConsigneeInfo;
 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
@@ -91,4 +92,6 @@ public interface SellerRPC {
     BuyerInfoOutput getUserByMobile(String accountName);
+
+    SellerInfoOutput getSellerByMobile(String accountName);
 }
@@ -150,4 +150,28 @@ public class SellerRPCImpl implements SellerRPC {
         }
         return output.getData();
     }
+
+    @Override
+    public SellerInfoOutput getSellerByMobile(String accountName) {
+        BaseOutput<SellerInfoOutput> output = null;
+        boolean flag = false;
+        try {
+            output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(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();
+    }
+
 }
 package com.diligrp.mobsite.getway.service.buyer.user;
-import com.diligrp.mobsite.getway.domain.protocol.login.CheckVeriCodeReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.CheckVeriCodeResp;
-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.LogoutReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.LogoutResp;
-import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeReq;
-import com.diligrp.mobsite.getway.domain.protocol.login.SendVeriCodeResp;
+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;
@@ -183,4 +176,6 @@ public interface UserService {
 	TradeRecordResp getTradeRecord(TradeRecordReq req);
 	SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req);
+
+	LoginResp authlogin(AuthLoginReq req);
 }
@@ -168,9 +168,9 @@ public class UserServiceImpl implements UserService {
         UserRegisterResp resp = new UserRegisterResp();
         //手机号码和账号验证、验证码
-        if (!checkRegisterInfo(resp, req)) {
-           return resp;
-        }
+        //if (!checkRegisterInfo(resp, req)) {
+        //   return resp;
+        //}
         resp = passportRPC.register(req);
@@ -375,4 +375,9 @@ public class UserServiceImpl implements UserService {
     public SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req) {
         return null;
     }
+
+    @Override
+    public LoginResp authlogin(AuthLoginReq req) {
+        return null;
+    }
 }
 package com.diligrp.mobsite.getway.service.seller;
 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.UserRegisterReq;
-import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
+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.*;
@@ -40,7 +37,7 @@ public interface SellerUserService {
     ModifyPwdResp modifyPwd(ModifyPwdReq req);
-    UserRegisterResp sellerRegister(UserRegisterReq req);
+    SellerRegisterResp sellerRegister(SellerRegisterReq req);
     LogoutResp logout(LogoutReq 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.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;
 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.UserRegisterReq;
-import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
+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.*;
@@ -28,6 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 /**
@@ -154,11 +155,40 @@ public class SellerUserServiceImpl implements SellerUserService {
 	@Override
 	public ModifyPwdResp modifyPwd(ModifyPwdReq req) {
-		return null;
+		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("accountId", String.valueOf(userId));
+
+
+		String result = passportRPC.modifyPwd(params);
+
+		JSONObject jsonBody = JSONObject.parseObject(result);
+		int code = jsonBody.getIntValue("code");
+		ModifyPwdResp resp = new ModifyPwdResp();
+		resp.setMsg(jsonBody.getString("msg"));
+
+		if(code != ResultCode.SUCCESS){
+			//失败
+			resp.setCode(ResultCode.BUSINESS_FAILED);
+			resp.setResultFlag(ModifyPwdResp.RESULT_FLAG_FAILED);
+			return resp;
+		}else {
+			//修改成功，退出所有账号信息
+			String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, String.valueOf(userId));
+			redisUtil.deleteByKey(cookieRedisKey);
+		}
+
+		logger.info("修改用户密码"+jsonBody.getString("msg"));
+
+		return resp;
 	}
 	@Override
-	public UserRegisterResp sellerRegister(UserRegisterReq req) {
+	public SellerRegisterResp sellerRegister(SellerRegisterReq req) {
 		return null;
 	}
@@ -100,12 +100,11 @@ public class UserController extends BaseApiController {
     @ApiOperation(value = "买家验证码登录", httpMethod = "POST" , notes = "买家验证码登录",response = LoginResp.class)
     @RequestMapping(value = "/loginForAuth",method = RequestMethod.POST)
     @ResponseBody
-    public void loginForAuth(@RequestBody  LoginReq temp){
-        LoginReq req = super.getRequest(LoginReq.class);
+    public void loginForAuth(@RequestBody  AuthLoginReq temp){
+        AuthLoginReq req = super.getRequest(AuthLoginReq.class);
         try {
             BeanValidator.validator(req);
-            req.setPassword(decodeStr(req.getPassword()));
-            LoginResp resp = userService.login(req);
+            LoginResp resp = userService.authlogin(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
@@ -2,10 +2,7 @@ package com.diligrp.mobsite.getway.web.api.seller.user;
 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.UserRegisterReq;
-import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
+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.*;
@@ -202,14 +199,14 @@ public class SellerUserController extends BaseApiController {
      * @createTime 2014年8月28日 下午3:41:02
      * @author weili
      */
-    @ApiOperation(value = "卖家注册", httpMethod = "POST" ,response = UserRegisterResp.class)
+    @ApiOperation(value = "卖家注册", httpMethod = "POST" ,response = SellerRegisterResp.class)
     @RequestMapping(value = "/sellerRegister",method = RequestMethod.POST)
     @ResponseBody
-    public void sellerRegister(@RequestBody UserRegisterReq temp){
-        UserRegisterReq req = super.getRequest(UserRegisterReq.class);
+    public void sellerRegister(@RequestBody SellerRegisterReq temp){
+        SellerRegisterReq req = super.getRequest(SellerRegisterReq.class);
         try {
             BeanValidator.validator(req);
-            UserRegisterResp resp = sellerUserService.sellerRegister(req);
+            SellerRegisterResp resp = sellerUserService.sellerRegister(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
@@ -226,15 +223,15 @@ public class SellerUserController extends BaseApiController {
      * @createTime 2014年8月28日 下午3:41:02
      * @author weili
      */
-    @ApiOperation(value = "卖家注册", httpMethod = "POST" ,response = UserRegisterResp.class)
+    @ApiOperation(value = "卖家注册", httpMethod = "POST" ,response = SellerRegisterResp.class)
     @RequestMapping(value = "/sellerRegisters",method = RequestMethod.POST)
     @ResponseBody
-    public void sellerRegisters(@RequestBody  UserRegisterReq temp){
-        UserRegisterReq req = super.getRequest(UserRegisterReq.class);
+    public void sellerRegisters(@RequestBody  SellerRegisterReq temp){
+        SellerRegisterReq req = super.getRequest(SellerRegisterReq.class);
         try {
             BeanValidator.validator(req);
             req.setPassword(decodeStr(req.getPassword()));
-            UserRegisterResp resp = sellerUserService.sellerRegister(req);
+            SellerRegisterResp resp = sellerUserService.sellerRegister(req);
             super.sendSuccessResp(resp);
         } catch (ServiceException e){
             log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",