Sfoglia il codice sorgente

feat: NG-27: Qualified bonus regulations 奖金合格制度:活动期间购买指定商品,BV≥27即可维持活跃度.

kevin 1 anno fa
parent
commit
24c88f9fe1
1 ha cambiato i file con 14 aggiunte e 2 eliminazioni
  1. 14 2
      common/helpers/bonus/Calc/PushBaseDataToCalc.php

+ 14 - 2
common/helpers/bonus/Calc/PushBaseDataToCalc.php

@@ -535,10 +535,22 @@ class PushBaseDataToCalc extends BaseBusiness
 
                     $where = '1=1';
                     if ($table == 'AR_ORDER') {
-                        $where = 'IS_DELETE = 0 AND PERIOD_NUM=' . $this->_periodNum;
+                        $periodObj = Period::instance();
+                        $calcYear = $periodObj->getYear($this->_periodNum);
+                        $calcMonth = $periodObj->getMonth($this->_periodNum);
+                        $periodList = $periodObj->getYearMonthAllPeriod($calcYear, $calcMonth);
+                        $periodList = implode("','", $periodList);
+
+                        $where = "IS_DELETE = 0 AND PERIOD_NUM IN ('{$periodList}')";
                     }
                     if ($table == 'AR_ORDER_GOODS') {
-                        $orderSn = Order::find()->select('SN')->where('IS_DELETE = 0 AND PERIOD_NUM=' . $this->_periodNum)->column();
+                        $periodObj = Period::instance();
+                        $calcYear = $periodObj->getYear($this->_periodNum);
+                        $calcMonth = $periodObj->getMonth($this->_periodNum);
+                        $periodList = $periodObj->getYearMonthAllPeriod($calcYear, $calcMonth);
+                        $periodList = implode("','", $periodList);
+
+                        $orderSn = Order::find()->select('SN')->where("IS_DELETE = 0 AND PERIOD_NUM IN ('{$periodList}')")->column();
                         $where = 'ORDER_SN IN ("' . implode("','", $orderSn) . '")';
                     }