111

liyaozhi

2025-11-09 c13b8914228e6a404bd60ee36bf2479383da8f23

 admin/app/branch/controller/activity/Activity.php

@@ -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;

/**
 * 活动控制器
@@ -59,8 +59,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 +87,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');