|
@@ -8,6 +8,7 @@
|
|
|
|
|
|
namespace App\Http\Controllers\Wap\Pay;
|
|
namespace App\Http\Controllers\Wap\Pay;
|
|
|
|
|
|
|
|
+use App\Modules\SendOrder\Services\SendOrderService;
|
|
use App\Modules\Subscribe\Models\Order;
|
|
use App\Modules\Subscribe\Models\Order;
|
|
use App\Modules\Subscribe\Services\OrderService;
|
|
use App\Modules\Subscribe\Services\OrderService;
|
|
use App\Modules\Subscribe\Services\YearOrderService;
|
|
use App\Modules\Subscribe\Services\YearOrderService;
|
|
@@ -134,6 +135,13 @@ class MonthOrderController extends Controller
|
|
$send_order_id = (int)Redis::hget('book_read:' . $uid, 'send_order_id');
|
|
$send_order_id = (int)Redis::hget('book_read:' . $uid, 'send_order_id');
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
}
|
|
}
|
|
|
|
+ $send_order_name = '';
|
|
|
|
+ if ($send_order_id) {
|
|
|
|
+ $send_order_info = SendOrderService::getById($send_order_id);
|
|
|
|
+ if ($send_order_info && isset($send_order_info->name) && !empty($send_order_info->name)) {
|
|
|
|
+ $send_order_name = $send_order_info->name;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
$init_order = [
|
|
$init_order = [
|
|
'distribution_channel_id' => $distribution_channel_id,
|
|
'distribution_channel_id' => $distribution_channel_id,
|
|
'uid' => $uid,
|
|
'uid' => $uid,
|
|
@@ -145,7 +153,7 @@ class MonthOrderController extends Controller
|
|
'pay_merchant_id' => 99,
|
|
'pay_merchant_id' => 99,
|
|
'create_ip' => '',
|
|
'create_ip' => '',
|
|
'send_order_id' => $send_order_id,
|
|
'send_order_id' => $send_order_id,
|
|
- 'send_order_name' => '',
|
|
|
|
|
|
+ 'send_order_name' => $send_order_name,
|
|
'order_type' => 'RECHARGE',
|
|
'order_type' => 'RECHARGE',
|
|
'from_bid' => '0',
|
|
'from_bid' => '0',
|
|
'from_type' => 'auto_month',
|
|
'from_type' => 'auto_month',
|