Commit ff9e6d3f by linboxuan

log

parent c27bcea7
...@@ -27,8 +27,10 @@ class ProductAPI extends WEBBase { ...@@ -27,8 +27,10 @@ class ProductAPI extends WEBBase {
break; break;
case "orderTotalSum":// addOrder后进入支付页面获取支付金额 case "orderTotalSum":// addOrder后进入支付页面获取支付金额
opResult = await this.utilsUcommuneSve.orderTotalSum(pobj, pobj.actionBody); opResult = await this.utilsUcommuneSve.orderTotalSum(pobj, pobj.actionBody);
break;
case "orderConfirm":// 点击确认支付后返回拼接字符串 case "orderConfirm":// 点击确认支付后返回拼接字符串
opResult = await this.utilsUcommuneSve.orderConfirm(pobj, pobj.actionBody); opResult = await this.utilsUcommuneSve.orderConfirm(pobj, pobj.actionBody);
break;
case "ucommuneGetOrderList":// 优客调取订单列表用 case "ucommuneGetOrderList":// 优客调取订单列表用
opResult = await this.utilsUcommuneSve.ucommuneGetOrderList(pobj, pobj.actionBody); opResult = await this.utilsUcommuneSve.ucommuneGetOrderList(pobj, pobj.actionBody);
break; break;
......
var system = require("../../../system"); var system = require("../../../system");
var settings = require("../../../../config/settings"); var settings = require("../../../../config/settings");
const AppServiceBase = require("../../app.base"); const AppServiceBase = require("../../app.base");
const axios = require('axios')
const md5 = require('md5')
//产品操作类 //产品操作类
class UtilsUcommuneService extends AppServiceBase { class UtilsUcommuneService extends AppServiceBase {
constructor() { constructor() {
...@@ -49,11 +51,14 @@ class UtilsUcommuneService extends AppServiceBase { ...@@ -49,11 +51,14 @@ class UtilsUcommuneService extends AppServiceBase {
async ucommuneGetOrderList(pobj, actionBody) { async ucommuneGetOrderList(pobj, actionBody) {
var reqUrl = this.centerOrderUrl + "action/ucommuneOrder/springBoard"; var reqUrl = this.centerOrderUrl + "action/ucommuneOrder/springBoard";
var result = await this.restPostUrl(pobj, reqUrl); var result = await this.restPostUrl(pobj, reqUrl);
console.log("-------------ucommuneGetOrderList result start---------------")
console.log(result)
console.log("-------------ucommuneGetOrderList result end---------------")
return result; return result;
} }
/** /**
* addOrder后进入支付页面获取支付金额 * addOrder后进入支付页面获取支付金额 addorder返回totalsum 此接口可以不调用
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody orderNo orderIndo订单号 * @param {*} actionBody orderNo orderIndo订单号
*/ */
...@@ -76,20 +81,96 @@ class UtilsUcommuneService extends AppServiceBase { ...@@ -76,20 +81,96 @@ class UtilsUcommuneService extends AppServiceBase {
var orderResult = await this.restPostUrl(pobj, reqUrl); var orderResult = await this.restPostUrl(pobj, reqUrl);
console.log(orderResult) console.log(orderResult)
if(actionBody.payWay == 1) { // 支付宝 if(actionBody.payWay == 1) { // 支付宝
const params = { var reqUrl = "https://yf-api.gongsibao.com/pay/v1/createSign";
bizContent: { var obj = {
out_trade_no: '12312312321212', // 商户网站唯一订单号 "app": "ukgc", //应用名称 固定
subject: encodeURIComponent('苹果电脑'),//商品的标题/交易标题/订单标题/订单关键字等 "key": "a1519e2eab53dfb909e4c32a86b2ea2b", //应用 key 固定
total_amount: 0.2,//实际付款金额 "payParam": [ //微信或者支付宝的拼接参数
body: encodeURIComponent('Mac Pro1'),//对一笔交易的具体描述信息。如果是多种商品,请将商品描述字符串累加传给body {
product_code: 'QUICK_MSECURITY_PAY', "name": "app_id",
notifyUrl:this.centerChannelUrl + "orderNotify/aliPayNotify" "value": "2019022163300183"
} },
} {
let alipayResponse = await this.alipay.exec('alipay.trade.app.pay', params); "name": "charset",
console.log(alipayResponse); "value": "UTF-8"
},
{
"name": "method",
"value": "alipay.trade.app.pay"
},
{
"name": "sign_type",
"value": "RSA2"
},
{
"name": "timestamp",
"value": "2014-07-24 03:07:50"
},
{
"name": "version",
"value": "1.0"
}
],
"paymentType": "1", //支付方式 1 支付宝 3 微信
}
var newobj = JSON.stringify(obj).replace(/\s*/g,"");
newobj += "ab53dfb909e4c32a"
newobj = md5(newobj).toUpperCase()
obj.sign = newobj
let res = await axios.post(reqUrl, obj)
console.log(res);
// const params = {
// bizContent: {
// out_trade_no: '12312312321212', // 商户网站唯一订单号
// subject: encodeURIComponent('苹果电脑'),//商品的标题/交易标题/订单标题/订单关键字等
// total_amount: 0.2,//实际付款金额
// body: encodeURIComponent('Mac Pro1'),//对一笔交易的具体描述信息。如果是多种商品,请将商品描述字符串累加传给body
// product_code: 'QUICK_MSECURITY_PAY',
// notifyUrl:this.centerChannelUrl + "orderNotify/aliPayNotify"
// }
// }
// let alipayResponse = await this.alipay.exec('alipay.trade.app.pay', params);
// console.log(alipayResponse);
} }
if(actionBody.payWay == 3) { // 微信 if(actionBody.payWay == 3) { // 微信
var reqUrl = "https://yf-api.gongsibao.com/pay/v1/createSign";
var obj = {
"app": "ukgc", //应用名称 固定
"key": "a1519e2eab53dfb909e4c32a86b2ea2b", //应用 key 固定
"payParam": [ //微信或者支付宝的拼接参数
{
"name": "app_id",
"value": "2019022163300183"
},
{
"name": "charset",
"value": "UTF-8"
},
{
"name": "method",
"value": "alipay.trade.app.pay"
},
{
"name": "sign_type",
"value": "RSA2"
},
{
"name": "timestamp",
"value": "2014-07-24 03:07:50"
},
{
"name": "version",
"value": "1.0"
}
],
"paymentType": "3", //支付方式 1 支付宝 3 微信
}
var newobj = String(obj).replace(/\s*/g,"");
newobj += "secret(ab53dfb909e4c32a)"
newobj = md5(newobj).toUpperCase()
obj.sign = newobj
let res = await axios.post(reqUrl,obj)
console.log(res);
console.log(this.WXpay) console.log(this.WXpay)
var wxpay = this.WXpay; var wxpay = this.WXpay;
var out_trade_no='20160203'+Math.random().toString().substr(2, 10); var out_trade_no='20160203'+Math.random().toString().substr(2, 10);
...@@ -101,9 +182,9 @@ class UtilsUcommuneService extends AppServiceBase { ...@@ -101,9 +182,9 @@ class UtilsUcommuneService extends AppServiceBase {
notify_url: 'http://www.gongsibao.com', notify_url: 'http://www.gongsibao.com',
trade_type: 'NATIVE', trade_type: 'NATIVE',
product_id: '1234567890' product_id: '1234567890'
}, function(err, result){ },function(err, res) {
console.log(result); console.log(res);
return result return system.getResult(res)
}) })
} }
} }
......
var path = require('path'); var path = require('path');
var AlipaySdk = require('alipay-sdk').default; var AlipaySdk = require('alipay-sdk').default;
var WXPay = require('wx-pay'); var WXPay = require('wx-pay');
const tenpay = require('tenpay');
var ENVINPUT = { var ENVINPUT = {
DB_HOST: process.env.DB_HOST, DB_HOST: process.env.DB_HOST,
DB_PORT: process.env.DB_PORT, DB_PORT: process.env.DB_PORT,
...@@ -219,6 +220,12 @@ var settings = { ...@@ -219,6 +220,12 @@ var settings = {
//pfx: fs.readFileSync('./wxpay_cert.p12'), //微信商户平台证书 //pfx: fs.readFileSync('./wxpay_cert.p12'), //微信商户平台证书
//pfx: "sinotone2014sinotone2014sinotone" //pfx: "sinotone2014sinotone2014sinotone"
}) })
// const config = {
// appid: 'wx6f3ebe44defe336a',
// mchid: '1232813602',
// partnerKey: 'sinotone2014sinotone2014sinotone',
// };
// return new tenpay(config);
} }
}; };
module.exports = settings; module.exports = settings;
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"ali-oss": "^4.12.2", "ali-oss": "^4.12.2",
"alipay-sdk": "^3.1.1", "alipay-sdk": "^3.1.1",
"aliyun-api-gateway": "^1.1.6", "aliyun-api-gateway": "^1.1.6",
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"base64id": "^1.0.0", "base64id": "^1.0.0",
"bluebird": "^3.5.1", "bluebird": "^3.5.1",
...@@ -52,6 +53,7 @@ ...@@ -52,6 +53,7 @@
"serve-favicon": "^2.4.5", "serve-favicon": "^2.4.5",
"sha1": "^1.1.1", "sha1": "^1.1.1",
"socket.io": "^2.1.1", "socket.io": "^2.1.1",
"tenpay": "^2.1.18",
"uuid": "^3.2.1", "uuid": "^3.2.1",
"wx-pay": "^1.0.2" "wx-pay": "^1.0.2"
}, },
......
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