From d0f87196aa0b9637c36f33cdc32b0f9b3da02546 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 22 Mar 2024 16:10:56 +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

---
 plugins/rebate/src/api/IndexController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/rebate/src/api/IndexController.php b/plugins/rebate/src/api/IndexController.php
index 21e2487f..a66a88f5 100644
--- a/plugins/rebate/src/api/IndexController.php
+++ b/plugins/rebate/src/api/IndexController.php
@@ -178,7 +178,7 @@ class IndexController extends ApiController{
                 $quarterInfo['is_repurchase'] = (int)max(array_column($upQuarter['list'], 'is_repurchase'));
                 $quarterInfo['repurchase_money'] = (float)max(array_column($upQuarter['list'], 'repurchase_money'));
                 // 判断：本季度最后结算时间=0；且上一个季度结束需要复购；进入复购判断流程
-                $quarterInfo['repurchase_type'] = 0;// 0=无复购；1=有复购，未到复购时间；2=有复购，未复购；3=有复购，已复购
+                $quarterInfo['repurchase_type'] = $quarterInfo['status'] == 0;// 0=无复购；1=有复购，未到复购时间；2=有复购，未复购；3=有复购，已复购
                 if($quarterInfo['last_reality_thaw_time'] == 0 && $quarterInfo['is_repurchase'] == 1){
                     // 且上一个季最后结算时间大于等于上一个季度最后预计结算时间 已到复购时间内
                     if($upQuarter['last_reality_thaw_time'] >= $upQuarter['last_expect_thaw_time']){
@@ -197,6 +197,10 @@ class IndexController extends ApiController{
                         $quarterInfo['repurchase_type'] = 1;// 有复购  未到复购时间
                     }
                 }
+                // 判断：当前季度最大状态为0或者1   复购状态为0、3时  强制修改为1
+                if(in_array($quarterInfo['status'],[0,1]) && in_array($quarterInfo['repurchase_type'],[0,3])) $quarterInfo['repurchase_type'] = 1;
+
+
 
                 // 刷新上一个季度信息
                 $upQuarter = $quarterInfo;