From 0c953d86ddbd55d873bd26ececeadc8b939badd8 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Mon, 2 Dec 2019 15:00:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/controllers/MarketingStrategyController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php
index 9ef8497..b58ba9e 100644
--- a/frontend/controllers/MarketingStrategyController.php
+++ b/frontend/controllers/MarketingStrategyController.php
@@ -582,6 +582,9 @@ class MarketingStrategyController extends UserBaseController
                 $ids[] = $item->id;
             }
         }
+        $result['sql'] = ZhongjiTiaojian::find()
+            ->where('celuo_id=:celuo_id and type=1',[':celuo_id'=>$yingxiao_item->id])
+            ->andWhere(['<=','baofei', $total1_clear])->createCommand()->rawSql;
         if(count($ids) == 0) {
             return $result;
         }

From a50219cf6b91b4e9fc56c962223f0b46edf6cd17 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Mon, 2 Dec 2019 15:05:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/controllers/MarketingStrategyController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php
index b58ba9e..d038f1e 100644
--- a/frontend/controllers/MarketingStrategyController.php
+++ b/frontend/controllers/MarketingStrategyController.php
@@ -582,6 +582,7 @@ class MarketingStrategyController extends UserBaseController
                 $ids[] = $item->id;
             }
         }
+        $result['flags'] = $flags;
         $result['sql'] = ZhongjiTiaojian::find()
             ->where('celuo_id=:celuo_id and type=1',[':celuo_id'=>$yingxiao_item->id])
             ->andWhere(['<=','baofei', $total1_clear])->createCommand()->rawSql;