From 9f26d7dab2c07da9754a888bf05ba756b59169e5 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Fri, 5 Jan 2024 17:33:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=AF=E5=88=86=E8=8E=B7?=
 =?UTF-8?q?=E5=BE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pay/module.go             |  5 ++++-
 modules/shopcenter/api_Info.go    | 10 +++++++++-
 modules/shopcenter/api_receive.go |  2 +-
 modules/shopcenter/module.go      | 20 +++++++++++++-------
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/modules/pay/module.go b/modules/pay/module.go
index 481813c14..0c6418f4a 100644
--- a/modules/pay/module.go
+++ b/modules/pay/module.go
@@ -134,7 +134,10 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
 	} else {
 		res = conf.DiamondNumDouble
 	}
-	res = append(res, &cfg.Gameatn{A: comm.AttrType, T: comm.Integral, N: conf.Integral})
+	if conf.Integral > 0 {
+		res = append(res, &cfg.Gameatn{A: comm.AttrType, T: comm.Integral, N: conf.Integral})
+	}
+
 	info.Record[order.Bpoints]++
 	defer func() {
 		this.PutUserSession(session)
diff --git a/modules/shopcenter/api_Info.go b/modules/shopcenter/api_Info.go
index cf9720dd0..188dc26b0 100644
--- a/modules/shopcenter/api_Info.go
+++ b/modules/shopcenter/api_Info.go
@@ -68,7 +68,15 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ShopCenterInfoReq)
 			continue
 		}
 	}
-
+	if err = this.module.modelshop.Change(session.GetUserId(), map[string]interface{}{
+		"item": info.Item,
+	}); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+	}
 	session.SendMsg(string(this.module.GetType()), "info", &pb.ShopCenterInfoResp{Info: info})
 	return
 }
diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go
index 9ab7d901b..30d622261 100644
--- a/modules/shopcenter/api_receive.go
+++ b/modules/shopcenter/api_receive.go
@@ -226,7 +226,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv
 				}
 				return
 			}
-			days := int32(utils.DiffDays(configure.Now().Unix(), item.Buytime)) + 1
+			days := int32(utils.DiffDays(configure.Now().Unix(), item.Opemtime)) + 1
 			for _, v := range fconfs {
 				if conf.Type == v.Type && v.Position == conf.Index {
 					if _, ok = item.Record[v.Id]; !ok {
diff --git a/modules/shopcenter/module.go b/modules/shopcenter/module.go
index faca96ffc..7cdc33ab5 100644
--- a/modules/shopcenter/module.go
+++ b/modules/shopcenter/module.go
@@ -130,13 +130,19 @@ func (this *ShopCenter) Delivery(session comm.IUserSession, pId int32) (errdata
 		}
 		return
 	}
-
-	info.Item[conf.Id] = &pb.DBShopCenterItem{
-		Id:      conf.Id,
-		Vip:     true,
-		Open:    true,
-		Buytime: configure.Now().Unix(),
-		Record:  make(map[int32]bool),
+	if _, ok := info.Item[conf.Id]; !ok {
+		info.Item[conf.Id] = &pb.DBShopCenterItem{
+			Id:      conf.Id,
+			Vip:     true,
+			Open:    true,
+			Buytime: configure.Now().Unix(),
+			Record:  make(map[int32]bool),
+		}
+	} else {
+		info.Item[conf.Id].Open = true
+		info.Item[conf.Id].Vip = true
+		info.Item[conf.Id].Buytime = configure.Now().Unix()
+		info.Item[conf.Id].Record = make(map[int32]bool)
 	}
 	if err = this.modelshop.Change(session.GetUserId(), map[string]interface{}{
 		"item": info.Item,