Skip to content

Z
zhichan
Commit ca48e167 by 宋毅
Options

tj

parent a6aa5357
Showing with 25 additions and 44 deletions
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
...@@ -262,7 +262,7 @@ class tmqueryCtl extends CtlBase { ...@@ -262,7 +262,7 @@ class tmqueryCtl extends CtlBase {
return system.getResultFail(-200, "操作error"); return system.getResultFail(-200, "操作error");
} }
} }
async putPayOrderData(pobj, orderResult, channelServiceNo, needNo, needNoOrderNo, req) {//关联下单的数据 async putPayOrderData(pobj, orderResult, needNo, needNoOrderNo, req) {//关联下单的数据
var tokenInfo = await this.getToken(pobj.actionProcess); var tokenInfo = await this.getToken(pobj.actionProcess);
if (tokenInfo.status != 0) { if (tokenInfo.status != 0) {
return tokenInfo; return tokenInfo;
...@@ -273,7 +273,6 @@ class tmqueryCtl extends CtlBase { ...@@ -273,7 +273,6 @@ class tmqueryCtl extends CtlBase {
actionBody: { actionBody: {
channelUserId: req.session.userPinInfo.channelUserId, channelUserId: req.session.userPinInfo.channelUserId,
orderNo: orderResult.data.orderNo, orderNo: orderResult.data.orderNo,
channelServiceNo: channelServiceNo,
needNo: needNo, needNo: needNo,
needNoOrderNo: needNoOrderNo needNoOrderNo: needNoOrderNo
}, },
...@@ -357,10 +356,9 @@ class tmqueryCtl extends CtlBase { ...@@ -357,10 +356,9 @@ class tmqueryCtl extends CtlBase {
var payDataResult = JSON.parse(tmpResult.data); var payDataResult = JSON.parse(tmpResult.data);
if (payDataResult && payDataResult.success && payDataResult.success == true) { if (payDataResult && payDataResult.success && payDataResult.success == true) {
//更新订单信息 //更新订单信息
var channelServiceNo = payDataResult.data.orderNumber;
var needNo = pobj.actionBody.itemCode + "_" + payDataResult.data.orderNumber; var needNo = pobj.actionBody.itemCode + "_" + payDataResult.data.orderNumber;
var needNoOrderNo = payDataResult.data.orderNumber; var needNoOrderNo = payDataResult.data.orderNumber;
await this.putPayOrderData(pobj, orderResult, channelServiceNo, needNo, needNoOrderNo, req); await this.putPayOrderData(pobj, orderResult, needNo, needNoOrderNo, req);
return system.getResultSuccess({ payUrl: payDataResult.data.returnUrl }); return system.getResultSuccess({ payUrl: payDataResult.data.returnUrl });
}//成功 }//成功
} }
...@@ -474,39 +472,20 @@ class tmqueryCtl extends CtlBase { ...@@ -474,39 +472,20 @@ class tmqueryCtl extends CtlBase {
if (tokenInfo.status != 0) { if (tokenInfo.status != 0) {
return tokenInfo; return tokenInfo;
} }
var param = {}; //自助注册产品---用updateOrderPayStatus，否则为addOrderAndDelivery
if (pushData.skuId == "FW_GOODS-582064-1") { var param = {
param = { actionProcess: pushData.actionProcess,
actionProcess: pushData.actionProcess, actionType: pushData.skuId == "FW_GOODS-582206-1" ? "updateOrderPayStatus" : "addOrderAndDelivery",
actionType: "updateOrderPayStatus", actionBody: {
actionBody: { channelUserId: pushData.jdPin,
channelUserId: pushData.jdPin, payStatus: "yfk",
payStatus: "yfk", channelItemCode: pushData.skuId,//------用此字段查询渠道产品是否存在
channelItemCode: pushData.skuId, needNo: pushData.skuId + "_" + pushData.orderNumber,
needNoOrderNo: pushData.orderId, needNoOrderNo: pushData.orderNumber,//---用此字段查找
buyerMoblie: pushData.mobile buyerMoblie: pushData.mobile
}, },
isUser: "yes" isUser: "yes"
}; };
}//自助注册产品
else {
//有返回用户信息进行用户ID加密
param = {
actionProcess: pushData.actionProcess,
actionType: "addOrderAndDelivery",
actionBody: {
channelUserId: pushData.jdPin,
payStatus: "yfk",
channelItemCode: pushData.skuId,
needNo: pushData.skuId + "_" + pushData.orderNumber,
needNoOrderNo: pushData.orderNumber,
buyerMoblie: pushData.mobile
},
isUser: "yes"
};
}//商标注册【专家辅助申请】、商标注册【担保申请】和 除商标之外的产品
var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard"; var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
this.logClient.error("jd", "req---->pushJdPayOrder---->params:" + JSON.stringify(param) + "，reqUrl:" + reqUrl); this.logClient.error("jd", "req---->pushJdPayOrder---->params:" + JSON.stringify(param) + "，reqUrl:" + reqUrl);
...@@ -558,21 +537,23 @@ class tmqueryCtl extends CtlBase { ...@@ -558,21 +537,23 @@ class tmqueryCtl extends CtlBase {
}; };
var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard"; var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
console.log("req---->opGsbPayPageInfo---->params:" + JSON.stringify(param) + "，reqUrl:" + reqUrl); console.log("req---->opGsbPayPageInfo---->params:" + JSON.stringify(param) + "，reqUrl:" + reqUrl);
var result = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token); var payDataResult = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
if (!result) { if (!payDataResult && payDataResult.status != 1) {
console.log("req---->opGsbPayPageInfo---->error:" + JSON.stringify(result)); console.log("req---->opGsbPayPageInfo---->error:" + JSON.stringify(payDataResult));
return system.getResult(null, "req error"); return system.getResult(null, "req error");
} }
return result; //更新订单信息
var needNo = "zzsbzc_" + payDataResult.data.order_no;
var needNoOrderNo = payDataResult.data.order_no;
await this.putPayOrderData(pobj, orderResult, needNo, needNoOrderNo, req);
return system.getResultSuccess({ payUrl: payDataResult.data.order_detail_url });
} catch (error) { } catch (error) {
console.log("req---->opGsbPayPageInfo---->操作error:" + error.stack); console.log("req---->opGsbPayPageInfo---->操作error:" + error.stack);
return system.getResultFail(-200, "操作error"); return system.getResultFail(-200, "操作error");
} }
return system.getResultSuccess(); return system.getResultSuccess();
} }
async pushGsbPayOrder(pushData, req) {//处理京东推送的订单信息 async pushGsbPayOrder(pushData, req) {//处理公司宝推送的订单信息
try { try {
var signResult = await this.createSign(pushData, "6B876EB84731E166D76E1F73AD5764BA", true); var signResult = await this.createSign(pushData, "6B876EB84731E166D76E1F73AD5764BA", true);
if (signResult.status != 0) { if (signResult.status != 0) {
......
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