Commit db787562 by 孙龙

订单相关

parent e298fda7
...@@ -59,7 +59,7 @@ class OrderReverseAuditAction extends BatchAction ...@@ -59,7 +59,7 @@ class OrderReverseAuditAction extends BatchAction
{ {
// 你的代码逻辑 // 你的代码逻辑
$orderIdArr = $this->getKey(); $orderIdArr = $this->getKey();
// OrderModel::auditOrder($orderIdArr); OrderModel::reverseAuditOrder($orderIdArr);
return $this->response()->success('反审核成功')->refresh(); return $this->response()->success('反审核成功')->refresh();
} }
......
...@@ -4,6 +4,7 @@ namespace App\Admin\Controllers; ...@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
use App\Admin\Actions\OrderAuditAction; use App\Admin\Actions\OrderAuditAction;
use App\Admin\Actions\OrderCancelAction; use App\Admin\Actions\OrderCancelAction;
use App\Admin\Actions\OrderEditSatusAction;
use App\Admin\Actions\OrderReverseAuditAction; use App\Admin\Actions\OrderReverseAuditAction;
use App\Admin\Pages\OrderDetailPage; use App\Admin\Pages\OrderDetailPage;
use App\Models\Cms\CmsUser; use App\Models\Cms\CmsUser;
...@@ -113,6 +114,7 @@ class OrderController extends AdminController ...@@ -113,6 +114,7 @@ class OrderController extends AdminController
$grid->tools([ $grid->tools([
new OrderAuditAction(), new OrderAuditAction(),
new OrderReverseAuditAction(), new OrderReverseAuditAction(),
new OrderEditSatusAction(),
]); ]);
......
...@@ -58,6 +58,11 @@ class Order extends Model ...@@ -58,6 +58,11 @@ class Order extends Model
return self::whereIn("order_id",$orderIds)->where("status",self::$STATUS_WAIT_AUDIT)->update(["status"=>self::$STATUS_WAIT_PAY]); return self::whereIn("order_id",$orderIds)->where("status",self::$STATUS_WAIT_AUDIT)->update(["status"=>self::$STATUS_WAIT_PAY]);
} }
//反审核订单
public static function reverseAuditOrder($orderIds=[]){
return self::whereIn("order_id",$orderIds)->where("status",self::$STATUS_FORAMT["待付款"])->update(["status"=>self::$STATUS_FORAMT["待审核"]]);
}
//获取订单数据 //获取订单数据
public static function getOrderList($orderId=0){ public static function getOrderList($orderId=0){
......
...@@ -3,6 +3,7 @@ return [ ...@@ -3,6 +3,7 @@ return [
'labels' => [ 'labels' => [
'Order' => 'Order', 'Order' => 'Order',
'order' => 'Order', 'order' => 'Order',
'edit_status_handle' => '修改状态',
], ],
'fields' => [ 'fields' => [
'order_sn' => '订单编号号', 'order_sn' => '订单编号号',
...@@ -40,5 +41,11 @@ return [ ...@@ -40,5 +41,11 @@ return [
"4"=>"预收自定义", "4"=>"预收自定义",
"5"=>"预收50%", "5"=>"预收50%",
], ],
"edit_status"=>[
"4"=>"待发货",
"8"=>"待收货",
"10"=>" 交易成功",
"-1"=>"已取消",
],
], ],
]; ];
...@@ -3,6 +3,8 @@ return [ ...@@ -3,6 +3,8 @@ return [
'labels' => [ 'labels' => [
'Order' => 'Order', 'Order' => 'Order',
'order' => 'Order', 'order' => 'Order',
'edit_status_handle' => '修改状态',
'将该订单状态置为' => '将该订单状态置为',
], ],
'fields' => [ 'fields' => [
'order_sn' => '订单编号号', 'order_sn' => '订单编号号',
...@@ -40,5 +42,11 @@ return [ ...@@ -40,5 +42,11 @@ return [
"4"=>"预收自定义", "4"=>"预收自定义",
"5"=>"预收50%", "5"=>"预收50%",
], ],
"edit_status"=>[
"4"=>"待发货",
"8"=>"待收货",
"10"=>" 交易成功",
"-1"=>"已取消",
],
], ],
]; ];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment