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;