From b806cd51172700c67ebcd85c383499e6ac6d64f3 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Tue, 9 Aug 2022 18:45:03 +0800
Subject: [PATCH] =?UTF-8?q?add=20reverse:for=20v1.6.9=20=E5=B0=8F=E5=85=AC?=
 =?UTF-8?q?=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rule/small_public_platoon_relate_commission.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rule/small_public_platoon_relate_commission.go b/rule/small_public_platoon_relate_commission.go
index 406099a..19e2783 100644
--- a/rule/small_public_platoon_relate_commission.go
+++ b/rule/small_public_platoon_relate_commission.go
@@ -243,7 +243,9 @@ func smallPublicPlatoon(engine *xorm.Engine, uid, recommendUid int, userPublicPl
 
 	//唯一标识符(父级id-uid-等级-位置)
 	var uniqueIdentifier = zhios_order_relate_utils.IntToStr(pid) + "-" + zhios_order_relate_utils.IntToStr(uid) + "-" + zhios_order_relate_utils.IntToStr(int(level)) + "-" + zhios_order_relate_utils.IntToStr(position)
-
+	if userPublicPlatoonSetting.SettleDay == 0 {
+		userPublicPlatoonSetting.SettleDay = 30
+	}
 	// 3、插入 user_public_platoon_relation 记录
 	now := time.Now()
 	userSmallPublicPlatoonRelation.Uid = uid
@@ -253,7 +255,7 @@ func smallPublicPlatoon(engine *xorm.Engine, uid, recommendUid int, userPublicPl
 	userSmallPublicPlatoonRelation.Level = int(level)
 	userSmallPublicPlatoonRelation.Position = position
 	userSmallPublicPlatoonRelation.UniqueIdentifier = uniqueIdentifier
-	userSmallPublicPlatoonRelation.WaitForSettlementDate = now.AddDate(0, 0, 30).Format("2006-01-02")
+	userSmallPublicPlatoonRelation.WaitForSettlementDate = now.AddDate(0, 0, userPublicPlatoonSetting.SettleDay).Format("2006-01-02")
 	userSmallPublicPlatoonRelation.JoinAt = now
 	userSmallPublicPlatoonRelation.CreateAt = now
 	userSmallPublicPlatoonRelation.UpdateAt = now