修改密码接口开发

weiliwhereareyou@163.com
1 parent 4e5ad84e
Showing 18 changed files with 398 additions and 166 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/protocol/login/SendVeriCodeReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/UpdateMobileReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/UpdateSellerInfoReq.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/UpdateSellerInfoResp.java
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/UpdateUserInfoReq.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/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
@@ -49,6 +49,7 @@ public final class ErrorMessage {
     public static final String USER_PASSWORD_WRONG = "原始密码输入错误，请重新输入";
     public static final String USER_MOBILE_EXIST = "手机号码已经存在，请重新输入";
     public static final String USER_MOBILE_NOT_EXIST = "用户不存在，请重新输入";
+    public static final String USER_UPDATE_INFO = "更新用户信息失败";
     public static final String USER_CONSIGNEE_SET_DEFAULT_FAILED = "设置默认提货人失败";
     public static final String USER_AUTH_USER_PASS = "您提交的身份证号已经被认证";
     public static final String USER_AUTH_ENTERPRISE_PASS = "每个企业仅能注册一次";
@@ -37,7 +37,7 @@ public class SendVeriCodeReq extends BaseReq {
     /**
      * 消息类型
      */
-    @ApiModelProperty(value = "消息类型:1验证码登录，2注册，3找回密码",required = true)
+    @ApiModelProperty(value = "消息类型:1验证码登录，2注册，3找回密码 ,4买家修改手机号",required = true)
     private Integer msgType;
 package com.diligrp.mobsite.getway.domain.protocol.user;
 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+import io.swagger.annotations.ApiModelProperty;
 /**
  * <B>Description</B> 修改手机号码请求 <br />
@@ -14,14 +15,55 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
 @SuppressWarnings("serial")
 public class UpdateMobileReq extends BaseReq{
     /**
-     * 新手机号码
+     * 手机验证码
      */
+    @ApiModelProperty(value = "验证码",required = true)
+    private String veriCode;
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "新手机号码",required = true)
     private String mobile;
+
+    /**
+     * get value of CheckVeriCodeReq.veriCode
+     * @return the veriCode
+     * @createTime Aug 12, 2014 8:06:20 PM
+     * @author wujianjun
+     */
+    public String getVeriCode() {
+        return veriCode;
+    }
+
+    /**
+     * set value of CheckVeriCodeReq.veriCode
+     * @param veriCode the veriCode to set
+     * @createTime Aug 12, 2014 8:06:20 PM
+     * @author wujianjun
+     */
+    public void setVeriCode(String veriCode) {
+        this.veriCode = veriCode;
+    }
+
+
+    /**
+     * get value of CheckVeriCodeReq.mobile
+     * @return the mobile
+     * @createTime 2014年8月28日 下午5:39:56
+     * @author zhangshirui
+     */
     public String getMobile() {
         return mobile;
     }
+
+    /**
+     * set value of CheckVeriCodeReq.mobile
+     * @param mobile the mobile to set
+     * @createTime 2014年8月28日 下午5:39:56
+     * @author zhangshirui
+     */
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
+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 8:07:31 PM
+ * @author wujianjun
+ */
+@SuppressWarnings("serial")
+public class UpdateSellerInfoReq extends BaseReq {
+
+    /**
+     * 原密码
+     */
+    @ApiModelProperty(value = "原密码")
+    private String oldPassword;
+    /**
+     * 新的密码
+     */
+    @ApiModelProperty(value = "新密码")
+    private String password;
+
+
+    public String getOldPassword() {
+        return oldPassword;
+    }
+
+    public void setOldPassword(String oldPassword) {
+        this.oldPassword = oldPassword;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
+package com.diligrp.mobsite.getway.domain.protocol.user;
+
+import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
+
+
+/**
+ * <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 8:09:21 PM
+ * @author wujianjun
+ */
+@SuppressWarnings("serial")
+public class UpdateSellerInfoResp extends BaseResp {
+    
+    /**
+     * 更新成功
+     */
+    public static final Integer RESULT_FLAG_SUCCESS=1;
+    
+    /**
+     * 更新失败
+     */
+    public static final Integer RESULT_FLAG_FAILED=2;
+    
+    /**
+     * 更新结果
+     */
+
+    private Integer resultFlag = RESULT_FLAG_SUCCESS;
+
+    
+    /**
+     * get value of UpdatePasswordResp.resultFlag
+     * @return the resultFlag
+     * @createTime 2014年8月28日 下午3:12:31
+     * @author zhangshirui
+     */
+    public Integer getResultFlag() {
+        return resultFlag;
+    }
+
+    
+    /**
+     * set value of UpdatePasswordResp.resultFlag
+     * @param resultFlag the resultFlag to set
+     * @createTime 2014年8月28日 下午3:12:31
+     * @author zhangshirui
+     */
+    public void setResultFlag(Integer resultFlag) {
+        this.resultFlag = resultFlag;
+    }
+
+
+}
@@ -19,11 +19,11 @@ public class UpdateUserInfoReq extends BaseReq {
      */
     @ApiModelProperty(value = "新密码")
     private String password;
-    /**
-     * 再次输入密码
-     */
-    @ApiModelProperty(value = "再次输入新密码")
-    private String oldPassword;
+    ///**
+    // * 再次输入密码
+    // */
+    //@ApiModelProperty(value = "再次输入新密码")
+    //private String oldPassword;
     /**
      * 性别
      */
@@ -59,14 +59,6 @@ public class UpdateUserInfoReq extends BaseReq {
         this.password = password;
     }
-    public String getOldPassword() {
-        return oldPassword;
-    }
-
-    public void setOldPassword(String oldPassword) {
-        this.oldPassword = oldPassword;
-    }
-
     public Integer getGender() {
         return gender;
     }
@@ -7,6 +7,7 @@ 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.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.UpdateMobileReq;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.BaseService;
@@ -38,8 +39,13 @@ public interface PassportRPC extends BaseService {
     boolean verifySellerSmsCode(String mobile, String veriCode);
+    boolean verifyOldMobileAuthCode(String mobile, String veriCode);
+
+
     boolean verifyBuyerSmsCode(String mobile, String veriCode);
     BuyerInfoOutput authlogin(AuthLoginReq req);
+
+    void updateMobile(UpdateMobileReq req);
 }
 package com.diligrp.mobsite.getway.rpc;
+import com.b2c.myapp.common.api.sellerInfo.input.SellerInfoUpdateInput;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
@@ -46,6 +47,8 @@ public interface SellerRPC {
     SellerInfoOutput getSellerByMobile(String accountName);
+    Boolean updateSellerInfo(SellerInfoUpdateInput input);
+
     //ShopOutput getShopBySellerId(Long id);
     //
     //ShopOutput getShopById(Long id);
 package com.diligrp.mobsite.getway.rpc;
+import com.b2c.myapp.common.api.buyerInfo.input.BuyerInfoUpdateInput;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
-import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
-import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
-
-import java.util.List;
 /**
@@ -19,28 +16,10 @@ import java.util.List;
  */
 public interface UserRPC {
-    boolean addShoppingCart(List<AddCartProduct> cartProducts, Long userId);
-    /**
-     * 删除
-     * @param userId
-     * @param ids
-     * @return
-     * @createTime 2015年3月4日 下午6:46:54
-     * @author zhangshirui
-     */
-    boolean delCartByIds(Long userId, List<String> ids);
-    /**
-     * 验证用户名或者邮箱是否存在
-     *
-     * @param accountName
-     * @return
-     * @createTime 2014年8月27日 下午2:30:45
-     * @author zhangshirui
-     */
-    boolean checkAccountName(String accountName);
+
     /**
      * 验证电话号码是否存在
@@ -56,14 +35,7 @@ public interface UserRPC {
     BuyerInfoOutput checkMobile(String mobile);
-    /**
-     * 修改进货单数量
-     * @param req
-     * @return
-     * @createTime 2015年3月9日 下午2:49:27
-     * @author zhangshirui
-     */
-    boolean modifyAmount(ModifyAmountReq req);
+
     /**
      * 修改密码
@@ -75,29 +47,12 @@ public interface UserRPC {
      */
     boolean modifyPwd(String accountName, String newPassword);
-    /**
-     * 密码加密
-     * @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);
+    Boolean updateUserInfo(BuyerInfoUpdateInput input);
     BuyerInfoOutput getUserByMobile(String accountName);
     ShopBuyerOutput getDepositCardAmount(Long shopBuyerId,Long buyerId);
+
+
 }
@@ -12,6 +12,7 @@ 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.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
+import com.diligrp.mobsite.getway.domain.protocol.user.UpdateMobileReq;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.rpc.base.impl.BaseServiceImpl;
@@ -251,6 +252,9 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
                 output = super.httpGet("/api/forgot/sendBuyerForgotPasswordSMS/"+mobile, null, new TypeReference<BaseOutput<String>>(){});
             }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE){
+                output = super.httpGet("/api/user/sendBuyerSMS/"+mobile, null, new TypeReference<BaseOutput<String>>(){});
+            }
         } catch (Exception e) {
             if (msgType== SendVeriCodeReq.MSG_TYPE_LOGIN){
@@ -262,6 +266,9 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
                 log.error("error:调用passport买家忘记密码发送验证码短信失败",e);
             }
+            if (msgType== SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE){
+                log.error("error:调用passport买家修改手机号发送验证码短信失败",e);
+            }
             throw new ServiceException();
         }
@@ -276,7 +283,9 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
             if (msgType== SendVeriCodeReq.MSG_TYPE_RETRIEVE_PASSWORD){
                 log.error("error:调用passport买家忘记密码发送验证码短信失败[mobile=,code,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
             }
-            
+            if (msgType== SendVeriCodeReq.MSG_TYPE_MODIFY_NEW_MOBILE){
+                log.error("error:调用passport买家修改手机号发送验证码短信失败[mobile=,code,msg=]",new Object[]{mobile,output.getCode(),output.getResult()});
+            }
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -307,6 +316,27 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     @Override
+    public boolean verifyOldMobileAuthCode(String mobile, String veriCode) {
+        BaseOutput<String> output = null;
+        Map<String,String> params = new HashMap<String, String>();
+        params.put("phoneNumber", mobile);
+        params.put("code", veriCode);
+        try {
+            output = super.httpPost("/api/user/verifyBuyerSmsCode", params, null);
+        } catch (Exception e) {
+            log.error("error:买家修改手机号-校验短信验证码失败",e);
+            throw new ServiceException();
+        }
+
+        if (output.getCode()!= 200){
+            log.error("error:买家修改手机号-校验短信验证码失败[mobile=,msg=]",mobile,output.getResult());
+            throw new ServiceException(output.getCode(),output.getResult());
+        }
+
+        return output.getCode().equals(com.b2c.myapp.common.utils.ResultCode.OK);
+    }
+
+    @Override
     public boolean verifyBuyerSmsCode(String mobile, String veriCode) {
         BaseOutput<String> output = null;
         Map<String,String> params = new HashMap<String, String>();
@@ -352,4 +382,25 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         return buyerInfo;
     }
+
+    @Override
+    public void updateMobile(UpdateMobileReq req) {
+        Map<String,String> params = new HashMap<>();
+        params.put("userId", req.getUserId()+"");
+        params.put("newPhoneNumber", req.getMobile());
+        params.put("code", req.getVeriCode());
+        BaseOutput<String > output = null;
+        try {
+            output = super.httpPost("/api/user/updateBuyerPhoneNumber", params, new TypeReference<BaseOutput<String>>(){});
+        } catch (Exception e) {
+            log.error("error:调用passport修改买家手机号接口失败",e);
+            throw new ServiceException();
+        }
+        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());
+        }
+
+
+    }
 }
 package com.diligrp.mobsite.getway.rpc.impl;
+import com.b2c.myapp.common.api.sellerInfo.input.SellerInfoUpdateInput;
 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
 import com.b2c.myapp.common.utils.BaseOutput;
 import com.b2c.myapp.sdk.MyAppClient;
@@ -34,7 +35,7 @@ public class SellerRPCImpl implements SellerRPC {
     @Resource
     private RedisUtil redisUtil;
     @Resource
-    private MyAppClient userClient;
+    private MyAppClient myAppClient;
     @Resource
     private WebsiteClient websiteClient;
     @Resource
@@ -49,7 +50,7 @@ public class SellerRPCImpl implements SellerRPC {
     public SellerInfoOutput checkMobile(String mobile) {
         BaseOutput<SellerInfoOutput> output = null;
         try {
-            output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(mobile);
+            output = myAppClient.getSellerInfoService().getSellerInfoByMobilePhone(mobile);
         } catch (Exception e) {
             logger.error("检测电话号码接口挂掉：msg={}",e.getMessage());
             throw new ServiceException();
@@ -78,7 +79,7 @@ public class SellerRPCImpl implements SellerRPC {
         BaseOutput<SellerInfoOutput> output = null;
         boolean flag = false;
         try {
-            output = userClient.getSellerInfoService().getSellerInfoByMobilePhone(accountName);
+            output = myAppClient.getSellerInfoService().getSellerInfoByMobilePhone(accountName);
         } catch (Exception e) {
             logger.error("调用手机号查询卖家接口挂掉：msg={}",e.getMessage());
             throw new ServiceException();
@@ -96,6 +97,23 @@ public class SellerRPCImpl implements SellerRPC {
         return output.getData();
     }
+    @Override
+    public Boolean updateSellerInfo(SellerInfoUpdateInput input) {
+        BaseOutput<Boolean> output = null;
+        try {
+            output = myAppClient.getSellerInfoService().modify(input);
+        } catch (Exception e) {
+            logger.error("更新买家信息接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
+
+        if (output==null||!output.getCode().equals(com.b2c.myapp.common.utils.ResultCode.OK)){
+            logger.error("更新买家信息失败：[userId={},code={},result={}]",new Object[]{input.getAccountName(),output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_UPDATE_INFO);
+        }
+        return output.getData();
+    }
+
     //@Override
     //public ShopOutput getShopBySellerId(Long id) {
     //    BaseOutput<ShopOutput> output = null;
 package com.diligrp.mobsite.getway.rpc.impl;
+import com.b2c.myapp.common.api.buyerInfo.input.BuyerInfoUpdateInput;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
 import com.b2c.myapp.common.utils.BaseOutput;
@@ -7,8 +8,6 @@ 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.AddCartProduct;
-import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
 import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.website.util.security.Validator;
 import org.slf4j.Logger;
@@ -16,7 +15,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
-import java.util.List;
 /**
@@ -39,20 +37,6 @@ public class UserRPCImpl implements UserRPC {
     private static final Logger logger = LoggerFactory.getLogger(UserRPCImpl.class);
-    @Override
-    public boolean addShoppingCart(List<AddCartProduct> cartProducts, Long userId) {
-        return false;
-    }
-
-    @Override
-    public boolean delCartByIds(Long userId, List<String> ids) {
-        return false;
-    }
-
-    @Override
-    public boolean checkAccountName(String accountName) {
-        return false;
-    }
     @Override
     public BuyerInfoOutput checkMobile(String mobile) {
@@ -72,10 +56,6 @@ public class UserRPCImpl implements UserRPC {
         return output.getData();
     }
-    @Override
-    public boolean modifyAmount(ModifyAmountReq req) {
-        return false;
-    }
     @Override
@@ -113,7 +93,7 @@ public class UserRPCImpl implements UserRPC {
         if (output==null||!output.getCode().equals(com.b2c.myapp.common.utils.ResultCode.OK)){
             logger.error("买家查询储值卡余额失败：[userId={},code={},result={}]",new Object[]{buyerId,output.getCode(),output.getResult()});
-            throw new ServiceException();
+            throw new ServiceException(ResultCode.BUSINESS_FAILED,output.getResult());
         }
         return output.getData();
     }
@@ -124,13 +104,20 @@ public class UserRPCImpl implements UserRPC {
     }
     @Override
-    public String getEncryptPwd(String pwd) {
-        return null;
-    }
+    public Boolean updateUserInfo(BuyerInfoUpdateInput input) {
+        BaseOutput<Boolean> output = null;
+        try {
+            output = myAppClient.getBuyerInfoService().modify(input);
+        } catch (Exception e) {
+            logger.error("更新买家信息接口挂掉：msg={}",e.getMessage());
+            throw new ServiceException();
+        }
-    @Override
-    public boolean checkPassword(Long userId, String password) {
-        return false;
+        if (output==null||!output.getCode().equals(com.b2c.myapp.common.utils.ResultCode.OK)){
+            logger.error("更新买家信息失败：[userId={},code={},result={}]",new Object[]{input.getAccountName(),output.getCode(),output.getResult()});
+            throw new ServiceException(ResultCode.BUSINESS_FAILED, ErrorMessage.USER_UPDATE_INFO);
+        }
+        return output.getData();
     }
@@ -110,4 +110,8 @@ public interface UserService {
 	 * @return
 	 */
 	GetDeliveryAddressResp getDeliveryAddresses(GetDeliveryAddressReq req);
+
+	CheckVeriCodeResp checkOldMobileAuthCode(CheckVeriCodeReq req);
+
+	UpdateMobileResp updateMobile(UpdateMobileReq req);
 }
 package com.diligrp.mobsite.getway.service.buyer.user.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-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 com.b2c.myapp.common.api.buyerInfo.input.BuyerInfoUpdateInput;
 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
 import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
 import com.b2c.myapp.common.api.shopBuyer.output.ShopBuyerOutput;
@@ -23,33 +11,10 @@ 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.PickInfo;
-import com.diligrp.mobsite.getway.domain.protocol.login.AuthLoginReq;
-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.UserRegisterReq;
 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetDeliveryAddressReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetDeliveryAddressResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetDepositCardAmountReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetDepositCardAmountResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNoReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNoResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNobyUidsReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetRegisterNobyUidsResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetUserInfoReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.GetUserInfoResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.SearchUserInfoReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.SearchUserInfoResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.UpdateUserInfoReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.UpdateUserInfoResp;
+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.PassportRPC;
@@ -57,8 +22,17 @@ import com.diligrp.mobsite.getway.rpc.PickInfoRPC;
 import com.diligrp.mobsite.getway.rpc.UserRPC;
 import com.diligrp.mobsite.getway.rpc.base.BaseOutput;
 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
+import com.diligrp.mobsite.getway.service.common.utils.DateUtils;
 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;
+import java.util.*;
 /**
  * <B>Description</B> 用户 服务层 <br />
@@ -241,7 +215,32 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public UpdateUserInfoResp updateUserInfo(UpdateUserInfoReq req) {
-		return null;
+		BuyerInfoUpdateInput input = new BuyerInfoUpdateInput();
+		input.setId(req.getUserId());
+		input.setMobilePhone(req.getMobile());
+		if (!Validator.isNull(req.getNickname())){
+			input.setAccountName(req.getNickname());
+		}
+		if (!Validator.isNull(req.getPassword())){
+			input.setAccountPwd(req.getPassword());
+		}
+
+		if (!Validator.isNull(req.getBirth())){
+			try {
+				input.setBirthday(DateUtils.parseDate(req.getBirth(),DateUtils.DATE_FORMAT ));
+			} catch (Exception e) {
+				logger.error("日期转换错误",e);
+				throw new ServiceException();
+			}
+		}
+		if (!Validator.isNull(req.getGender())){
+			input.setSex(req.getGender());
+		}
+		if (!Validator.isNull(req.getHeadImg())){
+			input.setFace(req.getHeadImg());
+		}
+		userRPC.updateUserInfo(input);
+		return new UpdateUserInfoResp();
 	}
 	@Override
@@ -454,4 +453,18 @@ public class UserServiceImpl implements UserService {
 		resp.setPickInfo(pickInfo);
 		return resp;
 	}
+
+	@Override
+	public CheckVeriCodeResp checkOldMobileAuthCode(CheckVeriCodeReq req) {
+		passportRPC.verifyOldMobileAuthCode(req.getMobile(), req.getVeriCode());
+
+		return new CheckVeriCodeResp();
+	}
+
+	@Override
+	public UpdateMobileResp updateMobile(UpdateMobileReq req) {
+		passportRPC.updateMobile(req);
+
+		return new UpdateMobileResp();
+	}
 }
@@ -45,4 +45,5 @@ public interface SellerUserService {
     LogoutResp logout(LogoutReq req);
+    UpdateSellerInfoResp updateUserInfo(UpdateSellerInfoReq req);
 }
 package com.diligrp.mobsite.getway.service.seller.impl;
+import com.b2c.myapp.common.api.sellerInfo.input.SellerInfoUpdateInput;
 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;
@@ -12,9 +13,7 @@ import com.diligrp.mobsite.getway.domain.protocol.login.*;
 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.GetRegisterNoResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.*;
 import com.diligrp.mobsite.getway.manager.common.RegisterNoMapperManager;
 import com.diligrp.mobsite.getway.rpc.PassportRPC;
 import com.diligrp.mobsite.getway.rpc.SellerRPC;
@@ -294,7 +293,14 @@ public class SellerUserServiceImpl implements SellerUserService {
 		return resp;
 	}
-
+	@Override
+	public UpdateSellerInfoResp updateUserInfo(UpdateSellerInfoReq req) {
+		SellerInfoUpdateInput input = new SellerInfoUpdateInput();
+		input.setId(req.getUserId());
+		input.setMobilePhone(req.getPassword());
+		sellerRPC.updateSellerInfo(input);
+		return new UpdateSellerInfoResp();
+	}
 }
@@ -227,6 +227,59 @@ public class UserController extends BaseApiController {
 	}
 	/**
+	 * 修改买家手机号:验证旧手机号验证码
+	 *
+	 * @createTime 2017年2月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "修改手机号:验证旧手机号验证码", httpMethod = "POST", notes = "验证手机收到的验证码", response = CheckVeriCodeResp.class)
+	@RequestMapping(value = "/checkOldMobileAuthCode", method = RequestMethod.POST)
+	@ResponseBody
+	public void checkOldMobileAuthCode(@RequestBody CheckVeriCodeReq temp) {
+		CheckVeriCodeReq req = super.getRequest(CheckVeriCodeReq.class);
+		try {
+			BeanValidator.validator(req);
+			CheckVeriCodeResp resp = userService.checkOldMobileAuthCode(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("验证手机收到的验证码：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+
+	/**
+	 * 修改买家手机号
+	 * @createTime 2017年2月24日 下午10:55:03
+	 * @author weili
+	 */
+	@ApiOperation(value = "修改买家手机号", httpMethod = "POST", notes = "验证手机收到的验证码", response = CheckVeriCodeResp.class)
+	@RequestMapping(value = "/updateMobile", method = RequestMethod.POST)
+	@ResponseBody
+	public void updateMobile (@RequestBody UpdateMobileReq temp) {
+		UpdateMobileReq req = super.getRequest(UpdateMobileReq.class);
+		try {
+			//BeanValidator.validator(req);
+			UpdateMobileResp resp = userService.updateMobile(req);
+			super.sendSuccessResp(resp);
+		} catch (ServiceException e) {
+			LOGGER.error(
+					String.format("Code=%s,ErrorMessage=%s,UserId=%s", e.getCode(), e.getMessage(), req.getUserId()),
+					e);
+			sendError(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("验证手机收到的验证码：", e);
+			super.sendError(e.getMessage());
+		}
+	}
+
+
+	/**
 	 * 买家注册
 	 * 
 	 * @createTime 2014年8月28日 下午3:41:02
@@ -8,8 +8,7 @@ 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.saler.user.SellerLoginReq;
 import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
-import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
-import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
+import com.diligrp.mobsite.getway.domain.protocol.user.*;
 import com.diligrp.mobsite.getway.service.seller.SellerUserService;
 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
 import com.diligrp.mobsite.getway.web.utils.BeanValidator;
@@ -270,29 +269,29 @@ public class SellerUserController extends BaseApiController {
         }
     }
-    ///**
-    // * 个人信息维护
-    // * @createTime 2016年8月24日 下午10:55:03
-    // * @author weili
-    // */
-    //@ApiOperation(value = "个人信息维护", httpMethod = "POST" ,response = UpdateUserInfoResp.class)
-    //@RequestMapping(value = "/updateUserInfo",method = RequestMethod.POST)
-    //@ResponseBody
-    //public void updateUserInfo(@RequestBody UpdateUserInfoReq temp){
-    //    UpdateUserInfoReq req = super.getRequest(UpdateUserInfoReq.class);
-    //    try {
-    //        UpdateUserInfoResp resp = sellerUserService.updateUserInfo(req);
-    //        super.sendSuccessResp(resp);
-    //    } catch (ServiceException e){
-    //        log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
-    //                e.getCode(), e.getMessage(), req.getUserId()), e);
-    //        sendError(e.getCode(), e.getMessage());
-    //    } catch (Exception e) {
-    //        log.error("个人信息维护：", e);
-    //        super.sendError(e.getMessage());
-    //    }
-    //
-    //}
+    /**
+     * 卖家信息维护
+     * @createTime 2016年8月24日 下午10:55:03
+     * @author weili
+     */
+    @ApiOperation(value = "卖家信息维护", httpMethod = "POST" ,response = UpdateUserInfoResp.class)
+    @RequestMapping(value = "/updateSellerInfo",method = RequestMethod.POST)
+    @ResponseBody
+    public void updateSellerInfo(@RequestBody UpdateSellerInfoReq temp){
+        UpdateSellerInfoReq req = super.getRequest(UpdateSellerInfoReq.class);
+        try {
+            UpdateSellerInfoResp resp = sellerUserService.updateUserInfo(req);
+            super.sendSuccessResp(resp);
+        } catch (ServiceException e){
+            log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
+                    e.getCode(), e.getMessage(), req.getUserId()), e);
+            sendError(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("个人信息维护：", e);
+            super.sendError(e.getMessage());
+        }
+
+    }