|
@@ -1339,6 +1339,11 @@ class OrdersController extends Controller
|
|
$data = $request->except('_url');
|
|
$data = $request->except('_url');
|
|
unset($data['sign']);
|
|
unset($data['sign']);
|
|
|
|
|
|
|
|
+ //订单
|
|
|
|
+ $trade_no = $data['out_no'];
|
|
|
|
+ $order = OrderService::getByTradeNo($trade_no);
|
|
|
|
+ if (!$order) die('failed');
|
|
|
|
+
|
|
$pay_merchant = DB::table('pay_merchants')->select('appid', 'source', 'config_info')->where('id', $order->pay_merchant_id)->first();
|
|
$pay_merchant = DB::table('pay_merchants')->select('appid', 'source', 'config_info')->where('id', $order->pay_merchant_id)->first();
|
|
|
|
|
|
$pay_merchant_config = json_decode($pay_merchant->config_info, true);
|
|
$pay_merchant_config = json_decode($pay_merchant->config_info, true);
|
|
@@ -1347,11 +1352,6 @@ class OrdersController extends Controller
|
|
|
|
|
|
dd($sign);
|
|
dd($sign);
|
|
|
|
|
|
- //订单
|
|
|
|
- $trade_no = $data['out_no'];
|
|
|
|
- $order = OrderService::getByTradeNo($trade_no);
|
|
|
|
- if (!$order) die('failed');
|
|
|
|
-
|
|
|
|
// 防止重复推送
|
|
// 防止重复推送
|
|
if (isset($order->status) && $order->status == 'PAID') {
|
|
if (isset($order->status) && $order->status == 'PAID') {
|
|
Log::info('has_pay:' . $trade_no);
|
|
Log::info('has_pay:' . $trade_no);
|