Commit 5f946b9b by 兰国旗

laolan

parent f714853a
...@@ -76,7 +76,7 @@ class RegCenterOrderService extends AppServiceBase { ...@@ -76,7 +76,7 @@ class RegCenterOrderService extends AppServiceBase {
var needInfoUrl = settings.centerChannelUrl() + "/api/action/regapi/springBoard"; var needInfoUrl = settings.centerChannelUrl() + "/api/action/regapi/springBoard";
var needInfoRes = await this.execlient.execPostTK(reqData, needInfoUrl, tokenInfo.data.token); var needInfoRes = await this.execlient.execPostTK(reqData, needInfoUrl, tokenInfo.data.token);
if(needInfoRes.status == 0){ if(needInfoRes.status == 0){
pobj.mobile = needInfoRes.channelNeedNo pobj.mobile = needInfoRes.data.channelUserId
} }
} }
...@@ -164,7 +164,6 @@ class RegCenterOrderService extends AppServiceBase { ...@@ -164,7 +164,6 @@ class RegCenterOrderService extends AppServiceBase {
}; };
} }
// 获取app token // 获取app token
// var tokenInfo = await this.getCenterToken();
var tokenInfo = await this.getCenterTokenByApp(pobj.appInfo); var tokenInfo = await this.getCenterTokenByApp(pobj.appInfo);
if (tokenInfo.status != 0) { if (tokenInfo.status != 0) {
return { return {
...@@ -194,13 +193,57 @@ class RegCenterOrderService extends AppServiceBase { ...@@ -194,13 +193,57 @@ class RegCenterOrderService extends AppServiceBase {
} }
pobj['province'] = pobj.area; pobj['province'] = pobj.area;
}else { }else {
var userpin = "";
//传手机号
if(pobj.phone&&!pobj.mobile){
pobj.mobile=pobj.phone;
}else{//没传手机号就自己去查渠道唯一码
var reqData = {
actionType: "selectNeedInfo",
actionBody: {
channelNeedNo:pobj.intentionBizId
}
}
var needInfoUrl = settings.centerChannelUrl() + "/api/action/regapi/springBoard";
var needInfoRes = await this.execlient.execPostTK(reqData, needInfoUrl, tokenInfo.data.token);
if(needInfoRes.status == 0){
pobj.mobile = needInfoRes.data.channelUserId
}
}
if (pobj.mobile) {
//有传手机号就直接获取用户userpin
var userparam = {
actionType: "getLoginByUserName",
actionBody: {
"channelUserId": pobj.mobile,
"mobile": pobj.mobile,
"userName": pobj.mobile
}
};
var url = settings.centerChannelUrl() + "/api/opreceive/accessAuth/springBoard";
var userpinResultTmp = await this.execlient.execPostTK(userparam, url, tokenInfo.data.token);
if (userpinResultTmp.status != 0 && userpinResultTmp.status != 2060) {
return system.getResultFail(-99, "获取userpin失败");
}
userpin = userpinResultTmp.data.userpin;
if (!userpin) {
return system.getResultFail(-88, "获取userpin失败!!");
}
}
var sobj = { var sobj = {
"actionType": "getItemByChannelSolutionNo", "actionType": "getItemByChannelSolutionNo",
"actionBody": pobj "actionBody": pobj
} }
// getItemByChannelSolutionNo // getItemByChannelSolutionNo
var url = settings.centerChannelUrl() + "/api/action/regapi/springBoard"; var url = settings.centerChannelUrl() + "/api/action/regapi/springBoard";
var result = await this.execlient.execPostTK(sobj, url, token); var result = await this.execlient.execDataPostByTokenUserPin(sobj, url, token, userpin);
if(result && result.stdout){
result = result.stdout
result = JSON.parse(result)
}
if (result.status != 0) { if (result.status != 0) {
return { return {
"requestId": result.requestId, "requestId": result.requestId,
...@@ -209,37 +252,17 @@ class RegCenterOrderService extends AppServiceBase { ...@@ -209,37 +252,17 @@ class RegCenterOrderService extends AppServiceBase {
"errorCode": "ok" "errorCode": "ok"
}; };
} }
userparam.actionBody.channelUserId = result.data.channelUserId console.log('regOrderStatus--start--')
userparam.actionBody.mobile = result.data.publishMobile // regOrderStatus
userparam.actionBody.userName = result.data.publishMobile
pobj.publishMobile = result.data.publishMobile;
pobj.channelNeedNo = result.data.channelNeedNo;
pobj.needNo = result.data.needNo;
pobj.channelTypeCode = result.data.channelTypeCode;
pobj['province'] = result.data.solutionProvince;//北京(新购)?
}
var url = settings.centerChannelUrl() + "/api/opreceive/accessAuth/springBoard";
var userpinResultTmp = await this.execlient.execPostTK(userparam, url, tokenInfo.data.token);
if (userpinResultTmp.status != 0) {
return {
"requestId": userpinResultTmp.requestId,
"success": false,
"errorMsg": userpinResultTmp.msg,
"errorCode": "ok"
};
}
//regOrderStatus
var url = settings.centerChannelUrl() + "/api/action/regapi/springBoard"; var url = settings.centerChannelUrl() + "/api/action/regapi/springBoard";
var sobj = { var sobj = {
"actionType": "regOrderStatus", "actionType": "regOrderStatus",
"actionBody": pobj "actionBody": pobj
} }
var rtn = await this.execlient.execDataPostByTokenUserPin(sobj, url, token,userpinResultTmp.data.userpin); var rtn = await this.execlient.execDataPostByTokenUserPin(sobj, url, token, userpinResultTmp.data.userpin);
if (!rtn || !rtn.stdout) { if (!rtn || !rtn.stdout) {
return { return {
"requestId": regCfg.getUUID(), "requestId": self.getUUID(),
"success": false, "success": false,
"errorMsg": "网络错误", "errorMsg": "网络错误",
"errorCode": "ok" "errorCode": "ok"
...@@ -261,6 +284,7 @@ class RegCenterOrderService extends AppServiceBase { ...@@ -261,6 +284,7 @@ class RegCenterOrderService extends AppServiceBase {
"errorCode": "ok" "errorCode": "ok"
}; };
} }
}
//百度reg 2.4 请求 关闭reg订单 //百度reg 2.4 请求 关闭reg订单
async regOrderClose(pobj) { async regOrderClose(pobj) {
if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){ if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){
...@@ -288,9 +312,57 @@ class RegCenterOrderService extends AppServiceBase { ...@@ -288,9 +312,57 @@ class RegCenterOrderService extends AppServiceBase {
"actionBody": pobj "actionBody": pobj
} }
// getItemByChannelSolutionNo // getItemByChannelSolutionNo
var userpin = "";
//传手机号
if(pobj.phone&&!pobj.mobile){
pobj.mobile=pobj.phone;
}else{//没传手机号就自己去查渠道唯一码
var reqData = {
actionType: "selectNeedInfo",
actionBody: {
orderNo:pobj.orderNo
}
}
var needInfoUrl = settings.centerChannelUrl() + "/api/action/regapi/springBoard";
var needInfoRes = await this.execlient.execPostTK(reqData, needInfoUrl, tokenInfo.data.token);
if(needInfoRes.status == 0){
pobj.mobile = needInfoRes.data.channelUserId
}
}
if (pobj.mobile) {
//有传手机号就直接获取用户userpin
var userparam = {
actionType: "getLoginByUserName",
actionBody: {
"channelUserId": pobj.mobile,
"mobile": pobj.mobile,
"userName": pobj.mobile
}
};
var url = settings.centerChannelUrl() + "/api/opreceive/accessAuth/springBoard";
var userpinResultTmp = await this.execlient.execPostTK(userparam, url, tokenInfo.data.token);
if (userpinResultTmp.status != 0 && userpinResultTmp.status != 2060) {
return system.getResultFail(-99, "获取userpin失败");
}
userpin = userpinResultTmp.data.userpin;
if (!userpin) {
return system.getResultFail(-88, "获取userpin失败!!");
}
}
var sobj = {
"actionType": "getItemByChannelSolutionNo",
"actionBody": pobj
}
var url = settings.centerChannelUrl() + "/api/action/regapi/springBoard"; var url = settings.centerChannelUrl() + "/api/action/regapi/springBoard";
var result = await this.execlient.execPostTK(sobj, url, token); var result = await this.execlient.execDataPostByTokenUserPin(sobj, url, token, userpin);
if (result.status != 0 || !result.data) { if(result && result.stdout){
result = result.stdout
result = JSON.parse(result)
}
if (result.status != 0) {
return { return {
"requestId": result.requestId, "requestId": result.requestId,
"success": false, "success": false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment