diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index be00fdfb..299cbc2b 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -456,9 +456,9 @@ class OrderController extends BaseApiController $params = (new OrderValidate())->post()->goCheck('add'); $uid = $this->userId; //拆单逻辑 - OrderLogic::dealRefund($uid, $params); - $detail = StoreOrder::where('id', $params['id'])->where('refund_type',1)->where('status','in',[0,1])->find(); - if($detail){ + $res=OrderLogic::dealRefund($uid, $params); + $detail = StoreOrder::where('id', $params['id'])->where('refund_type',1)->find(); + if($detail && $res!=2){ $res=StoreOrderLogic::refund($detail,['order_id'=>$detail['order_id']]); if($res!=false){ return $this->success($res); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 77353be0..d6e84dff 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -832,7 +832,7 @@ class OrderLogic extends BaseLogic } } - return 1; + return $order['status']??1; }