Merge remote-tracking branch 'origin/dev' into dev

jiangchengyong
2 parents 48101350 5f71d667
Showing 2 changed files with 52 additions and 61 deletions
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PassportRPC.java
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/PassportRPCImpl.java
@@ -37,4 +37,8 @@ public interface PassportRPC extends BaseService {
     boolean sendVeriCodeOfBuyer(String mobile,Integer msgType);
     boolean verifySellerSmsCode(String mobile, String veriCode);
+
+    boolean verifyBuyerSmsCode(String mobile, String veriCode);
+
+
 }
@@ -2,6 +2,8 @@ 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.Constant;
 import com.diligrp.mobsite.getway.domain.common.RedisKey;
 import com.diligrp.mobsite.getway.domain.common.ResultCode;
@@ -63,46 +65,29 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     @Override
     public SellerLoginResp sellerLogin(LoginReq req) {
         Map<String,String> params = new HashMap<String, String>();
-        params.put("userName", req.getAccountName());
+        params.put("username", req.getAccountName());
         params.put("password", req.getPassword());
-        params.put("src", "zadeapp");
-        BaseOutput<String> output = null;
+        BaseOutput<SellerInfoOutput> output = null;
         try {
-            output = super.httpPost("/api/login/login.html", params, null);
+            output = super.httpPost("/api/login/sellerLogin", params, new TypeReference<BaseOutput<SellerInfoOutput>>(){});
         } catch (Exception e) {
-        	log.error("调用passport用户验证接口失败",e);
+        	log.error("调用passport卖家登录接口失败",e);
             throw new ServiceException();
         }
-
+        SellerInfoOutput sellerInfo = output.getData();
         SellerLoginResp resp = new SellerLoginResp();
-        JSONObject jsonBody = JSONObject.parseObject(output.getData());
-        int code = 0;
-        try {
-        	code = jsonBody.getIntValue("code");
-		} catch (Exception e) {
-			log.error("passport返回数据：msg={}",jsonBody);
+        if (output.getCode()!=ResultCode.SUCCESS){
+			log.error("调用passport卖家登录接口失败：msg={}",output.getResult());
 			throw new ServiceException(ResultCode.BUSINESS_FAILED,"登录失败请重新登录");
 		}
-        String msg = jsonBody.getString("msg");
-        if (code == PASSPORT_LOGIN_CODE_LOCKED || code == PASSPORT_LOGIN_CODE_ACCOUNT_NOT_EXIST
-        		|| code == PASSPORT_LOGIN_CODE_PASSWORD_WRONG) {
-        	throw new ServiceException(code,msg);
-		}else if (code != ResultCode.SUCCESS) {
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,msg);
-        }
-
-        //resp.setToken(jsonBody.getString("token"));
-        JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
-        resp.setSellerId(jsonUser.getLong("accountId"));
-        resp.setPhone(jsonUser.getString("mobile"));
-        resp.setShopId(jsonUser.getLong("shopId"));
+        resp.setSellerId(sellerInfo.getId());
+        resp.setPhone(sellerInfo.getMobilePhone());
+        resp.setShopId(1L);
         resp.setShopLogo("sds.jpg");
         resp.setShopName("张三的水果店铺");
         resp.setShopAuthCode(457854);
-        resp.setCode(code);
-        resp.setMsg(msg);
         //缓存userId
         String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_SELLER+String.valueOf(resp.getSellerId()));
@@ -207,46 +192,28 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     public LoginResp buyerLogin(LoginReq req) {
         Map<String,String> params = new HashMap<String, String>();
-        params.put("userName", req.getAccountName());
+        params.put("username", req.getAccountName());
         params.put("password", req.getPassword());
-        params.put("src", "zadeapp");
-        BaseOutput<String> output = null;
+        BaseOutput<BuyerInfoOutput > output = null;
         try {
-            output = super.httpPost("/api/login/login.html", params, null);
+            output = super.httpPost("/api/login/buyerLogin", params, new TypeReference<BaseOutput<BuyerInfoOutput>>(){});
         } catch (Exception e) {
-            log.error("调用passport用户验证接口失败",e);
+            log.error("调用passport卖家登录接口失败",e);
             throw new ServiceException();
         }
-
-       JSONObject jsonBody = JSONObject.parseObject(output.getData());
-        int code = 0;
-        try {
-            code = jsonBody.getIntValue("code");
-        } catch (Exception e) {
-            log.error("passport返回数据：msg={}",jsonBody);
+        BuyerInfoOutput  buyerInfo = output.getData();
+        if (output.getCode()!=ResultCode.SUCCESS){
+            log.error("调用passport买家登录接口失败：msg={}",output.getResult());
             throw new ServiceException(ResultCode.BUSINESS_FAILED,"登录失败请重新登录");
         }
-        String msg = jsonBody.getString("msg");
-
-        if (code == PASSPORT_LOGIN_CODE_LOCKED || code == PASSPORT_LOGIN_CODE_ACCOUNT_NOT_EXIST
-                || code == PASSPORT_LOGIN_CODE_PASSWORD_WRONG) {
-            throw new ServiceException(code,msg);
-        }else if (code != ResultCode.SUCCESS) {
-            throw new ServiceException(ResultCode.BUSINESS_FAILED,msg);
-        }
-
-        //resp.setToken(jsonBody.getString("token"));
-        JSONObject jsonUser = jsonBody.getJSONObject("accountInfo");
         LoginResp resp = new LoginResp();
-        resp.setBuyerId(jsonUser.getLong("accountId"));
-        resp.setHeadImg(jsonUser.getString("img"));
-        resp.setMobile("13985454555");
+        resp.setBuyerId(buyerInfo.getId());
+        resp.setHeadImg(buyerInfo.getFace());
+        resp.setMobile(buyerInfo.getMobilePhone());
         resp.setAccountName("");
         resp.setCurrentShopId(123L);
         resp.setShopBuyerId(122L);
-        resp.setCode(code);
-        resp.setMsg(msg);
         //缓存userId
         String cookieRedisKey = redisUtil.makeKey(RedisKey.USER_LOGININFO, Constant.USER_ROLE_SIGN_BUYER+String.valueOf(resp.getBuyerId()));
@@ -289,12 +256,12 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
                 output = super.httpGet("/api/forgot/sendSellerForgotPasswordSMS/"+mobile,  null, new TypeReference<BaseOutput<String>>(){} );
             }
         } catch (Exception e) {
-            log.error("调用passport用户验证接口失败",e);
+            log.error("调用passport卖家注册发送短信失败",e);
             throw new ServiceException();
         }
         if (output.getCode()!= 200){
-            log.error("调用passport用户验证接口失败[mobile=,msg=]",mobile,output.getResult());
+            log.error("调用passport卖家注册发送短信失败[mobile=,msg=]",mobile,output.getResult());
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -316,12 +283,12 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
                 output = super.httpGet("/api/forgot/sendBuyerForgotPasswordSMS/"+mobile, null, null);
             }
         } catch (Exception e) {
-            log.error("调用passport用户验证接口失败",e);
+            log.error("调用passport买家注册发送短信失败",e);
             throw new ServiceException();
         }
         if (output.getCode()!= 200){
-            log.error("调用passport用户验证接口失败[mobile=,msg=]",mobile,output.getResult());
+            log.error("调用passport买家注册发送短信失败[mobile=,msg=]",mobile,output.getResult());
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -337,12 +304,12 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
         try {
             output = super.httpPost("/api/forgot/verifySellerSmsCode", params, null);
         } catch (Exception e) {
-            log.error("调用passport用户验证接口失败",e);
+            log.error("passport校验卖家短信验证码失败",e);
             throw new ServiceException();
         }
         if (output.getCode()!= 200){
-            log.error("调用passport用户验证接口失败[mobile=,msg=]",mobile,output.getResult());
+            log.error("passport校验卖家短信验证码失败[mobile=,msg=]",mobile,output.getResult());
             throw new ServiceException(output.getCode(),output.getResult());
         }
@@ -350,4 +317,24 @@ public class PassportRPCImpl extends BaseServiceImpl implements PassportRPC {
     }
+    @Override
+    public boolean verifyBuyerSmsCode(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/forgot/verifyBuyerSmsCode", params, null);
+        } catch (Exception e) {
+            log.error("passport校验买家短信验证码失败",e);
+            throw new ServiceException();
+        }
+
+        if (output.getCode()!= 200){
+            log.error("passport校验买家短信验证码失败[mobile=,msg=]",mobile,output.getResult());
+            throw new ServiceException(output.getCode(),output.getResult());
+        }
+
+        return output.getCode().equals("200");
+    }
 }