From 18778c8a5d172c1ef2de9590e2d57257188f3095 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 14 Nov 2023 18:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=98=9F=E8=B5=9B=E5=AD=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caravan/api_buyorsell.go |  4 ----
 modules/caravan/module.go        | 19 +++++--------------
 modules/timer/caravanrank.go     |  1 +
 modules/user/model_user.go       | 13 ++++++-------
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go
index 198f5f052..a58a6b2ab 100644
--- a/modules/caravan/api_buyorsell.go
+++ b/modules/caravan/api_buyorsell.go
@@ -220,10 +220,6 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
 			}
 			return
 		}
-
-		// 减少虚拟币
-		// caravan.Merchantmoney -= addScore
-		// update["merchantmoney"] = caravan.Merchantmoney
 		if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{{
 			A: "attr",
 			T: "merchantmoney",
diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index 9990df18f..a82df95f8 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -14,7 +14,6 @@ import (
 	"go_dreamfactory/utils"
 	"math"
 	"strconv"
-	"time"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo/options"
@@ -447,7 +446,6 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E
 		log.Field{Key: "args", Value: args.String()},
 	)
 	go func() {
-		sTime := time.Now()
 		var (
 			rankIndex int32
 			stag      string
@@ -501,26 +499,19 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E
 							this.mail.SendMailByUID(temp.Uid, "CaravanRewards", res, []string{})
 						}
 					}
-					model.DB.UpdateOne(comm.TableCaravanRank, bson.M{"_id": temp.Id}, bson.M{"$set": bson.M{
-						"merchantmoney": 0,
-					}})
+
 				}
 			}
 		}
 
 		Query := bson.M{}
 		Query["merchantmoney"] = 0
-		_, err = this.modelCaravan.DB.UpdateMany(core.SqlTable(comm.TableUser), bson.M{"merchantmoney": bson.M{"$gt": 0}}, bson.M{"$set": Query}, options.MergeUpdateOptions().SetUpsert(true)) //, new(options.UpdateOptions).SetUpsert(true)
-		if err != nil {
+		Query["profit"] = 0
+
+		if _, err = model.DB.UpdateMany(core.SqlTable(comm.TableUser), bson.M{"merchantmoney": bson.M{"$gt": 0}}, bson.M{"$set": Query}, options.MergeUpdateOptions().SetUpsert(true)); err != nil {
 			this.Errorf("Update Merchantmoney Many error: %v", err)
 		}
-		Query = bson.M{}
-		Query["profit"] = 0
-		_, err = this.modelCaravan.DB.UpdateMany(core.SqlTable(comm.TableUser), bson.M{"profit": bson.M{"$gt": 0}}, bson.M{"$set": Query}, options.MergeUpdateOptions().SetUpsert(true)) //, new(options.UpdateOptions).SetUpsert(true)
-		if err != nil {
-			this.Errorf("Update Profit Many error: %v", err)
-		}
-		this.Debugf("sub time:%d", time.Now().Local().Sub(sTime).Milliseconds())
+		return
 	}()
 
 	return
diff --git a/modules/timer/caravanrank.go b/modules/timer/caravanrank.go
index eb84e5da0..47e827eb6 100644
--- a/modules/timer/caravanrank.go
+++ b/modules/timer/caravanrank.go
@@ -79,6 +79,7 @@ func (this *CaravanRank) Start() (err error) {
 	// 0 0 0 ? * MON // 每周一零点
 	cron.AddFunc("0 0 0 ? * MON", this.TimerSeason)
 
+	this.TimerSeason()
 	return
 }
 
diff --git a/modules/user/model_user.go b/modules/user/model_user.go
index d2cb85a49..131f43c73 100644
--- a/modules/user/model_user.go
+++ b/modules/user/model_user.go
@@ -331,24 +331,23 @@ func (this *ModelUser) CleanUserMerchantmoney(session comm.IUserSession) (err er
 	}
 	if db.IsCross() {
 		if model, err = this.module.GetDBModelByUid(uid, this.TableName); err == nil {
-			if err := this.Get(uid, user); err != nil {
+			if err := this.Get(uid, user); err == nil {
+				err = model.Change(uid, update)
+			} else {
 				this.module.Errorf("err:%v", err)
 			}
-			err = model.Change(uid, update)
-			return
 		} else {
 			this.module.Errorln(err)
-			return
 		}
 	} else {
-		if err := this.Get(uid, user); err != nil {
+		if err := this.Get(uid, user); err == nil {
+			err = this.Change(uid, update)
+		} else {
 			this.module.Errorf("err:%v", err)
 		}
 	}
-	err = this.Change(uid, update)
 
 	return
-
 }
 
 // 玩家信息监听