Skip to content

Z
zhichan
Commit 90a31188 by wkliang
Options

Merge branch 'center-channel' of http://gitlab.gongsibao.com/jiangyong/zhichan into center-channel

parents fc212867 9aa53296
Showing with 351 additions and 71 deletions
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
......@@ -2,6 +2,8 @@ const system = require("../../../system");
var settings = require("../../../../config/settings");
const querystring = require('querystring');
const AppServiceBase = require("../../app.base");
const axios = require('axios')
const md5 = require('md5')
class UtilsOrderService extends AppServiceBase {
constructor() {
super();
......@@ -477,6 +479,7 @@ class UtilsOrderService extends AppServiceBase {
if (parmas.trade_status != "TRADE_FINISHED" && parmas.trade_status != "TRADE_SUCCESS") {
return system.getResult(null, "trade_status状态有误，100473");
}
// 2020 0621验签操作
var url = this.centerAppUrl + "payment/aliPayment/verifyAliPayReturnSign";
var opResult = await this.restPostUrl(parmas, url);
if (opResult.status != 0) {
......@@ -561,11 +564,189 @@ class UtilsOrderService extends AppServiceBase {
}
async aliPayNotify(pobj) { // 微信支付回调
return {
code:0,
msg:"success"
}
async aliPayNotify(parmas, client_ip) { // 支付宝回调
try {
//日志记录
this.logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "支付宝回调参数信息",
op: "service/impl/utilsSve/utilsOrderSve.js/aliPayNotify",
content: JSON.stringify(parmas),
clientIp: client_ip || ""
});
if (!parmas.trade_status) {
return system.getResult(null, "trade_status参数不能为空，100470");
}
if (parmas.trade_status != "TRADE_FINISHED" && parmas.trade_status != "TRADE_SUCCESS") {
return system.getResult(null, "trade_status状态有误，100473");
}
// 2020 0621 支付宝验签接口
// var url = "https://yf-api.gongsibao.com/pay/v1/checkAliPaySign";
// let params = {
// "app": "ukgc", //应用名称 固定
// "key": "a1519e2eab53dfb909e4c32a86b2ea2b", //应用 key 固定
// "tData" : params
// }
// var sign = JSON.stringify(params);
// sign += "ab53dfb909e4c32a"
// sign = md5(sign).toUpperCase()
// params.sign = sign
// let res = await axios.post(url, params)
// if (res.status != 0) {
// res.msg = res.msg + "，100480";
// return res;
// }
// 模拟验签结果
var outTradeInfo = parmas.out_trade_no.split('-');
//
var opResult = {}
opResult.data = {
orderNo: outTradeInfo[0],
uappId: Number(outTradeInfo[1]),
productId: outTradeInfo.length == 3 ? Number(outTradeInfo[2]) : 0
}
// 拿锁
var locker = await this.cacheManager["TlPayLocker"].enter(opResult.data.orderNo);
if (!locker || locker != "1") {
this.logCtl.info({
appid: opResult.data.uappId,
appkey: "",
op: "service/impl/utilsSve/utilsOrderSve.js/aliPayNotify",
content: "参数=" + JSON.stringify(parmas),
clientIp: parmas.client_ip || "",
optitle: "阿里回调操作频繁---太频繁了，太频繁了"
});
return system.getResultFail(-200, "阿里回调操作频繁---太频繁了，太频繁了");
}
parmas.appInfo = { appInfo: { uapp_id: opResult.data.uappId } };
parmas.orderNo = opResult.data.orderNo;
parmas.pay_type = "alipay";
//修改并返回订单支付状态，创建收款单
// 这里修改了order_info的状态（status/paytime等）
var url = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotifyByAliDing";
var opOrderResult = await this.restPostUrl(parmas, url);
if (opOrderResult.status != 0) {
opOrderResult.data = null;
return opOrderResult;
}
opOrderResult.data.appInfo = {
uapp_id: opResult.data.uappId
};
opOrderResult.data.userInfo = {
channel_userid: opOrderResult.data.order_info.channelUserId,
channel_username: opOrderResult.data.order_info.channelUserId,
channel_nickname: opOrderResult.data.order_info.channelUserId
};
opOrderResult.data.orderNo = opResult.data.orderNo;
var pobj = {
appInfo: opOrderResult.data.appInfo,
actionBody: opOrderResult.data
}
this.utilsPushSve.pushBusInfo(pobj, "createAliTmApply", 1);
opOrderResult.data = null;
return opOrderResult;
} catch (e) {
await this.cacheManager["TlPayLocker"].release(parmas.out_trade_no);
this.logCtl.error({
optitle: "回调处理订单---error异常",
op: "center-app/app/base/service/impl/utilsSve/utilstlbankSve.js/opBackNotify",
content: "参数=" + JSON.stringify(parmas) + "，error：" + e.stack,
clientIp: client_ip || ""
});
return system.getResultFail(-200, e.stack);
}
}
async wxPayNotify(parmas, client_ip) { // 微信宝回调
try {
//日志记录
this.logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "微信回调参数信息",
op: "service/impl/utilsSve/utilsOrderSve.js/wxPayNotify",
content: JSON.stringify(parmas),
clientIp: client_ip || ""
});
if (!parmas.trade_status) {
return system.getResult(null, "trade_status参数不能为空，100470");
}
if (parmas.trade_status != "TRADE_FINISHED" && parmas.trade_status != "TRADE_SUCCESS") {
return system.getResult(null, "trade_status状态有误，100473");
}
// 2020 0621 支付宝验签接口
// var url = "https://yf-api.gongsibao.com/pay/v1/checkAliPaySign";
// let params = {
// "app": "ukgc", //应用名称 固定
// "key": "a1519e2eab53dfb909e4c32a86b2ea2b", //应用 key 固定
// "tData" : params
// }
// var sign = JSON.stringify(params);
// sign += "ab53dfb909e4c32a"
// sign = md5(sign).toUpperCase()
// params.sign = sign
// let res = await axios.post(url, params)
// if (res.status != 0) {
// res.msg = res.msg + "，100480";
// return res;
// }
// 模拟验签结果
var outTradeInfo = parmas.out_trade_no.split('-');
//
var opResult = {}
opResult.data = {
orderNo: outTradeInfo[0],
uappId: Number(outTradeInfo[1]),
productId: outTradeInfo.length == 3 ? Number(outTradeInfo[2]) : 0
}
// 拿锁
var locker = await this.cacheManager["TlPayLocker"].enter(opResult.data.orderNo);
if (!locker || locker != "1") {
this.logCtl.info({
appid: opResult.data.uappId,
appkey: "",
op: "service/impl/utilsSve/utilsOrderSve.js/wxPayNotify",
content: "参数=" + JSON.stringify(parmas),
clientIp: parmas.client_ip || "",
optitle: "微信回调操作频繁---太频繁了，太频繁了"
});
return system.getResultFail(-200, "微信回调操作频繁---太频繁了，太频繁了");
}
parmas.appInfo = { appInfo: { uapp_id: opResult.data.uappId } };
parmas.orderNo = opResult.data.orderNo;
parmas.pay_type = "alipay";
//修改并返回订单支付状态，创建收款单
// 这里修改了order_info的状态（status/paytime等）
var url = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotifyByAliDing";
var opOrderResult = await this.restPostUrl(parmas, url);
if (opOrderResult.status != 0) {
opOrderResult.data = null;
return opOrderResult;
}
opOrderResult.data.appInfo = {
uapp_id: opResult.data.uappId
};
opOrderResult.data.userInfo = {
channel_userid: opOrderResult.data.order_info.channelUserId,
channel_username: opOrderResult.data.order_info.channelUserId,
channel_nickname: opOrderResult.data.order_info.channelUserId
};
opOrderResult.data.orderNo = opResult.data.orderNo;
var pobj = {
appInfo: opOrderResult.data.appInfo,
actionBody: opOrderResult.data
}
this.utilsPushSve.pushBusInfo(pobj, "createAliTmApply", 1);
opOrderResult.data = null;
return opOrderResult;
} catch (e) {
await this.cacheManager["TlPayLocker"].release(parmas.out_trade_no);
this.logCtl.error({
optitle: "回调处理订单---error异常",
op: "center-app/app/base/service/impl/utilsSve/utilstlbankSve.js/opBackNotify",
content: "参数=" + JSON.stringify(parmas) + "，error：" + e.stack,
clientIp: client_ip || ""
});
return system.getResultFail(-200, e.stack);
}
}
}
module.exports = UtilsOrderService;
center-channel/app/base/service/impl/utilsSve/utilsUcommuneSve.js
......@@ -51,6 +51,7 @@ class UtilsUcommuneService extends AppServiceBase {
* @param {*} actionBody
*/
async ucommuneGetOrderList(pobj, actionBody) {
// ucommuneGetOrderList
var reqUrl = this.centerOrderUrl + "action/ucommuneOrder/springBoard";
var result = await this.restPostUrl(pobj, reqUrl);
console.log("-------------ucommuneGetOrderList result start---------------")
......@@ -78,38 +79,61 @@ class UtilsUcommuneService extends AppServiceBase {
*/
async orderConfirm(pobj, actionBody) {
await this.orderConfirmValidate(pobj, actionBody);
pobj.actionType = "getOrderDetails" // 获取订单详细信息 用来拼接字符串 totalsum为总金额，返回给前端
var reqUrl = this.centerOrderUrl + "action/order/springBoard";
pobj.actionType = "getPayOrderInfo" // 获取订单详细信息 用来拼接字符串 totalsum为总金额，返回给前端
var reqUrl = settings.centerOrderUrl() + "action/order/springBoard";
var orderResult = await this.restPostUrl(pobj, reqUrl);
if(orderResult.status != 0) {
return system.getResult(null, "Failed to get orderResult 100470");
} else {
if(actionBody.payWay == 1) { // 支付宝
let sign = await PayUtil.getSign(null,"1")
let creatPayRequrl = "https://yf-api.gongsibao.com/pay/v1/aliPay/getPrePayIdAliPay";
let params = {
"partner" : "2019022163300183" ,
"seller_id" : "353494220@qq.com" ,
"out_trade_no" : orderResult.data.channelOrderNo ,
"subject" : orderResult.data.channelItemName ,
"body" : orderResult.data.channelItemName ,
"total_fee" : orderResult.data.payTotalSum ,
"service" : "alipay.trade.app.pay" ,
"payment_type" : "1" ,
"_input_charset" : "utf-8" ,
"it_b_pay" : "10m" ,
"notify_url" : this.centerChannelUrl + "orderNotify/aliPayNotify" ,
"enable_paymethod" : "balance,moneyFund,coupon,pcredit,pcreditpayInstallment,creditCard,creditCardExpress,creditCardCartoon,credit_group,debitCardExpress,mcard,pcard,promotion" ,
"sign" : sign ,
"sign_type" : "RSA2",
"app": "ukgc",//固定
'body': orderResult.data.orderProduct.channelItemName,
"key": "a1519e2eab53dfb909e4c32a86b2ea2b",//固定
"notifyUrl" : this.centerChannelUrl + "orderNotify/aliPayNotify",
"outTradeNo": orderResult.data.receiptVoucher.sourceOrderNo + "-" + pobj.appInfo.uapp_id.toString() + "-" + orderResult.data.orderProduct.id.toString(),
"productCode" : orderResult.data.orderProduct.channelItemCode,
"subject" : orderResult.data.orderProduct.channelItemName ,
"timeoutExpress" : '10m' ,
"totalAmount" : orderResult.data.receiptVoucher.totalSum,
}
let str = "";
for(var k in params) {
console.log(k)
str += k + "=\"" + params[k] + "\"&";
var sign = JSON.stringify(params);
sign += "ab53dfb909e4c32a"
sign = md5(sign).toUpperCase()
params.sign = sign
let res = await axios.post(creatPayRequrl, params)
if(res.status == 200 && res.data.code == 200) {
await this.cacheManager["TlPayLocker"].init(orderResult.data.receiptVoucher.sourceOrderNo);
return system.getResultSuccess(res.data)
}
str = str.substr(0,str.length-1)
console.log(str)
return system.getResultSuccess(str);
return system.getResult(null, res.data);
// let sign = await PayUtil.getSign(null,"1")
// let params = {
// "partner" : "2019022163300183" ,
// "seller_id" : "353494220@qq.com" ,
// // "out_trade_no" : orderResult.data.channelOrderNo ,
// "out_trade_no": orderResult.data.receiptVoucher.sourceOrderNo + "-" + pobj.appInfo.uapp_id.toString() + "-" + orderResult.data.orderProduct.id.toString(),
// "subject" : orderResult.data.orderProduct.channelItemName ,
// "body" : orderResult.data.orderProduct.channelItemName ,
// "total_fee" : Number(orderResult.data.receiptVoucher.totalSum) ,
// "service" : "alipay.trade.app.pay" ,
// "payment_type" : "1" ,
// "_input_charset" : "utf-8" ,
// "it_b_pay" : "10m" ,
// "notify_url" : this.centerChannelUrl + "orderNotify/aliPayNotify" ,
// "enable_paymethod" : "balance,moneyFund,coupon,pcredit,pcreditpayInstallment,creditCard,creditCardExpress,creditCardCartoon,credit_group,debitCardExpress,mcard,pcard,promotion" ,
// "sign" : sign ,
// "sign_type" : "RSA2",
// }
// let str = "";
// for(var k in params) {
// console.log(k)
// str += k + "=\"" + params[k] + "\"&";
// }
// str = str.substr(0,str.length-1)
// console.log(str)
// return system.getResultSuccess(str);
// let alipayAgentInformation = await this.redisClient.get("alipayAgentInformation")
// if(!alipayAgentInformation) {
// console.log("11111")
......@@ -172,32 +196,74 @@ class UtilsUcommuneService extends AppServiceBase {
// console.log(alipayResponse);
}
if(actionBody.payWay == 3) { // 微信
let sign = await PayUtil.getSign(null,"3")
let creatPayRequrl = "https://yf-api.gongsibao.com/pay/v1/createSign";
let params = {
"partner" : "2019022163300183" ,
"seller_id" : "353494220@qq.com" ,
"out_trade_no" : orderResult.data.channelOrderNo ,
"subject" : orderResult.data.channelItemName ,
"body" : orderResult.data.channelItemName ,
"total_fee" : orderResult.data.payTotalSum ,
"service" : "alipay.trade.app.pay" ,
"payment_type" : "1" ,
"_input_charset" : "utf-8" ,
"it_b_pay" : "10m" ,
"notify_url" : this.centerChannelUrl + "orderNotify/aliPayNotify" ,
"enable_paymethod" : "balance,moneyFund,coupon,pcredit,pcreditpayInstallment,creditCard,creditCardExpress,creditCardCartoon,credit_group,debitCardExpress,mcard,pcard,promotion" ,
"sign" : sign ,
"sign_type" : "RSA2",
"app": "ukgc",
"key": "a1519e2eab53dfb909e4c32a86b2ea2b",
"payParam": [
{
"name":"body",
"value":orderResult.data.orderProduct.channelItemName
},
{
"name":"outTradeNo",
"value":orderResult.data.receiptVoucher.sourceOrderNo + "-" + pobj.appInfo.uapp_id.toString() + "-" + orderResult.data.orderProduct.id.toString()
},
{
"name":"totalFee",
"value":orderResult.data.receiptVoucher.totalSum
},
{
"name":"spbillCreateIp",
"value":'192.168.2.210'
},
{
"name":"notifyUrl",
"value":this.centerChannelUrl + "orderNotify/wxPayNotify"
},
{
"name":"tradeType",
"value":"JSAPI"
},
{
"name": "nonceStr",
"value": "5K8264ILTKCH16CQ2502SI8ZNMTM67VS"
}
],
"paymentType": "3"
}
let str = "";
for(var k in params) {
console.log(k)
str += k + "=\"" + params[k] + "\"&";
// let params = {
// "app": "ukgc",//固定
// 'body': orderResult.data.orderProduct.channelItemName,
// "key": "a1519e2eab53dfb909e4c32a86b2ea2b",//固定
// "notifyUrl" : this.centerChannelUrl + "orderNotify/aliPayNotify",
// "outTradeNo": orderResult.data.receiptVoucher.sourceOrderNo + "-" + pobj.appInfo.uapp_id.toString() + "-" + orderResult.data.orderProduct.id.toString(),
// "totalFee" : orderResult.data.receiptVoucher.totalSum,
// "spbillCreateIp":'192.168.2.210',
// "tradeType":"JSAPI"
// }
var sign = JSON.stringify(params);
sign += "ab53dfb909e4c32a"
sign = md5(sign).toUpperCase()
params.sign = sign
let res = await axios.post(creatPayRequrl, params)
if(res.status == 200 && res.data.code == 200) {
await this.cacheManager["TlPayLocker"].init(orderResult.data.receiptVoucher.sourceOrderNo);
return system.getResultSuccess(res.data)
}
str = str.substr(0,str.length-1)
console.log(str)
return system.getResultSuccess(str);
return system.getResult(null, res.data);
// let sign = await PayUtil.getSign('wx6f3ebe44defe336a',"3")
// let wxpayJson = {
// "appid": "wx05b764a334ca0472",
// "noncestr": "fdbe012e2e11314b96402b32c0df26b7",
// "package": "Sign=WXPay",
// "partnerid": "1525494731",
// "prepayid": "wx221007210600552805dae6511340418300",
// "sign": "7BACA717B040DEEA7A8940CEC94A3318",
// "timestamp": "1592791641"
// }
// let wxAgentInformation = await this.redisClient.get("wxAgentInformation")
// if(!wxAgentInformation) {
// console.log("11111")
......
center-channel/app/config/routes/api.js
......@@ -4,6 +4,10 @@ const utilsAuthSve = system.getObject("service.utilsSve.utilsAuthSve");
const logCtl = system.getObject("service.common.oplogSve");
const utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
const utilsFeishuSve = system.getObject("service.utilsSve.utilsFeishuSve");
var axios = require('axios');
var md5 = require('md5');
var xml2js = require('xml2js');
module.exports = function (app) {
//-----------------------新的模式---------web---------开始
......@@ -419,15 +423,50 @@ module.exports = function (app) {
// 支付回调通知
app.post('/orderNotify/aliPayNotify', async function (req, res) {
var client_ip = system.get_client_ip(req);
var result = await utilsOrderSve.aliPayNotify(req.body);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "aliPayNotify记录回调处理结果,method=notify",
op: "app/config/routes/api.js/orderNotify/aliPayNotify",
content: "回调参数：" + JSON.stringify(req.body) + "回调结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
var returnObj = JSON.stringify(result);
return res.end(returnObj);
try{
var client_ip = system.get_client_ip(req);
var result = await utilsOrderSve.aliPayNotify(req.body, client_ip);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录支付宝回调处理结果",
op: "center-channel/orderNotify/aliPayNotify",
content: "支付回调处理结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
if (result.status != 0) {
return res.end("FAIL");
}
return res.end("success");
} catch {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "支付宝回调处理异常",
op: "center-channel/orderNotify/aliPayNotify",
content: "回调参数：req=" + JSON.stringify(req) + "error：" + error.stack,
clientIp: client_ip || ""
});
}
});
// wx支付回调
app.post('/orderNotify/wxPayNotify', async function (req, res) {
try{
var client_ip = system.get_client_ip(req);
var result = await utilsOrderSve.wxPayNotify(req.body);
logCtl.info({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "记录微信支付回调处理结果",
op: "center-channel/orderNotify/wxPayNotify",
content: "支付回调处理结果：" + JSON.stringify(result),
clientIp: client_ip || ""
});
if (result.status != 0) {
return res.end("FAIL");
}
return res.end("success");
} catch {
logCtl.error({
optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "微信回调处理异常",
op: "center-channel/orderNotify/wxPayNotify",
content: "回调参数：req=" + JSON.stringify(req) + "error：" + error.stack,
clientIp: client_ip || ""
});
}
});
};
};
\ No newline at end of file
center-channel/package-lock.json
......@@ -7925,14 +7925,6 @@
"resolved": "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz",
"integrity": "sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="
},
"var": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/var/-/var-0.4.0.tgz",
"integrity": "sha512-olxlLAssnt9UPL5UAErYTaCJhpwaDfkuSxOEB5eUclEJbl4xi7EhOIaOh6Y8KTQHIKUnyd2DygRLSnTaXtXuGg==",
"requires": {
"lodash": "^4.17.4"
}
},
"vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
......
center-channel/package.json
......@@ -55,7 +55,8 @@
"socket.io": "^2.1.1",
"tenpay": "^2.1.18",
"uuid": "^3.2.1",
"wx-pay": "^1.0.2"
"wx-pay": "^1.0.2",
"xml2js": "^0.4.23"
},
"devDependencies": {
"element-theme": "^2.0.1",
......
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