companyProjecet.git

			@@ -7,7 +7,7 @@
			use app\branch\model\category\Category as CategoryModel;
			use app\shop\model\user\User as UserModel;
			use app\common\service\qrcode\BranchActivityService;
			use app\branch\model\activityProduct\ActivityProduct as ActivityProductModel;
			use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;

			/**
			* 活动控制器
			@@ -22,6 +22,28 @@
			$model = new ActivityModel;
			$list = $model->getList($this->postData(), $this->getBranchId());
			return $this->renderSuccess('', compact('list'));
			}

			/**
			* 审核活动列表（审核所有活动）
			*/
			public function auditList()
			{
			$model = new ActivityModel;
			$list = $model->getAuditList($this->postData());
			return $this->renderSuccess('', compact('list'));
			}

			/**
			* 审核活动
			*/
			public function audit($activity_id)
			{
			$model = new ActivityModel;
			if ($model->audit($activity_id, $this->postData())) {
			return $this->renderSuccess('审核成功');
			}
			return $this->renderError($model->getError() ?: '审核失败');
			}

			/**
			@@ -59,8 +81,9 @@
			*/
			public function detail($activity_id)
			{
			$model = new ActivityModel;
			return $this->renderSuccess('', $model->detail($activity_id));
			$model = (new ActivityModel)->detail($activity_id);
			$model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
			return $this->renderSuccess('', $model);
			}

			/**
			@@ -86,7 +109,7 @@
			// if ($model['verify_user_ids']) {
			// $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
			// }
			$model['product_list'] = (new ActivityProductModel())->getProductPricelist($activity_id);
			$model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
			$product_ids = [];
			if(!empty($model['product_list'])){
			$product_ids = array_column($model['product_list'], 'product_id');