From 179e731baaaeb4c2f0ff997aaea2154ab8ee8fc1 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 22 Mar 2024 15:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=95=86=E5=93=81=E8=B4=AD=E4=B9=B0=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E7=AB=8B=E5=8D=B3=E8=BF=94=E5=88=A9=20=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E4=B8=80=E4=B8=AA=E6=9C=88=E5=90=8E=E6=89=8D=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E8=BF=9B=E8=A1=8C=E8=BF=94=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/models/goods/Privilege.php                |  2 +-
 .../orderGoods/price/option/BaseOrderGoodsPrice.php  |  2 +-
 plugins/rebate/src/models/Rebate.php                 | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/common/models/goods/Privilege.php b/app/common/models/goods/Privilege.php
index e514b566..d1257def 100644
--- a/app/common/models/goods/Privilege.php
+++ b/app/common/models/goods/Privilege.php
@@ -612,7 +612,7 @@ class Privilege extends BaseModel
             if(empty($rebateInfo)) return;
             $rebateInfo = $rebateInfo->toArray();
             // 判断：最大状态是否为1或者2   不是则失效，允许购买
-            if(!in_array($rebateInfo['max_status'],[1,2])) return;
+            if(!in_array($rebateInfo['max_status'],[0,1,2])) return;
             // 判断：最后结算信息获取  并且判断是否需要复购，需要则返回复购价格
             $endInfo = Rebate::uniacid()
                 ->where('uid', $member->uid)
diff --git a/app/frontend/modules/orderGoods/price/option/BaseOrderGoodsPrice.php b/app/frontend/modules/orderGoods/price/option/BaseOrderGoodsPrice.php
index 8d553b3a..718af744 100644
--- a/app/frontend/modules/orderGoods/price/option/BaseOrderGoodsPrice.php
+++ b/app/frontend/modules/orderGoods/price/option/BaseOrderGoodsPrice.php
@@ -119,7 +119,7 @@ abstract class BaseOrderGoodsPrice extends OrderGoodsPrice
             if(empty($rebateInfo)) return $this->price;
             $rebateInfo = $rebateInfo->toArray();
             // 判断：最大状态是否为1或者2   不是则失效，原价购买
-            if(!in_array($rebateInfo['max_status'],[1,2])) return $this->price;
+            if(!in_array($rebateInfo['max_status'],[0,1,2])) return $this->price;
             // 判断：最后结算信息获取  并且判断是否需要复购，需要则返回复购价格
             $endInfo = Rebate::uniacid()
                 ->where('uid', $this->orderGoods->uid)
diff --git a/plugins/rebate/src/models/Rebate.php b/plugins/rebate/src/models/Rebate.php
index 89456cb8..d395dd85 100644
--- a/plugins/rebate/src/models/Rebate.php
+++ b/plugins/rebate/src/models/Rebate.php
@@ -96,8 +96,8 @@ class Rebate extends BaseModel{
                 $endKey = max(array_keys($quarterInfo['month_list']));// 最后一个元素的键
                 foreach($quarterInfo['month_list'] as $monthIndex => $monthInfo){
                     // 预计解冻时间 增加
+                    $expectThawTimeMonth++;// 第一笔需要一个月后再返  因此需要在计算当前返利时间前增加一个月
                     $currentExpectThawTime = getNextMonthDays($expectThawTime, $expectThawTimeMonth);
-                    $expectThawTimeMonth++;
                     // 生成返利信息
                     $currentMonthData = [
                         'uniacid'           => $uniacid,
@@ -116,10 +116,10 @@ class Rebate extends BaseModel{
                         'updated_at'        => time(),
                     ];
                     // 判断：第一季度第一个月 并且 （不是最后一个月 或者 本季度不需要复购）：立即解冻
-                    if($quarterIndex == 1 && $monthIndex == 1 && ($monthIndex != $endKey ||  (int)$quarterInfo['is_repurchase'] != 1)){
-                        $currentMonthData['reality_thaw_time'] = time();
-                        $currentMonthData['status'] = 1;
-                    }
+                    // if($quarterIndex == 1 && $monthIndex == 1 && ($monthIndex != $endKey ||  (int)$quarterInfo['is_repurchase'] != 1)){
+                    //     $currentMonthData['reality_thaw_time'] = time();
+                    //     $currentMonthData['status'] = 1;
+                    // }
 
                     $insertData[] = $currentMonthData;
                 }
@@ -129,7 +129,7 @@ class Rebate extends BaseModel{
         // 添加数据
         if(count($insertData) > 0) {
             self::insert($insertData);
-            self::rebateSettlement();
+            // self::rebateSettlement();
         }
 
         return true;