|
|
@@ -30,9 +30,9 @@ class Api
|
|
|
$journal = Dever::load('act/order')->getJournal($id);
|
|
|
$buy = Dever::load('act/order')->getBuy($buy_id);
|
|
|
|
|
|
- $order_id = Dever::load('act/order')->createOrder('JP');
|
|
|
+ //$order_id = Dever::load('act/order')->createOrder('JP');
|
|
|
$order_data['cate_id'] = $journal['cate_id'];
|
|
|
- $order_data['order_id'] = $order_id;
|
|
|
+ //$order_data['order_id'] = $order_id;
|
|
|
$order_data['product_id'] = $journal['id'];
|
|
|
$order_data['buy_id'] = $buy['id'];
|
|
|
$order_data['uid'] = 1;
|
|
|
@@ -40,7 +40,7 @@ class Api
|
|
|
$order_data['status'] = 1;
|
|
|
|
|
|
$order_data['name'] = $journal['name'] . '-' . $buy['name'];
|
|
|
- $order_data['buy_num'] = 1000;
|
|
|
+ $order_data['buy_num'] = $buy['num'];
|
|
|
|
|
|
$order_data['cash'] = 100;
|
|
|
|
|
|
@@ -57,12 +57,12 @@ class Api
|
|
|
$order_data['seller_id'] = $seller;
|
|
|
}
|
|
|
|
|
|
- Dever::db('act/order')->insert($order_data);
|
|
|
+ $id = Dever::db('act/order_temp')->insert($order_data);
|
|
|
|
|
|
$send['pay_product_id'] = $order_data['product_id'];
|
|
|
$send['pay_uid'] = $order_data['uid'];
|
|
|
$send['pay_cash'] = $order_data['cash'];
|
|
|
- $send['pay_order_id'] = $order_data['order_id'];
|
|
|
+ $send['pay_order_id'] = Dever::load('act/order')->createOrderId($order_data, $id);
|
|
|
$send['pay_status'] = 2;
|
|
|
$send['pay_msg'] = '';
|
|
|
|
dever