Skip to content

Z
zhichan
Commit 7c0b6794 by 宋毅
Options

tj

parent f838e08c
Showing with 27 additions and 21 deletions
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
......@@ -43,6 +43,10 @@ class UtilsOrderService extends AppServiceBase {
appInfo: opResult.data.appInfo,
actionBody: opResult.data
}
tmpPobj.actionBody.appName = pobj.appInfo.app_name;
if (opResult.data && opResult.data.product_info && opResult.data.product_info.price_item) {
tmpPobj.actionBody.sku = opResult.data.product_info.price_item.service_code;
}
this.execClientNew.execLogs("pushNewFq-3", tmpPobj, "center-channel-utilsOrderSve-pushNewFqByChannelOrderNo-pushBusInfo", "pushOrder", null);
this.utilsPushSve.pushBusInfo(tmpPobj, "pushOrder", 1);
}
......@@ -161,6 +165,7 @@ class UtilsOrderService extends AppServiceBase {
var result = await this.restPostUrl(pobj, reqUrl);
return result;
}
async delENameOrder(pobj, actionBody) {
if (!actionBody.orderNo) {
return system.getResult(null, "actionBody.orderNo can not be empty，100025");
......@@ -671,7 +676,7 @@ class UtilsOrderService extends AppServiceBase {
clientIp: client_ip || ""
});
var param = {
"actionBody": { parmas: parmas },
"actionBody": {parmas: parmas},
"client_ip": client_ip
};
var qftstr = await this.restClient.execPost(param, this.centerAppUrl + "payment/paymentApi/receiveCallBackNotify");
......@@ -705,7 +710,7 @@ class UtilsOrderService extends AppServiceBase {
});
var url = this.centerAppUrl + "payment/paymentApi/getAppInfo";
var opResult = await this.restPostUrl({ uappId: parmas.uappid }, url);
var opResult = await this.restPostUrl({uappId: parmas.uappid}, url);
if (opResult.status != 0) {
opResult.msg = opResult.msg + "，100270";
return opResult;
......@@ -820,7 +825,7 @@ class UtilsOrderService extends AppServiceBase {
});
return system.getResultFail(-200, "阿里回调操作频繁---太频繁了，太频繁了");
}
parmas.appInfo = { appInfo: { uapp_id: opResult.data.uappId } };
parmas.appInfo = {appInfo: {uapp_id: opResult.data.uappId}};
parmas.orderNo = opResult.data.orderNo;
parmas.pay_type = "alipay";
//修改并返回订单支付状态，创建收款单
......@@ -936,7 +941,7 @@ class UtilsOrderService extends AppServiceBase {
}
// 2020 07.03 lin 修改 获取app信息 推送蜂擎使用
var url = this.centerAppUrl + "payment/paymentApi/getAppInfo";
var appInfoResult = await this.restPostUrl({ uappId: opResult.data.uappId }, url);
var appInfoResult = await this.restPostUrl({uappId: opResult.data.uappId}, url);
if (appInfoResult.status != 0) {
appInfoResult.msg = appInfoResult.msg + "，100270";
return appInfoResult;
......@@ -956,7 +961,7 @@ class UtilsOrderService extends AppServiceBase {
});
return system.getResultFail(-200, "阿里回调操作频繁---太频繁了，太频繁了");
}
parmas.appInfo = { appInfo: { uapp_id: opResult.data.uappId } };
parmas.appInfo = {appInfo: {uapp_id: opResult.data.uappId}};
parmas.orderNo = opResult.data.orderNo;
parmas.pay_type = "alipay";
//修改并返回订单支付状态，创建收款单
......@@ -1064,7 +1069,7 @@ class UtilsOrderService extends AppServiceBase {
});
return system.getResultFail(-200, "微信回调操作频繁---太频繁了，太频繁了");
}
parmas.appInfo = { appInfo: { uapp_id: opResult.data.uappId } };
parmas.appInfo = {appInfo: {uapp_id: opResult.data.uappId}};
parmas.orderNo = opResult.data.orderNo;
// 注意 微信支付要写wx 不要wxpay等其他。c_order_receiptvoucher收款单的accountType会对应wx:微信"alipay":"支付宝","other":"其它"等其他方式
parmas.pay_type = "wx";
......@@ -1132,7 +1137,7 @@ class UtilsOrderService extends AppServiceBase {
return system.getResult(null, 'payOrderNo can be not null')
}
let url = this.centerAppUrl + 'payment/paymentApi/getAppInfoByAppKey';
let appInfoRt = await this.restPostUrl({ appKey: params.appkey }, url);
let appInfoRt = await this.restPostUrl({appKey: params.appkey}, url);
if (appInfoRt.status != 0) {
appInfoRt.msg = appInfoRt.msg + "，100270";
return appInfoRt;
......@@ -1157,7 +1162,7 @@ class UtilsOrderService extends AppServiceBase {
// });
// return system.getResultFail(-200, "阿里回调操作频繁---太频繁了，太频繁了");
// }
params.appInfo = { uapp_id: appInfo.uapp_id };
params.appInfo = {uapp_id: appInfo.uapp_id};
params.pay_type = params.payType;
params.time_end = params.payTime;
//修改并返回订单支付状态，创建收款单
......@@ -1325,7 +1330,7 @@ class UtilsOrderService extends AppServiceBase {
return system.getResult(null, 'payOrderNo can be not null')
}
let url = this.centerAppUrl + 'payment/paymentApi/getAppInfoByAppKey';
let appInfoRt = await this.restPostUrl({ appKey: params.appkey }, url);
let appInfoRt = await this.restPostUrl({appKey: params.appkey}, url);
if (appInfoRt.status != 0) {
appInfoRt.msg = appInfoRt.msg + "，100270";
return appInfoRt;
......@@ -1336,7 +1341,7 @@ class UtilsOrderService extends AppServiceBase {
return system.getResultFail(-1, '验证签名失败')
}
var appInfo = appInfoRt.data;
params.appInfo = { uapp_id: appInfo.uapp_id };
params.appInfo = {uapp_id: appInfo.uapp_id};
params.pay_type = params.payType;
params.time_end = params.payTime;
// 修改并返回订单支付状 态，创建收款单
......@@ -1415,7 +1420,7 @@ class UtilsOrderService extends AppServiceBase {
var result = {
"errorCode": "error",
"errorMsg": "标源状态不符合",
"module": { "orderNumber": "" },
"module": {"orderNumber": ""},
"requestId": pobj.requestId,
"success": false
}
......@@ -1425,7 +1430,7 @@ class UtilsOrderService extends AppServiceBase {
var result = {
"errorCode": "error",
"errorMsg": "标源状态不符合",
"module": { "orderNumber": "" },
"module": {"orderNumber": ""},
"requestId": pobj.requestId,
"success": false
}
......@@ -1466,7 +1471,7 @@ class UtilsOrderService extends AppServiceBase {
var tmResult = {
"errorCode": "OK",
"errorMsg": "操作成功",
"module": { "orderNumber": result.data.orderNo },
"module": {"orderNumber": result.data.orderNo},
"requestId": pobj.requestId,
"success": true
}
......@@ -1477,7 +1482,7 @@ class UtilsOrderService extends AppServiceBase {
var result = {
"errorCode": "error",
"errorMsg": e,
"module": { "orderNumber": "" },
"module": {"orderNumber": ""},
"requestId": pobj.requestId,
"success": false
}
......@@ -1510,7 +1515,7 @@ class UtilsOrderService extends AppServiceBase {
var result = {
"ErrorCode": "error",
"ErrorMsg": e,
"Module": { "orderNumber": "" },
"Module": {"orderNumber": ""},
"RequestId": pobj.requestId,
"Success": false
}
......@@ -1663,10 +1668,10 @@ class UtilsOrderService extends AppServiceBase {
}
/**
* 接收阿里商标订单
* @param {*} pobj
* @param {*} actionBody
*/
* 接收阿里商标订单
* @param {*} pobj
* @param {*} actionBody
*/
async receiveAliTmOrder(pobj, actionBody) {
if (!actionBody.channelItemCode) {
return system.getResult(null, "产品编码有误，100010");
......@@ -1687,10 +1692,11 @@ class UtilsOrderService extends AppServiceBase {
var result = await this.restPostUrl(pobj, reqUrl);
return result;
}
/**
* 接收阿里订单退款信息git
* @param {*} pobj
* @param {*} actionBody
* @param {*} pobj
* @param {*} actionBody
*/
async receiveAliTmOrderRefund(pobj, actionBody) {
var reqUrl = this.centerOrderUrl + "action/order/springBoard";
......
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