|
|
@@ -82,7 +82,7 @@ class Order extends Base
|
|
|
return date("Y-m-d",strtotime($resp['expire_at']));
|
|
|
}])->findOrEmpty();
|
|
|
if ($order->isEmpty()) return error("订单尚未同步");
|
|
|
- $order['order'] = (new SaasOrder)->where("order_id",$param['order_id'])->where("status","in",[1,2,4])->field("order_sn,order_id")->findOrEmpty();
|
|
|
+ $order['order'] = (new SaasOrder)->where("order_id",$param['order_id'])->where("express_status","in",[0,1,2,4])->field("order_sn,order_id")->findOrEmpty();
|
|
|
return successTrans("success.data",[
|
|
|
"user" => get_object_vars((new AuthMode)->guard("member")->login($userIn)),
|
|
|
"order" => $order
|
|
|
@@ -218,13 +218,15 @@ class Order extends Base
|
|
|
$resp = (new DouyinOrder)->config($this->getDyConfig())->token()->orderLock(1,$order['order_id'],$order['certificate_id'],$order['lock_key']);
|
|
|
if ($resp['err_no'] <> 0) return error("取消失败，请重试");
|
|
|
$order->express_status = 3;
|
|
|
+ $lifeState = 1;
|
|
|
} else {
|
|
|
$order->express_status = 4;
|
|
|
+ $lifeState = 2;
|
|
|
}
|
|
|
$order->refund_apply_at = getDateFull();
|
|
|
$order->status = 3;
|
|
|
$order->save();
|
|
|
- (new SaasOrderLife)->where("order_id",$order['order_id'])->update(['status' => 1]);
|
|
|
+ (new SaasOrderLife)->where("order_id",$order['order_id'])->update(['status' => $lifeState]);
|
|
|
(new SaasOrderLog)->insertGetId([
|
|
|
'order_id' => $param['order'],
|
|
|
"title" => "取消预约/服务",
|
