|
@@ -110,7 +110,7 @@ class AwardIntegral extends BaseModel
|
|
|
$award_order_limit = sys_config('award_order_limit');
|
|
|
if ($award_order_limit_type == 1) $award_order_limit = 0.01;
|
|
|
if ($value == 1) {
|
|
|
- $query->where('status', 0)->where('sent_num<num')->where('order_price', '>=', $award_order_limit);
|
|
|
+ $query->where('status', 0)->where('sent_num<num')->where('order_price', '>=', $award_order_limit)->where('add_time', '>=', strtotime('2024-11-18'));
|
|
|
} else if ($value == 2) {
|
|
|
$query->where(function ($query) {
|
|
|
$query->where('status', 1)->whereOr('sent_num>=num');
|
|
@@ -119,6 +119,7 @@ class AwardIntegral extends BaseModel
|
|
|
$query->where('order_price', '<', $award_order_limit);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 门店ID
|
|
|
* @param $query
|
|
@@ -130,7 +131,7 @@ class AwardIntegral extends BaseModel
|
|
|
$award_order_limit = sys_config('award_order_limit_2');
|
|
|
if ($award_order_limit_type == 1) $award_order_limit = 0.01;
|
|
|
if ($value == 1) {
|
|
|
- $query->where('status', 0)->where('sent_num<num')->where('order_price', '>=', $award_order_limit);
|
|
|
+ $query->where('status', 0)->where('sent_num<num')->where('order_price', '>=', $award_order_limit)->where('add_time', '>=', strtotime('2024-11-18'));
|
|
|
} else if ($value == 2) {
|
|
|
$query->where(function ($query) {
|
|
|
$query->where('status', 1)->whereOr('sent_num>=num');
|