|
|
|
@ -254,7 +254,7 @@ class OrderController extends Controller |
|
|
|
} else { |
|
|
|
return $this->error($config['err_code_des'] ?? join(',', $config)); |
|
|
|
}*/ |
|
|
|
// TODO 跳转支付专用
|
|
|
|
// 跳转支付专用
|
|
|
|
return $this->success(['id' => $order->id, 'jump' => true, 'jump_appid' => AdminSetting::val('payee_appid')]); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -279,7 +279,6 @@ class OrderController extends Controller |
|
|
|
$v = str_replace($prefix, '', $v); |
|
|
|
} |
|
|
|
|
|
|
|
//TODO 需要后台处理,然后向微信发起退款申请
|
|
|
|
$order = Order::firstWhere(['id' => $formData['id'], 'user_id' => $this->user_id]); |
|
|
|
if (!$order) { |
|
|
|
return $this->error('订单不存在'); |
|
|
|
@ -356,7 +355,7 @@ class OrderController extends Controller |
|
|
|
return $this->error('订单已支付或已超时'); |
|
|
|
} |
|
|
|
|
|
|
|
// TODO 跳转支付专用
|
|
|
|
// 跳转支付专用
|
|
|
|
return $this->success(['id' => $id, 'jump' => true, 'jump_appid' => AdminSetting::val('payee_appid')]); |
|
|
|
|
|
|
|
/*$ap = AgentProduct::with('coupon')->find($order->agent_product_id); |
|
|
|
@ -492,7 +491,7 @@ class OrderController extends Controller |
|
|
|
|
|
|
|
$coupon = $coupon->toArray(); |
|
|
|
foreach ($coupon as $v) { |
|
|
|
// TODO 未判断优惠券有效期
|
|
|
|
// 未判断优惠券有效期
|
|
|
|
if ($v['type'] == 1 && !empty($v['detail']['full']) && !empty($v['detail']['reduction'])) { //满减
|
|
|
|
if ($total_price >= $v['detail']['full']) { |
|
|
|
$total_price -= $v['detail']['reduction']; |
|
|
|
|