|
@@ -343,11 +343,11 @@ class OrdersController extends BaseController
|
|
* @apiSuccess {String} msg 信息
|
|
* @apiSuccess {String} msg 信息
|
|
* @apiSuccess {Object} data 信息
|
|
* @apiSuccess {Object} data 信息
|
|
* @apiSuccess {Object} data.appId 唤起支付的appId
|
|
* @apiSuccess {Object} data.appId 唤起支付的appId
|
|
- * @apiSuccess {Object} data.package 唤起支付的package
|
|
|
|
- * @apiSuccess {Object} data.nonceStr 唤起支付的nonceStr
|
|
|
|
- * @apiSuccess {Object} data.timeStamp 唤起支付的timeStamp
|
|
|
|
- * @apiSuccess {Object} data.signType 唤起支付的signType
|
|
|
|
- * @apiSuccess {Object} data.paySign 唤起支付sign
|
|
|
|
|
|
+ * @apiSuccess {Object} data.mch_id 唤起支付的mch_id
|
|
|
|
+ * @apiSuccess {Object} data.nonce_str 唤起支付的nonce_str
|
|
|
|
+ * @apiSuccess {Object} data.prepay_id 唤起支付的prepay_id
|
|
|
|
+ * @apiSuccess {Object} data.sign 唤起支付的sign
|
|
|
|
+ * @apiSuccess {Object} data.trade_type 唤起支付trade_type
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* @apiSuccessExample {json} Success-Response:
|
|
* HTTP/1.1 200 OK
|
|
* HTTP/1.1 200 OK
|
|
* {
|
|
* {
|
|
@@ -571,8 +571,6 @@ class OrdersController extends BaseController
|
|
$insert_data['send_order_id'] = $send_order_id;
|
|
$insert_data['send_order_id'] = $send_order_id;
|
|
$insert_data['charge_balance'] = 0;
|
|
$insert_data['charge_balance'] = 0;
|
|
$insert_data['reward_balance'] = 0;
|
|
$insert_data['reward_balance'] = 0;
|
|
- Log::info('start_save_book_order');
|
|
|
|
- Log::info($insert_data);
|
|
|
|
return BookOrderService::save_book_order($insert_data);
|
|
return BookOrderService::save_book_order($insert_data);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -586,12 +584,10 @@ class OrdersController extends BaseController
|
|
*/
|
|
*/
|
|
private function yearOrder($uid, $distribution_channel_id, $fee, $send_order_id)
|
|
private function yearOrder($uid, $distribution_channel_id, $fee, $send_order_id)
|
|
{
|
|
{
|
|
- Log::info('start_save_year_order');
|
|
|
|
$insert_data['uid'] = $uid;
|
|
$insert_data['uid'] = $uid;
|
|
$insert_data['distribution_channel_id'] = $distribution_channel_id;
|
|
$insert_data['distribution_channel_id'] = $distribution_channel_id;
|
|
$insert_data['fee'] = $fee;
|
|
$insert_data['fee'] = $fee;
|
|
$insert_data['send_order_id'] = $send_order_id;
|
|
$insert_data['send_order_id'] = $send_order_id;
|
|
- Log::info($insert_data);
|
|
|
|
return YearOrderService::save_year_order($insert_data);
|
|
return YearOrderService::save_year_order($insert_data);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -604,7 +600,6 @@ class OrdersController extends BaseController
|
|
{
|
|
{
|
|
$total = $product->price * 100 + $product->given;
|
|
$total = $product->price * 100 + $product->given;
|
|
UserService::addBalance($uid, $total, $product->price * 100, $product->given);
|
|
UserService::addBalance($uid, $total, $product->price * 100, $product->given);
|
|
- Log::info('update_user_balance_end:' . $uid . ' balance_add:' . $total);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|