赠送礼物

src/server/conf/mail/mailCfg.go

@@ -80,7 +80,7 @@ func GetRecallMail(Lang int, Title, ItemName string) (string, string) {
 }
 
 func GetChargeSendMail(Lang int, PlayerName string) (string, string) {
-	data, err := gamedata.GetDataByIntKey(CFG_MAIL, 12)
+	data, err := gamedata.GetDataByIntKey(CFG_MAIL, MAIL_CHARGE_SEND_ID)
 	if err != nil {
 		return "", ""
 	}

src/server/conf/server.json

@@ -28,7 +28,7 @@
 	"RedisAddr":"127.0.0.1",
 	"RedisPort" :"6379",
 	"RedisPwd"  :"",
-	"GoogleVerify":true,
+	"GoogleVerify":false,
 	
 	"RemoteAddr":"host.docker.internal:9001",
 	"Partition":3,

src/server/game/ChargeFunc.go

@@ -20,6 +20,7 @@ func Charge(p *Player, ChargeId int) {
 
 func SendCharge(p *Player, d *ChargeExtra) {
 	G_GameLogicPtr.FriendMgrSend(&MsgMod.Msg{
+		From:  int(p.M_DwUin),
 		Type:  MsgMod.HANDLE_TYPE_SEND_CHARGE,
 		To:    int(d.Uid),
 		SendT: GoUtil.Now(),

src/server/game/FriendMgr.go

@@ -65,6 +65,7 @@ func (f *FriendMgr) Init() {
 	f.RegisterHandler(msg.FRIEND_TREASURE_HANDLE, f.sendToPlayer)
 	f.RegisterHandler(msg.HANDLE_TYPE_HANDBOOK_COLLECTION, f.sendToPlayer)
 	f.RegisterHandler(msg.HANDLE_TYPE_HANDBOOK_UPVOTE, f.sendToPlayer)
+	f.RegisterHandler(msg.HANDLE_TYPE_SEND_CHARGE, f.sendToPlayer)
 }
 
 func (f *FriendMgr) getData() *FirendData {

src/server/game/PlayerFunc.go

@@ -33,7 +33,7 @@ func HandleMsg(p *Player, m *msg.Msg) {
 	backup := p.BackUp() // 备份当前的 Player 值
 	defer func() {
 		if r := recover(); r != nil {
-			log.Debug("Handle msg uid : %d, msg : %v, fatal : %s", p.M_DwUin, m, r)
+			log.Error("Handle msg uid : %d, msg : %v, fatal : %s", p.M_DwUin, m, r)
 			p.Recover(backup) //还原Player的数据
 		}
 		p.lock.Unlock() //解锁
@@ -234,12 +234,14 @@ func handle(p *Player, m *msg.Msg) error {
 			C = m.Extra.(*ChargeExtra)
 		}
 		PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From)
-		p.AddLog(m.From, friend.LOG_TYPE_CHARGE_SEND, "")
+
 		MailMod := p.PlayMod.getMailMod()
 		BaseMod := p.PlayMod.getBaseMod()
 		mt, mc := mailCfg.GetChargeSendMail(BaseMod.GetLang(), PlayerSimpleData.Name)
 		Items := ChargeItem(p, C.ChargeId)
-		MailMod.Send(mt, mc, Items, mail.MAIL_TYPE_NORMAL)
+		MailId := MailMod.Send(mt, mc, Items, mail.MAIL_TYPE_NORMAL)
+		p.AddLog(m.From, friend.LOG_TYPE_CHARGE_SEND, fmt.Sprintf("%d", MailId))
+		p.PushClientRes(MailMod.BackData())
 	default:
 		log.Debug("uid : %d, handle msg type : %d not exist", p.M_DwUin, m.Type)
 	}
@@ -323,11 +325,9 @@ func SyncFriendMsg(p *Player) {
 	for _, v := range ml {
 		maxId = max(maxId, v.Id)
 		if v.H == 1 {
-			log.Error("uid : %d, handle same friend msg : %v", p.M_DwUin, v)
 			continue
 		}
 		if v.Id > 0 && v.Id <= MsgId {
-			log.Error("uid : %d, handle old friend msg : %v", p.M_DwUin, v)
 			continue
 		}
 		log.Debug("uid : %d, handle friend msg : %v", p.M_DwUin, v)

src/server/game/ServerMod.go

@@ -47,7 +47,7 @@ func (s *ServerMod) init() {
 	go func() {
 		defer func() {
 			if r := recover(); r != nil {
-				log.Debug("%s panic: %s", s.key, r)
+				log.Error("%s panic: %s", s.key, r)
 				s.lock.Unlock()
 			}
 		}()

src/server/game/Trigger.go

@@ -111,6 +111,11 @@ func TriggerShippingOrder(player *Player, req *msg.ReqShippingOrder) {
 
 	}
 	if OrderData == nil {
+		log.Debug("[order data nil] Uid:%d;OrderSn:%s;PayOrder:%s; OrderStatus:%d;", player.M_DwUin, OrderSn, req.ProduceId, OrderData.PayStatus)
+		return
+	}
+	if OrderData.PayStatus == MergeConst.ORDER_STATUS_SHIP {
+		log.Debug("[order already ship] Uid:%d;OrderSn:%s;PayOrder:%s; OrderStatus:%d;", player.M_DwUin, OrderData.OrderId, OrderData.PayChannelOrderId, OrderData.PayStatus)
 		return
 	}
 	log.Debug("[order verify success] Uid:%d;OrderSn:%s;PayOrder:%s;", player.M_DwUin, OrderData.OrderId, OrderData.PayChannelOrderId)