Commit c93218df authored by 李尚科's avatar 李尚科

fix

parent c9aaa20f
Pipeline #13689 passed with stage
in 4 seconds
...@@ -4,6 +4,7 @@ const Controller = require('egg').Controller; ...@@ -4,6 +4,7 @@ const Controller = require('egg').Controller;
const xml2js = require('xml2js').parseString; const xml2js = require('xml2js').parseString;
class OrderController extends Controller { class OrderController extends Controller {
//订单支付详情页信息
async getOrderPayInfo() { async getOrderPayInfo() {
const { ctx } = this; const { ctx } = this;
...@@ -14,7 +15,7 @@ class OrderController extends Controller { ...@@ -14,7 +15,7 @@ class OrderController extends Controller {
} }
//我的历史首页 //我的历史订单
async getRecord() { async getRecord() {
const { ctx } = this; const { ctx } = this;
...@@ -25,7 +26,7 @@ class OrderController extends Controller { ...@@ -25,7 +26,7 @@ class OrderController extends Controller {
ctx.success({ results }); ctx.success({ results });
} }
//微信支付 //支付订单
async payOrder() { async payOrder() {
const { ctx } = this; const { ctx } = this;
...@@ -36,8 +37,8 @@ class OrderController extends Controller { ...@@ -36,8 +37,8 @@ class OrderController extends Controller {
ctx.success({ result }); ctx.success({ result });
} }
//微信支付通知 //微信支付异步通知
async payNotice() { async WexinpayNotice() {
const { ctx } = this; const { ctx } = this;
let data = ''; let data = '';
......
...@@ -7,7 +7,7 @@ module.exports = app => { ...@@ -7,7 +7,7 @@ module.exports = app => {
router.get('/history/:type', 'credit.order.getRecord'); router.get('/history/:type', 'credit.order.getRecord');
router.post('/order/pay', 'credit.order.payOrder'); router.post('/order/pay', 'credit.order.payOrder');
router.get('/order/pay/:order_id', 'credit.order.payOrder'); router.get('/order/pay/:order_id', 'credit.order.payOrder');
router.post('/order/pay_notice', 'credit.order.payNotice'); router.post('/order/wx_pay_notice', 'credit.order.WexinpayNotice');
router.get('/order/check_pay/:order_id', 'credit.order.checkPay'); router.get('/order/check_pay/:order_id', 'credit.order.checkPay');
router.get('/order/info/:order_id', 'credit.order.getOrderPayInfo'); router.get('/order/info/:order_id', 'credit.order.getOrderPayInfo');
......
...@@ -301,7 +301,7 @@ class OrderService extends Service { ...@@ -301,7 +301,7 @@ class OrderService extends Service {
if (price <= 0) { if (price <= 0) {
ctx.failed('error price'); ctx.failed('error price');
} }
if (type === 'wexin') { if (type === 'wxpay') {
let body = '黑名单报告检测支付'; let body = '黑名单报告检测支付';
if (order.type === 2) { if (order.type === 2) {
...@@ -312,7 +312,7 @@ class OrderService extends Service { ...@@ -312,7 +312,7 @@ class OrderService extends Service {
order_id, order_id,
trade_no: moment().valueOf() + ctx.helper.PrefixInteger(order_id, 11), trade_no: moment().valueOf() + ctx.helper.PrefixInteger(order_id, 11),
total_fee: price, total_fee: price,
notify_url: `${this.config.OUT_P_NODE_URL}/51business/api/credit/order/pay_notice`, notify_url: `${this.config.OUT_P_NODE_URL}/51business/api/credit/order/wx_pay_notice`,
product_id: order.order_no, product_id: order.order_no,
scene_info: JSON.stringify({ h5_info: { type: 'Wap', wap_url: this.config.PHP_URL, wap_name: '我的信用' }, }), scene_info: JSON.stringify({ h5_info: { type: 'Wap', wap_url: this.config.PHP_URL, wap_name: '我的信用' }, }),
}; };
...@@ -331,6 +331,7 @@ class OrderService extends Service { ...@@ -331,6 +331,7 @@ class OrderService extends Service {
await this.addCreditPay(pay_data); await this.addCreditPay(pay_data);
await this.updateOrderStateToCancel(order); await this.updateOrderStateToCancel(order);
await this.updateOrderPrice(order); await this.updateOrderPrice(order);
await ctx.prometheusModel.CreditOrder.update({ method: type, state: '支付中' }, { where: { id: order.id } });
return { url: ret.mweb_url, order_id: order_id, trade_no: data.trade_no }; return { url: ret.mweb_url, order_id: order_id, trade_no: data.trade_no };
} else if (type === 'alipay') { } else if (type === 'alipay') {
......
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