|
|
@@ -237,12 +237,12 @@ class WholeController extends Curd
|
|
|
->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
|
|
|
->get()
|
|
|
->toArray();
|
|
|
- if (count($payDetails) > 1){
|
|
|
+ if (count($payDetails) > 1) {
|
|
|
$item['payWay'] = "CONSTITUTE";
|
|
|
- }elseif (count($payDetails) == 1){
|
|
|
+ } elseif (count($payDetails) == 1) {
|
|
|
$payDetail0 = $payDetails[0];
|
|
|
- $item['payWay'] =$payDetail0['pay_prepayid'];
|
|
|
- }else{
|
|
|
+ $item['payWay'] = $payDetail0['pay_prepayid'];
|
|
|
+ } else {
|
|
|
$item['payWay'] = null;
|
|
|
}
|
|
|
if (isset($item['payWay']) && $item['order_status_payment'] == 'SUCCESS') {
|
|
|
@@ -4064,6 +4064,38 @@ class WholeController extends Curd
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * @Desc 修改订单状态-挂账
|
|
|
+ * @Author Gorden
|
|
|
+ * @Date 2024/8/20 15:58
|
|
|
+ *
|
|
|
+ * @param Request $request
|
|
|
+ * @return Response
|
|
|
+ */
|
|
|
+ public function updateStatus(Request $request)
|
|
|
+ {
|
|
|
+ $orderId = $request->post('order_id','');
|
|
|
+ $orderStatusPayment = $request->post('order_status_payment','');
|
|
|
+ $order = Order::where('order_id',$orderId)
|
|
|
+ ->select('order_id','order_status_payment')
|
|
|
+ ->first();
|
|
|
+ try {
|
|
|
+ if ($orderStatusPayment == 'AWAITING' && $order->order_status_payment != 'PENDING'){
|
|
|
+ return json_fail('当前订单不允许挂账');
|
|
|
+ }
|
|
|
+ if ($order->order_status_payment == 'PENDING' && !empty($orderStatusPayment)){
|
|
|
+ $order->order_status_payment = $orderStatusPayment;
|
|
|
+ }
|
|
|
+
|
|
|
+ $order->save();
|
|
|
+
|
|
|
+ return json_success('success');
|
|
|
+ }catch (\Exception $e){
|
|
|
+ return json_fail('修改订单状态失败');
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
public static $goodsClassify = [
|
|
|
// goodsClassify: {GOODS:"健康产品订单",SERVICE:"服务订单",DEVICE:"设备订单",SPECIAL:"专题业务订单",PACKAGE:"套餐订单",RECHARGE:"充值订单",OTHER:"其他订单"},
|
|
|
|
gorden