员工修改密码

app/business/controllers/AdminController.php

@@ -17,7 +17,7 @@ class AdminController extends BaseController
 	//获取登陆员工的权限 shish 2019.11.24
 	public function actionLoginAuth()
 	{
-		$auth = AdminService::getAuth();
+		$auth = AdminService::getAuth($this->adminId,$this->merchantId);
 		util::success($auth);
 	}
 	
@@ -50,7 +50,7 @@ class AdminController extends BaseController
 		AdminService::deleteAdmin($admin, $this->adminId);
 		util::ok();
 	}
-
+	
 	//修改员工 shish 2019.12.9
 	public function actionUpdate()
 	{
@@ -61,7 +61,7 @@ class AdminController extends BaseController
 		AdminService::updateAdmin($originalAdmin, $post);
 		util::ok('修改成功');
 	}
-
+	
 	//查看员工详情 shish 2019.12.9
 	public function actionDetail()
 	{
@@ -71,4 +71,32 @@ class AdminController extends BaseController
 		util::success($admin);
 	}
 	
+	//密码修改
+	public function actionPassword()
+	{
+		$post = Yii::$app->request->post();
+		$old = isset($post['old']) ? $post['old'] : '';
+		$new = isset($post['new']) ? $post['new'] : '';
+		$confirm = isset($post['confirm']) ? $post['confirm'] : '';
+		if ($new != $confirm) {
+			util::fail('二次密码不一致');
+		}
+		$admin = $this->admin;
+		if (empty($old) && !empty($admin['password'])) {
+			util::fail('请输入旧密码');
+		}
+	}
+
+	//确认密码修改
+	public function actionConfirmPassword()
+	{
+		$post = Yii::$app->request->post();
+		$old = isset($post['old']) ? $post['old'] : '';
+		$new = isset($post['new']) ? $post['new'] : '';
+		$confirm = isset($post['confirm']) ? $post['confirm'] : '';
+		if ($new != $confirm) {
+			util::fail('二次密码不一致');
+		}
+	}
+	
 }

app/business/controllers/BaseController.php

@@ -58,13 +58,8 @@ class BaseController extends PublicController
 		$merchant = MerchantService::getById($merchantId);
 		$merchantExtend = MerchantExtendService::getByMerchantId($merchantId);
 		$merchantAsset = MerchantAssetService::getByMerchantId($merchantId);
-		Yii::$app->params['adminId'] = $adminId;
-		Yii::$app->params['admin'] = $admin;
 		Yii::$app->params['merchantId'] = $merchantId;
 		Yii::$app->params['merchant'] = $merchant;
-		Yii::$app->params['merchant'] = $merchant;
-		Yii::$app->params['merchantAsset'] = $merchantAsset;
-		Yii::$app->params['merchantExtend'] = $merchantExtend;
 		$this->adminId = $adminId;
 		$this->merchantId = $merchantId;
 		$this->merchant = $merchant;

app/business/controllers/OrderController.php

@@ -30,6 +30,14 @@ class OrderController extends BaseController
 		util::success($list);
 	}
 	
+	//订单详情 shish 2019.12.16
+	public static function actionDetail()
+	{
+		$id = Yii::$app->request->get('id');
+		$detail = OrderService::getDetail();
+		util::success($detail);
+	}
+
 	//发货管理 shish 2019.11.30
 	public function actionSendDetail()
 	{
@@ -52,7 +60,7 @@ class OrderController extends BaseController
 		OrderSendService::sendUpdate(['id' => $id, 'actionId' => $actionId, 'option' => $option]);
 		util::ok('操作成功');
 	}
-
+	
 	//打单 免填单 填单
 	public function actionPrintOrder()
 	{
@@ -60,10 +68,10 @@ class OrderController extends BaseController
 		$id = isset($post['id']) ? $post['id'] : 0;
 		$order = OrderService::getById($id);
 		OrderService::valid($order, $this->merchantId);
-		OrderSendService::printOrder(['id'=>$id,'option'=>$option]);
+		OrderSendService::printOrder(['id' => $id, 'option' => $option]);
 		util::ok('操作成功');
 	}
-
+	
 	//向快递公司发起配送需求
 	public function actionExpress()
 	{

app/client/controllers/OrderController.php

@@ -386,4 +386,17 @@ class OrderController extends BaseController
 		util::success($list);
 	}
 	
+	//订单评价
+	public function actionComment()
+	{
+		$post = Yii::$app->request->post();
+		$id = $post['id'];
+		$order = OrderService::getById($id);
+		if ($this->userId != $order['userId']) {
+			util::fail('您没有权限操作');
+		}
+		OrderService::comment($post);
+		util::ok('提交成功');
+	}
+
 }

biz/admin/services/AdminService.php

@@ -47,10 +47,8 @@ class AdminService extends BaseService
 	}
 	
 	//员工获取权限 shish 2019.11.25
-	public static function getAuth()
+	public static function getAuth($adminId,$merchantId)
 	{
-		$adminId = Yii::$app->params['adminId'];
-		$merchantId = Yii::$app->params['merchantId'];
 		$admin = self::getById($adminId);
 		$roleId = isset($admin['roleId']) ? $admin['roleId'] : 0;
 		if (empty($roleId)) {

biz/order/classes/OrderClass.php

@@ -34,10 +34,18 @@ class OrderClass extends BaseClass
 		$return = self::add($data);
 		return $return;
 	}
-
+	
 	public static function getByOrderSn($orderSn)
 	{
 		return self::getByCondition(['orderSn' => $orderSn]);
 	}
+	
+	//评价 shish 2019.12.16
+	public static function comment($data)
+	{
+		$id = $data['id'];
+		unset($data['id']);
+		return self::updateById($id, $data);
+	}
 
 }

biz/order/services/OrderService.php

@@ -98,4 +98,16 @@ class OrderService extends BaseService
 		return OrderClass::getByOrderSn($orderSn);
 	}
 	
+	//点评 shish 2019.12.16
+	public static function comment($data)
+	{
+		return OrderClass::comment($data);
+	}
+
+	//订单详情 shish 2019.12.16
+	public static function getDetail()
+	{
+	
+	}
+	
 }