排序接口

app/business/controllers/AdController.php

@@ -72,7 +72,7 @@ class AdController extends BaseController
 		$info = AdService::getById($id);
 		AdService::valid($info, $this->merchantId);
 		AdService::clickAd($id);
-		util::ok();
+		util::complete();
 	}
 	
 	//更新广告
@@ -83,7 +83,7 @@ class AdController extends BaseController
 		$info = AdService::getById($id);
 		AdService::valid($info, $this->merchantId);
 		AdService::updateAd($id, $post);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//删除广告
@@ -93,7 +93,7 @@ class AdController extends BaseController
 		$info = AdService::getById($id);
 		AdService::valid($info, $this->merchantId);
 		AdService::deleteById($id);
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 
 	//上下架广告
@@ -104,7 +104,7 @@ class AdController extends BaseController
 		$info = AdService::getById($id);
 		AdService::valid($info, $this->merchantId);
 		AdService::updateById($id,['status'=>$status]);
-		util::ok('操作成功');
+		util::complete('操作成功');
 	}
 	
 	//广告详情
@@ -123,7 +123,7 @@ class AdController extends BaseController
 		$info = AdService::getById($id);
 		AdService::valid($info, $this->merchantId);
 		AdService::updateById($id, ['inTurn' => $inTurn]);
-		util::ok('操作成功');
+		util::complete('操作成功');
 	}
 
 }

app/business/controllers/AdminController.php

@@ -48,7 +48,7 @@ class AdminController extends BaseController
 		$admin = AdminClass::getById($id);
 		AdminService::valid($admin, $this->merchantId);
 		AdminService::deleteAdmin($admin, $this->adminId);
-		util::ok();
+		util::complete();
 	}
 	
 	//修改员工 shish 2019.12.9
@@ -60,7 +60,7 @@ class AdminController extends BaseController
 		$originalAdmin = AdminService::getById($id);
 		$post['merchantId'] = $this->merchantId;
 		AdminService::updateAdmin($originalAdmin, $post);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//查看员工详情 shish 2019.12.9
@@ -96,7 +96,7 @@ class AdminController extends BaseController
 			}
 		}
 		AdminService::updateById($adminId, ['password' => password_hash($new, PASSWORD_BCRYPT)]);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//确认密码修改
@@ -123,7 +123,7 @@ class AdminController extends BaseController
 			}
 		}
 		AdminService::updateById($adminId, ['confirmPassword' => password_hash($new, PASSWORD_BCRYPT)]);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//登陆员工的详情 shish 2019.12.26
@@ -142,7 +142,7 @@ class AdminController extends BaseController
 		$admin = AdminService::getAdminById($id);
 		AdminService::valid($admin, $this->merchantId);
 		AdminService::updateById($id, ['remind' => $remind]);
-		util::ok();
+		util::complete();
 	}
 	
 	//启用与停用 shish 2020.1.4
@@ -154,7 +154,7 @@ class AdminController extends BaseController
 		$admin = AdminService::getAdminById($id);
 		AdminService::valid($admin, $this->merchantId);
 		AdminService::updateById($id, ['status' => $status]);
-		util::ok();
+		util::complete();
 	}
 	
 }

app/business/controllers/AdminRoleAuthController.php

@@ -31,7 +31,7 @@ class AdminRoleAuthController extends BaseController
         $auth = AdminRoleAuthService::getByCondition(['roleId' => $roleId, 'endId' => 1]);
         AdminRoleAuthService::valid($auth, $this->merchantId);
         AdminRoleAuthService::updateByCondition(['roleId' => $roleId, 'endId' => 1], ['auth' => implode(',', $authIdList)]);
-        util::ok();
+        util::complete();
     }
 
 }

app/business/controllers/AdminRoleController.php

@@ -38,7 +38,7 @@ class AdminRoleController extends BaseController
 		$role = AdminRoleService::getById($id);
 		AdminRoleService::valid($role, $this->merchantId);
 		AdminRoleService::updateRole($role, $post);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//角色删除 shish 2019.12.10
@@ -48,7 +48,7 @@ class AdminRoleController extends BaseController
 		$role = AdminRoleService::getById($id);
 		AdminRoleService::valid($role, $this->merchantId);
 		AdminRoleService::deleteRole($role);
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 
 }

app/business/controllers/BaseController.php

@@ -19,7 +19,7 @@ class BaseController extends PublicController
 	public $isLogin = false;
 	public $withoutLogin = [];//不需要登陆的方法名
 	public $validate = true;
-
+	
 	//shish 2020.3.8
 	public function beforeAction($action)
 	{
@@ -32,17 +32,16 @@ class BaseController extends PublicController
 		if (in_array($action->id, $this->withoutLogin)) {
 			$this->validate = true;
 		}
-		
 		if ($this->validate == false) {
 			util::notLogin();
 		}
 		$admin = AdminService::getById($adminId);
 		if (empty($admin)) {
-			util::fail('没有找到管理员，但已经获取客户ID:' . $adminId);
+			util::fail('帐号无效');
 		}
 		$merchantId = $admin['merchantId'];
 		if (empty($merchantId)) {
-			util::fail('没有找到商家信息，但有管理员ID:' . $adminId);
+			util::fail('没有找到商家信息');
 		}
 		$merchant = MerchantService::getMerchantById($merchantId);
 		$merchantExtend = MerchantExtendService::getByMerchantId($merchantId);
@@ -115,5 +114,6 @@ class BaseController extends PublicController
 		$service::deleteById($id);
 		util::success([], '删除成功');
 	}
+
 }
 

app/business/controllers/CategoryController.php

@@ -50,7 +50,7 @@ class CategoryController extends BaseController
 		$category = CategoryService::getById($categoryId);
 		CategoryService::valid($category, $this->merchantId);
 		CategoryService::updateCategory($category, $post);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//分类启用停用 shish 2019.12.8
@@ -62,7 +62,7 @@ class CategoryController extends BaseController
 		$category = CategoryService::getById($categoryId);
 		CategoryService::valid($category, $this->merchantId);
 		CategoryService::changeStatus($categoryId, $status);
-		util::ok();
+		util::complete();
 	}
 	
 	//删除分类 shish 2019.12.28
@@ -73,7 +73,7 @@ class CategoryController extends BaseController
 		$category = CategoryService::getById($categoryId);
 		CategoryService::valid($category, $this->merchantId);
 		CategoryService::deleteCategory($categoryId);
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 	
 	//取分类下商品 shish 2019.12.2
@@ -89,5 +89,16 @@ class CategoryController extends BaseController
 		$data = GoodsCategoryService::getGoodsList($where);
 		util::success($data);
 	}
-	
+
+	//排放接口 shish 2020.3.11
+	public function actionSort()
+	{
+		$id = Yii::$app->request->get('id', 0);
+		$inTurn = Yii::$app->request->get('inTurn', 0);
+		$category = CategoryService::getById($id);
+		CategoryService::valid($category, $this->merchantId);
+		CategoryService::updateById($id, ['inTurn' => $inTurn]);
+		util::complete();
+	}
+
 }

app/business/controllers/CouponAssetController.php

@@ -21,7 +21,7 @@ class CouponAssetController extends BaseController
 	{
 		$post = Yii::$app->request->post();
 		CouponAssetService::updateAsset($this->merchantId, $post);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 
 }

app/business/controllers/GoodsController.php

@@ -67,7 +67,7 @@ class GoodsController extends BaseController
 		GoodsService::valid($info, $this->merchantId);
 		$data['merchantId'] = $this->merchantId;
 		GoodsService::updateGoods($id, $data);
-		util::ok();
+		util::complete();
 	}
 
 	//商品排序
@@ -78,7 +78,7 @@ class GoodsController extends BaseController
 		$info = GoodsService::getById($id);
 		GoodsService::valid($info, $this->merchantId);
 		GoodsService::updateById($id, ['inTurn' => $inTurn]);
-		util::ok('操作成功');
+		util::complete('操作成功');
 	}
 	
 	//删除商品 shish 2019.12.7
@@ -86,7 +86,7 @@ class GoodsController extends BaseController
 	{
 		$id = Yii::$app->request->get('id', 0);
 		GoodsService::deleteGoods($id, $this->admin);
-		util::ok();
+		util::complete();
 	}
 	
 	//上下架 shish 2019.12.8
@@ -98,14 +98,14 @@ class GoodsController extends BaseController
 		$info = GoodsService::getById($id);
 		GoodsService::valid($info, $this->merchantId);
 		GoodsService::changeStatus($id, $status);
-		util::ok();
+		util::complete();
 	}
 
 	//发送短链接到手机上 shish 2019.12.8
 	public function actionSendShortUrl()
 	{
 		$id = Yii::$app->request->get('id');
-		util::ok();
+		util::complete();
 	}
 	
 	//查看商品短链接 shish 2019.12.8
@@ -128,7 +128,7 @@ class GoodsController extends BaseController
 	{
 		$introduce = Yii::$app->request->post('introduce', '');
 		GoodsSettingService::updateByCondition(['merchantId' => $this->merchantId], ['goodsIntroduce' => $introduce]);
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 	
 	//设置 shish 2019.12.8
@@ -157,7 +157,7 @@ class GoodsController extends BaseController
 			FestRiseService::batchAdd($add);
 		}
 		GoodsSettingService::updateByCondition(['merchantId' => $this->merchantId], $post);
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 	
 }

app/business/controllers/InviteAssetController.php

@@ -24,7 +24,7 @@ class InviteAssetController extends BaseController
 	{
 		$post = Yii::$app->request->post();
 		InviteAssetService::updateAsset($this->merchantId, $post);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 
 }

app/business/controllers/InviteController.php

@@ -52,7 +52,7 @@ class InviteController extends BaseController
 		$invite = InviteService::getById($id);
 		InviteService::valid($invite, $this->merchantId);
 		InviteService::give($invite);
-		util::ok();
+		util::complete();
 	}
 
 	//奖励设置详情

app/business/controllers/MerchantController.php

@@ -19,7 +19,7 @@ class MerchantController extends BaseController
 		$first = isset($get['first']) && is_numeric($get['first']) ? $get['first'] : 5;
 		$add = isset($get['add']) && is_numeric($get['add']) ? $get['add'] : 5;
 		MerchantExtendService::updateByCondition(['merchantId' => $this->merchantId], ['freeDistance' => $first, 'freight' => $add]);
-		util::ok();
+		util::complete();
 	}
 
 	//商家信息 shish 2019.12.8
@@ -58,7 +58,7 @@ class MerchantController extends BaseController
 		}
 		$string = implode('I', $data);
 		MerchantExtendService::updateByCondition(['merchantId' => $this->merchantId], ['gradeList' => $string]);
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 	
 	//常用链接

app/business/controllers/MerchantRemarkController.php

@@ -17,7 +17,7 @@ class MerchantRemarkController extends BaseController
 		$remark = MerchantRemarkService::getById($id);
 		MerchantRemarkService::valid($remark, $this->merchantId);
 		MerchantRemarkService::deleteById($id);
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 
 	//添加备注 shish 2019.12.19
@@ -34,7 +34,7 @@ class MerchantRemarkController extends BaseController
 		$post['addTime'] = time();
 		$post['merchantId'] = $this->merchantId;
 		MerchantRemarkService::add($post);
-		util::ok('添加成功');
+		util::complete('添加成功');
 	}
 
 }

app/business/controllers/OrderController.php

@@ -58,7 +58,7 @@ class OrderController extends BaseController
 		$usageId = isset($post['usageId']) ? $post['usageId'] : $post['usageId'];
 		
 		OrderService::classify($id, $categoryId, $usageId);
-		util::ok();
+		util::complete();
 	}
 	
 	//更新配送单 shish 2019.12.17
@@ -70,7 +70,7 @@ class OrderController extends BaseController
 		$order = OrderService::getById($id);
 		OrderService::valid($order, $this->merchantId);
 		OrderService::updateSheet($order, $post);
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 	
 	//商家收款与发货 shish 2019.12.18
@@ -123,7 +123,7 @@ class OrderController extends BaseController
 	public function actionWithoutSend()
 	{
 		$id = Yii::$app->request->get('id');
-		util::ok('操作成功');
+		util::complete('操作成功');
 	}
 	
 	//修改价格 shish 2020.1.6
@@ -137,7 +137,7 @@ class OrderController extends BaseController
 			util::fail('已发起支付，不能修改价格');
 		}
 		OrderService::updateById($id, ['actPrice' => $price]);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//下单要用到的相关信息 shish 2019.12.6

app/business/controllers/PicController.php

@@ -70,7 +70,7 @@ class PicController extends BaseController
 			PicCategoryService::deleteByCondition(['picId' => $currentId]);
 		}
 		PicCategoryService::batchAdd($add);
-		util::ok('备注成功');
+		util::complete('备注成功');
 	}
 	
 	//查看图片详情 shish 2019.12.8
@@ -90,7 +90,7 @@ class PicController extends BaseController
 		$info = PicService::getById($id);
 		PicService::valid($info, $this->merchantId);
 		PicService::delPic($id);
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 	
 	//置顶 shish 2019.12.8
@@ -100,14 +100,14 @@ class PicController extends BaseController
 		$info = PicService::getById($id);
 		PicService::valid($info, $this->merchantId);
 		PicService::top($info);
-		util::ok();
+		util::complete();
 	}
 	
 	//发送到微信 shish 2019.12.8
 	public function actionSendToWx()
 	{
 		$id = Yii::$app->request->get('id', 0);
-		util::ok();
+		util::complete();
 	}
 	
 }

app/business/controllers/ShopController.php

@@ -32,7 +32,7 @@ class ShopController extends BaseController
 		$shop = ShopService::getById($id);
 		ShopService::valid($shop, $this->merchantId);
 		ShopService::updateShop($id, $data);
-		util::ok();
+		util::complete();
 	}
 	
 	public function actionAdd()
@@ -40,7 +40,7 @@ class ShopController extends BaseController
 		$data = Yii::$app->request->post();
 		$data['merchantId'] = $this->merchantId;
 		ShopService::addShop($data);
-		util::ok();
+		util::complete();
 	}
 
 	//下载收款码 shish 2020.2.29
@@ -94,7 +94,7 @@ class ShopController extends BaseController
 		$shop = ShopService::getById($id);
 		ShopService::valid($shop, $this->merchantId);
 		ShopService::deleteShop($shop);
-		util::ok();
+		util::complete();
 	}
 	
 }

app/business/controllers/UserController.php

@@ -101,7 +101,7 @@ class UserController extends BaseController
 		$post['member'] = $post['memberLevel'];
 		UserService::addUser($post);
 		
-		util::ok();
+		util::complete();
 	}
 	
 	//充值 shish 2019.12.1
@@ -128,7 +128,7 @@ class UserController extends BaseController
 		$merchantAsset = MerchantAssetService::getByMerchantId($this->merchantId);
 		$return = xhRechargeService::recharge($rechargeAmount, $user, $this->adminId, $this->merchant, $this->merchantExtend, $merchantAsset);
 		if ($return['code'] == 'A0001') {
-			util::ok();
+			util::complete();
 		}
 		util::fail();
 	}
@@ -207,11 +207,11 @@ class UserController extends BaseController
 		$allTM = xhTMessageService::getList($this->merchantId);
 		$openId = isset($user['openId']) ? $user['openId'] : '';
 		if (empty($openId)) {
-			util::ok();
+			util::complete();
 		}
 		$shortTempId = 'OPENTM205211943';//升级通知
 		if (isset($allTM[$shortTempId]) == false) {
-			util::ok();
+			util::complete();
 		}
 		$tempId = $allTM[$shortTempId];
 		$data = [
@@ -223,7 +223,7 @@ class UserController extends BaseController
 				"remark" => ["value" => "点击查看会员权益", "color" => "#173177"],
 			]];
 		wxUtil::sendTaskInform($data, $this->merchant);
-		util::ok();
+		util::complete();
 	}
 	
 	//重置客户密码
@@ -235,7 +235,7 @@ class UserController extends BaseController
 		$info = UserService::getById($userId);
 		UserService::valid($info, $this->merchantId);
 		UserService::updateById($userId, ['payPassword' => password_hash($password, PASSWORD_BCRYPT)]);
-		util::ok();
+		util::complete();
 	}
 	
 }

app/business/controllers/WxMenuController.php

@@ -109,7 +109,7 @@ class WxMenuController extends BaseController
 		$jsonData = $wxUtil->userMenuToWeiXin($subData);
 		$respond = json_decode($jsonData, true);
 		if ($respond['errcode'] == 0) {
-			util::ok('提交成功，5分钟后生效');
+			util::complete('提交成功，5分钟后生效');
 		}
 		util::fail('提交失败');
 	}

app/client/controllers/InformUserController.php

@@ -35,7 +35,7 @@ class InformUserController extends BaseController
 			util::fail('发送失败');
 		}
 		sms::send($mobile, $msg, $this->merchant);
-		util::ok('已发送');
+		util::complete('已发送');
 	}
 
 }

app/client/controllers/InviteController.php

@@ -33,7 +33,7 @@ class InviteController extends BaseController
 	{
 		$introUserId = Yii::$app->request->post('introUserId', 0);
 		InviteService::getNewGift($this->user, $introUserId);
-		util::ok('领取成功');
+		util::complete('领取成功');
 	}
 
 }

app/client/controllers/OrderController.php

@@ -424,7 +424,7 @@ class OrderController extends BaseController
 			util::fail('您没有权限操作');
 		}
 		OrderService::comment($post);
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 	
 	//订单详情 shish 2019.12.16

app/client/controllers/UserController.php

@@ -121,7 +121,7 @@ class UserController extends BaseController
 			}
 		}
 		UserService::updateById($userId, ['password' => password_hash($new, PASSWORD_BCRYPT)]);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	//申请会员 shish 2019.12.18
@@ -155,7 +155,7 @@ class UserController extends BaseController
 		}
 		$update['mobile'] = $mobile;
 		UserService::upgradeToMember($userId, $this->merchantId, $update);
-		util::ok('注册成功');
+		util::complete('注册成功');
 	}
 	
 	//用户基本信息和资产 shish 2019.12.19

app/saas/controllers/AuthController.php

@@ -29,7 +29,7 @@ class AuthController extends BaseController
 			util::fail('名称已经存在');
 		}
 		AuthService::add($_POST);
-		util::ok();
+		util::complete();
 	}
 	
 	//修改 shish 2019.11.24
@@ -48,14 +48,14 @@ class AuthController extends BaseController
 			util::fail('名称已经存在');
 		}
 		AuthService::updateById($id, $_POST);
-		util::ok();
+		util::complete();
 	}
 
 	//删除权限 shish 2020.1.7
 	public function actionDelete()
 	{
 		$id = Yii::$app->request->get('id');
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 
 }

app/saas/controllers/CleanCacheController.php

@@ -64,7 +64,7 @@ class CleanCacheController extends PlatformController
 		$exist = Yii::$app->redis->executeCommand('EXISTS', [$key]);
 		if ($exist) {
 			Yii::$app->redis->executeCommand('DEL', [$key]);
-			util::ok($key . '缓存键清除成功');
+			util::complete($key . '缓存键清除成功');
 		}
 		util::fail($key . '缓存键不存在');
 	}

app/saas/controllers/DrawCashController.php

@@ -121,7 +121,7 @@ class DrawCashController extends PlatformController
 			}
 			*/
 			xhCommonService::sendMobileMsg($admin['mobile'], "您申请的提现金额：{$drawAmount}元已经到帐，请注意查收。");
-			util::ok();
+			util::complete();
 		} else {
 			$msg = $result->$responseNode->msg;
 			$sub_code = $result->$responseNode->sub_code;

app/saas/controllers/FestController.php

@@ -32,7 +32,7 @@ class FestController extends BaseController
 		$id = $post['id'];
 		unset($post['id']);
 		FestService::updateById($id, $post);
-		util::ok();
+		util::complete();
 	}
 	
 	//节日详情 shish 2019.12.21

app/saas/controllers/MainController.php

@@ -51,7 +51,7 @@ class MainController extends PlatformController
 		$password = $request->post('password');
 		$return = xhWxOpenAdminService::loginByMobile($mobile, $password, true);//true 自动登陆
 		if ($return) {
-			util::ok('success');
+			util::complete('success');
 		}
 		util::fail('帐号或密码错误');
 	}

app/saas/controllers/MerchantController.php

@@ -216,7 +216,7 @@ class MerchantController extends BaseController
 		$extend->miniAppId = '';
 		$extend->wxAppId = '';
 		$extend->save();
-		util::ok();
+		util::complete();
 	}
 	
 }

app/saas/controllers/MerchantExtendController.php

@@ -20,7 +20,7 @@ class MerchantExtendController extends BaseController
 		$merchantId = isset($post['merchantId']) ? $post['merchantId'] : 0;
 		$post['wxPayInit'] = 1;
 		MerchantExtendService::updateByCondition(['merchantId' => $merchantId], $post);
-		util::ok();
+		util::complete();
 	}
 
 	//设置支付宝支付
@@ -28,7 +28,7 @@ class MerchantExtendController extends BaseController
 	{
 		$post = Yii::$app->request->post();
 		$merchantId = isset($post['merchantId']) ? $post['merchantId'] : 0;
-		util::ok();
+		util::complete();
 		MerchantExtendService::updateByCondition(['merchantId' => $merchantId], $post);
 	}
 	

app/saas/controllers/MiniUpgradeController.php

@@ -27,7 +27,7 @@ class MiniUpgradeController extends BaseController
 	public function actionUpdate()
 	{
 		$version = Yii::$app->request->get('version');
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 
 }

app/saas/controllers/SetAuthController.php

@@ -18,7 +18,7 @@ class SetAuthController extends BaseController
 		$endId = isset($post['endId']) ? $post['endId'] : 0;
 		$auth = isset($post['auth']) ? $post['auth'] : '*';
 		SetAuthService::updateByCondition(['setId' => $setId, 'endId' => $endId], ['auth' => $auth]);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	public function actionDetail()

app/saas/controllers/SetMealController.php

@@ -32,7 +32,7 @@ class SetMealController extends BaseController
 		$id = $post['id'];
 		unset($post['id']);
 		SetMealService::updateById($id, $post);
-		util::ok();
+		util::complete();
 	}
 	
 	//套餐详情 shish 2019.12.21

app/www/controllers/AuthController.php

@@ -39,7 +39,7 @@ class AuthController extends BaseController
 			util::fail('名称已经存在');
 		}
 		AuthService::add($_POST);
-		util::ok();
+		util::complete();
 	}
 	
 	//修改 shish 2019.11.24
@@ -58,14 +58,14 @@ class AuthController extends BaseController
 			util::fail('名称已经存在');
 		}
 		AuthService::updateById($id, $_POST);
-		util::ok();
+		util::complete();
 	}
 	
 	//删除权限 shish 2020.1.7
 	public function actionDelete()
 	{
 		$id = Yii::$app->request->get('id');
-		util::ok('删除成功');
+		util::complete('删除成功');
 	}
 	
 	//准备授权 shish 2019.11.19

app/www/controllers/DrawCashController.php

@@ -121,7 +121,7 @@ class DrawCashController extends PlatformController
 			}
 			*/
 			xhCommonService::sendMobileMsg($admin['mobile'], "您申请的提现金额：{$drawAmount}元已经到帐，请注意查收。");
-			util::ok();
+			util::complete();
 		} else {
 			$msg = $result->$responseNode->msg;
 			$sub_code = $result->$responseNode->sub_code;

app/www/controllers/FestController.php

@@ -32,7 +32,7 @@ class FestController extends BaseController
 		$id = $post['id'];
 		unset($post['id']);
 		FestService::updateById($id, $post);
-		util::ok();
+		util::complete();
 	}
 	
 	//节日详情 shish 2019.12.21

app/www/controllers/InformUserController.php

@@ -31,7 +31,7 @@ class InformUserController extends BaseController
 		Yii::$app->redis->executeCommand('SETEX', [$cacheKey, 120, $code]);
 
 		sms::send($mobile, $msg);
-		util::ok('已发送');
+		util::complete('已发送');
 	}
 
 }

app/www/controllers/MainController.php

@@ -45,7 +45,7 @@ class MainController extends PlatformController
     	$password	= $request->post('password');
 		$return		= xhWxOpenAdminService::loginByMobile($mobile, $password,true);//true 自动登陆
 		if($return){
-			util::ok();
+			util::complete();
 		}
 		util::fail('帐号或密码错误');
     }

app/www/controllers/MiniUpgradeController.php

@@ -27,7 +27,7 @@ class MiniUpgradeController extends BaseController
 	public function actionUpdate()
 	{
 		$version = Yii::$app->request->get('version');
-		util::ok('提交成功');
+		util::complete('提交成功');
 	}
 
 }

app/www/controllers/SetAuthController.php

@@ -18,7 +18,7 @@ class SetAuthController extends BaseController
 		$endId = isset($post['endId']) ? $post['endId'] : 0;
 		$auth = isset($post['auth']) ? $post['auth'] : '*';
 		SetAuthService::updateByCondition(['setId' => $setId, 'endId' => $endId], ['auth' => $auth]);
-		util::ok('修改成功');
+		util::complete('修改成功');
 	}
 	
 	public function actionDetail()

app/www/controllers/SetMealController.php

@@ -32,7 +32,7 @@ class SetMealController extends BaseController
 		$id = $post['id'];
 		unset($post['id']);
 		SetMealService::updateById($id, $post);
-		util::ok();
+		util::complete();
 	}
 	
 	//套餐详情 shish 2019.12.21

app/www/controllers/WxOpenController.php

@@ -63,7 +63,7 @@ class WxOpenController extends PublicController
 		if (!empty($m)) {
 			util::fail('公众号名称已经使用');
 		}
-		util::ok();
+		util::complete();
 	}
 	
 	/**

common/components/util.php

@@ -454,14 +454,15 @@ class util
 	{
 		self::encode(['code' => 2, 'msg' => '当前登陆信息已失效，请重新登陆', 'data' => []]);
 	}
-	
-	//只输出成功状态
-	public static function ok($msg = '')
+
+	//只输出执行完成状态 shish 2020.3.11
+	public static function complete($msg = '')
 	{
 		$msg = empty($msg) ? '操作成功' : $msg;
 		self::encode(['code' => 1, 'msg' => $msg, 'data' => []]);
 	}
 	
+	
 	public static function notLogin()
 	{
 		self::encode(['code' => -1, 'msg' => '没有登陆', 'data' => []]);

文档/开发规范.md

@@ -98,7 +98,7 @@ service可以调用class
 //错误状态输出
 util::fail('名称未填写');
 //只输出成功状态
-util::ok();
+util::complete();
 //输出成功状态并带数据
 util::success(['userId'=>1],'操作成功');