|
@@ -1047,6 +1047,8 @@ class WholeController extends Curd
|
|
|
if ($order->order_status_payment == 'SUCCESS' && $params['goods_classify'] == 'VIP') {
|
|
|
$order->order_is_complete = 'Y';
|
|
|
}
|
|
|
+ // 存储优惠信息
|
|
|
+
|
|
|
|
|
|
// 主订单
|
|
|
$order->save();
|
|
@@ -1203,6 +1205,10 @@ class WholeController extends Curd
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private function discountRecord(){
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 组合支付
|
|
|
*/
|
|
@@ -4077,7 +4083,7 @@ class WholeController extends Curd
|
|
|
$orderId = $request->post('order_id','');
|
|
|
$orderStatusPayment = $request->post('order_status_payment','');
|
|
|
$order = Order::where('order_id',$orderId)
|
|
|
- ->select('order_id','order_status_payment')
|
|
|
+ ->select('order_id','order_status_payment','order_config_json')
|
|
|
->first();
|
|
|
Db::beginTransaction();
|
|
|
try {
|