diff --git a/application/service/PayLogService.php b/application/service/PayLogService.php index a45a796a0..dde65756e 100755 --- a/application/service/PayLogService.php +++ b/application/service/PayLogService.php @@ -264,7 +264,7 @@ class PayLogService } // 关闭操作 - if(Db::name('PayLog')->where(['id'=>$params['ids']])->update(['status'=>2, 'close_time'=>time()])) + if(Db::name('PayLog')->where(['id'=>$params['ids'], 'status'=>0])->update(['status'=>2, 'close_time'=>time()])) { return DataReturn('关闭成功'); } diff --git a/application/service/RegionService.php b/application/service/RegionService.php index 166d0db32..cedc675ed 100755 --- a/application/service/RegionService.php +++ b/application/service/RegionService.php @@ -47,7 +47,8 @@ class RegionService { $pid = isset($params['pid']) ? intval($params['pid']) : 0; $field = empty($params['field']) ? '*' : $params['field']; - return Db::name('Region')->field($field)->where(['pid'=>$pid, 'is_enable'=>1])->select(); + $order_by = empty($params['order_by']) ? 'sort asc,id asc' : trim($params['order_by']); + return Db::name('Region')->field($field)->where(['pid'=>$pid, 'is_enable'=>1])->order($order_by)->select(); } /** diff --git a/application/tags.php b/application/tags.php index a0cf7ef56..edb6ce06e 100755 --- a/application/tags.php +++ b/application/tags.php @@ -66,12 +66,14 @@ return array ( 0 => 'app\\plugins\\distribution\\Hook', 1 => 'app\\plugins\\coupon\\Hook', 2 => 'app\\plugins\\membershiplevelvip\\Hook', + 3 => 'app\\plugins\\wallet\\Hook', ), 'plugins_service_header_navigation_top_right_handle' => array ( 0 => 'app\\plugins\\distribution\\Hook', 1 => 'app\\plugins\\coupon\\Hook', 2 => 'app\\plugins\\membershiplevelvip\\Hook', + 3 => 'app\\plugins\\wallet\\Hook', ), 'plugins_service_order_aftersale_audit_handle_end' => array ( @@ -176,6 +178,7 @@ return array ( 'plugins_service_user_register_end' => array ( 0 => 'app\\plugins\\coupon\\Hook', + 1 => 'app\\plugins\\wallet\\Hook', ), 'plugins_service_user_login_success_record' => array (