stanley-king 1 年間 前
コミット
9fb6fb173d

+ 4 - 2
admin/control/refill_discount.php

@@ -16,10 +16,12 @@ class refill_discountControl extends SystemControl
 
     private function condition($input)
     {
-        if()
-
+        $cond = [];
         $start_time = $input['start_time'] ?? date("Y-m-d 00:00:00");
 
+
+
+
     }
     public function indexOp()
     {

+ 47 - 47
data/model/refill_discount.model.php

@@ -8,7 +8,13 @@
  
  */
 defined('InShopNC') or exit('Access Invalid!');
-class refill_discountModel{
+class refill_discountModel extends Model
+{
+    public function __construct()
+    {
+        parent::__construct('refill_discount');
+    }
+
 	/**
 	 * 活动列表
 	 *
@@ -16,14 +22,9 @@ class refill_discountModel{
 	 * @param obj $page 分页对象
 	 * @return array 二维数组
 	 */
-	public function getList($condition,$page=''){
-		$param	= array();
-
-        $param['table']	= 'refill_discount';
-		$param['where']	= $this->getCondition($condition);
-		$param['order']	= $condition['order'] ? $condition['order'] : 'activity_id';
-
-		return Db::select($param,$page);
+    public function getList($condition, $page = '')
+    {
+        return $this->table('member')->field($field)->where($condition)->page($page)->order('act_id desc')->limit($limit)->select();
 	}
 	/**
 	 * 添加活动
@@ -84,44 +85,43 @@ class refill_discountModel{
 	 * @param array $condition 条件数组
 	 * @return string
 	 */
-	private function getCondition($condition)
+	private function getCondition($input)
     {
-		$conditionStr	= '';
-		if($condition['activity_id'] != ''){
-			$conditionStr	.= " and activity.activity_id='{$condition['activity_id']}' ";
-		}
-		if($condition['activity_type'] != ''){
-			$conditionStr	.= " and activity.activity_type='{$condition['activity_type']}' ";
-		}
-		if($condition['activity_state'] != ''){
-			$conditionStr	.= " and activity.activity_state = '{$condition['activity_state']}' ";
-		}
-		//活动删除in
-		if(isset($condition['activity_id_in'])){
-			if ($condition['activity_id_in'] == ''){
-				$conditionStr	.= " and activity_id in('')";
-			}else{
-				$conditionStr	.= " and activity_id in({$condition['activity_id_in']}) ";
-			}
-		}
-		if($condition['activity_title'] != ''){
-			$conditionStr	.= " and activity.activity_title like '%{$condition['activity_title']}%' ";
-		}
-		//当前时间大于结束时间(过期)
-		if ($condition['activity_enddate_greater'] != ''){
-			$conditionStr	.= " and activity.activity_end_date < '{$condition['activity_enddate_greater']}'";
-		}
-		//可删除的活动记录
-		if ($condition['activity_enddate_greater_or'] != ''){
-			$conditionStr	.= " or activity.activity_end_date < '{$condition['activity_enddate_greater_or']}'";
-		}
-		//某时间段内正在进行的活动
-		if($condition['activity_daterange'] != ''){
-			$conditionStr .= " and (activity.activity_end_date >= '{$condition['activity_daterange']['startdate']}' and activity.activity_start_date <= '{$condition['activity_daterange']['enddate']}')";
-		}
-		if($condition['opening']){//在有效期内、活动状态为开启
-			$conditionStr	.= " and (activity.activity_start_date <=".time()." and activity.activity_end_date >= ".time()." and activity.activity_state =1)";
-		}
-		return $conditionStr;
+        $cond = [];
+
+        if(isset($input['start_time'])) {
+            $start_time = strtotime($input['start_time']);
+            $cond['start_time'] = ['egt', $start_time];
+        }
+
+        if(isset($input['end_time'])) {
+            $end_time = strtotime($input['end_time']);
+            $cond['start_time'] = ['lt', $end_time];
+        }
+
+        if(isset($input['act_id'])) {
+            $cond['act_id'] = intval($input['act_id']);
+        }
+        if(isset($input['mch_id'])) {
+            $cond['mch_id'] = intval($input['mch_id']);
+        }
+        if(isset($input['mch_name'])) {
+            $name = trim($input['mch_name']);
+            $cond['mch_name'] = ['like', "%$name%"];
+        }
+        if(isset($input['pcode'])) {
+            $cond['pcode'] = $input['pcode'];
+        }
+        if(isset($input['act_type'])) {
+            $cond['act_type'] = intval($input['act_type']);
+        }
+        if(isset($input['act_sn'])) {
+            $cond['act_sn'] = $input['act_sn'];
+        }
+        if(isset($input['act_state'])) {
+            $cond['act_state'] = intval($input['act_state']);
+        }
+
+        return $cond;
 	}
 }

+ 31 - 0
test/model/TestRefillDiscount.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ *   TestRefillDiscount.php
+ *   stanley-king
+ *   2024/1/19
+ *   PhpStorm
+ *   PHPProject
+ */
+
+use PHPUnit\Framework\TestCase;
+
+define('APP_ID', 'test');
+define('BASE_ROOT_PATH', str_replace('/test/model', '', dirname(__FILE__)));
+require_once(BASE_ROOT_PATH . '/global.php');
+require_once(BASE_CORE_PATH . '/lrlz.php');
+require_once(BASE_ROOT_PATH . '/fooder.php');
+
+class TestRefillDiscount extends TestCase
+{
+    public static function setUpBeforeClass() : void
+    {
+        Base::run_util();
+    }
+
+    public function testRefillDiscount()
+    {
+        $mod = Model('refill_discount');
+        $mod->getList
+    }
+
+}