修改代金券购买的物品不计入充值和vip

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role.go

@@ -293,7 +293,7 @@ type RoleLogicOuter interface {
 	//pay
 	CheckRushShopInfoGet(goodsType, goodsId, count int32) bool
 	PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRound int32, cpOrderId uint64, sdkOrderId string)
-	OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSave bool, bAck bool)
+	OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSave bool, bAck, bcash bool)
 	OnPayCallback2(cpOrderId uint64)
 	CheckOrderInfo(payRewardInfo *serverproto.PayOrderSaveInfo) bool
 
@@ -3695,7 +3695,7 @@ func (this *Role) PayInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 			//内网PC模式下直接购买成功
 			ackMsg.Error = int32(serverproto.ErrorCode_ERROR_PAY_PRODUCTION_MODE)
 			this.ReplayGate(ackMsg, true)
-			this.OnPayCallback(payOrderInfo, false, false)
+			this.OnPayCallback(payOrderInfo, false, false, false)
 			util.InfoF("uid=%v pc mode: shop:%v id:%v, count:%v, price:%v", this.GetUUid(), payOrderInfo.GoodsType, payOrderInfo.GoodsId, payOrderInfo.Count, payOrderInfo.Amount)
 			return
 		} else if service.GetServiceConfig().Node.AuthMode == AUTHMODE_ACTIVE {
@@ -4011,10 +4011,13 @@ func (this *Role) payInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 	return serverproto.ErrorCode_ERROR_OK, payRewardInfo
 }
 
-func (this *Role) OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSave bool, bAck bool) {
+func (this *Role) OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSave bool, bAck, bCash bool) {
 	//获取充值奖励
 	var addItemList = map[int32]int32{}
 	for idx := 0; idx < len(payRewardInfo.RewardList); idx++ {
+		if bCash && (payRewardInfo.RewardList[idx].Key == int32(serverproto.ResType_Res_ROCoin) || payRewardInfo.RewardList[idx].Key == int32(serverproto.ResType_Res_VipExp)) {
+			continue
+		}
 		addItemList[payRewardInfo.RewardList[idx].Key] += payRewardInfo.RewardList[idx].Value
 	}
 	if this.GetRoleBag().CanAddItemList(addItemList) == serverproto.ErrorCode_ERROR_OK {
@@ -4096,8 +4099,10 @@ func (this *Role) OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSa
 	this.ReplayGate(ntfMsg, true)
 
 	//充值金额 payRewardInfo.Amount
-	// 充值成功后的系统相关处理
-	this.GetRoleBase().AddPayRecharge(payRewardInfo)
+	// 充值成功后的系统相关处理,代金券购买的不计入
+	if bCash {
+		this.GetRoleBase().AddPayRecharge(payRewardInfo)
+	}
 	////////
 	if bSave {
 		payRewardInfo.OrderState = int32(serverproto.PayOrderState_EPayOrderState_PayOkReward)
@@ -4147,7 +4152,7 @@ func (this *Role) GMPay(amount float32) {
 		Amount:           amount,
 		OrderProcessTime: util.GetTimeMilliseconds(),
 	}
-	this.OnPayCallback(payRewardInfo, false, false)
+	this.OnPayCallback(payRewardInfo, false, false, false)
 }
 
 func (this *Role) GMCalAttr() {

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_activity.go

@@ -663,19 +663,19 @@ func (this *RoleActivity) SignUp(ackMsg *serverproto.SCSignUpAck) serverproto.Er
 		this.role.AddItemList(addItemList, AddFrom_SignUp, true)
 	}
 	this.SetDirty(true)
-	if this.signInfo.CurDay == 2 {
-		ntf := &serverproto.SCDnySdkNtf{Type: 22}
-		this.role.ReplayGate(ntf, true)
-	} else if this.signInfo.CurDay == 3 {
-		ntf := &serverproto.SCDnySdkNtf{Type: 23}
-		this.role.ReplayGate(ntf, true)
-	} else if this.signInfo.CurDay == 8 {
-		ntf := &serverproto.SCDnySdkNtf{Type: 24}
-		this.role.ReplayGate(ntf, true)
-	} else if this.signInfo.CurDay == 30 {
-		ntf := &serverproto.SCDnySdkNtf{Type: 25}
-		this.role.ReplayGate(ntf, true)
-	}
+	//if this.signInfo.CurDay == 2 {
+	//	ntf := &serverproto.SCDnySdkNtf{Type: 22}
+	//	this.role.ReplayGate(ntf, true)
+	//} else if this.signInfo.CurDay == 3 {
+	//	ntf := &serverproto.SCDnySdkNtf{Type: 23}
+	//	this.role.ReplayGate(ntf, true)
+	//} else if this.signInfo.CurDay == 8 {
+	//	ntf := &serverproto.SCDnySdkNtf{Type: 24}
+	//	this.role.ReplayGate(ntf, true)
+	//} else if this.signInfo.CurDay == 30 {
+	//	ntf := &serverproto.SCDnySdkNtf{Type: 25}
+	//	this.role.ReplayGate(ntf, true)
+	//}
 	return serverproto.ErrorCode_ERROR_OK
 }
 

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_base.go

@@ -583,17 +583,17 @@ func (this *RoleBase) AddPayRecharge(payRewardInfo *serverproto.PayOrderSaveInfo
 	this.roleBase.DayRecharge += amount
 	this.roleBase.LastRechargeTime = util.GetTimeMilliseconds()
 	this.SetDirty(true)
-	if this.roleBase.TotalRecharge >= 9.9 && !this.roleBase.RoleDelete {
-		ntf := &serverproto.SCDnySdkNtf{Type: 13}
-		this.role.ReplayGate(ntf, true)
-		this.roleBase.RoleDelete = true
-		this.SetDirty(true)
-	} else if this.roleBase.TotalRecharge >= 19.9 && !this.roleBase.RoleDelete2 {
-		ntf := &serverproto.SCDnySdkNtf{Type: 14}
-		this.role.ReplayGate(ntf, true)
-		this.roleBase.RoleDelete2 = true
-		this.SetDirty(true)
-	}
+	//if this.roleBase.TotalRecharge >= 9.9 && !this.roleBase.RoleDelete {
+	//	ntf := &serverproto.SCDnySdkNtf{Type: 13}
+	//	this.role.ReplayGate(ntf, true)
+	//	this.roleBase.RoleDelete = true
+	//	this.SetDirty(true)
+	//} else if this.roleBase.TotalRecharge >= 19.9 && !this.roleBase.RoleDelete2 {
+	//	ntf := &serverproto.SCDnySdkNtf{Type: 14}
+	//	this.role.ReplayGate(ntf, true)
+	//	this.roleBase.RoleDelete2 = true
+	//	this.SetDirty(true)
+	//}
 
 	// bt服务器真假累计充值
 	if payRewardInfo.GoodsType == int32(serverproto.PayGoodsType_EPayType_NormalBag) {

RO_Server_Trunk-branch_0.1.39/roserver/game/msg/role_msg.go

@@ -3827,7 +3827,7 @@ func init() {
 			role.ReplayGate(ackMsg, true)
 			return
 		}
-		role.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderInfo, true, false)
+		role.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderInfo, true, false, true)
 	})
 
 	serverproto.Handle_GAME_SSPayOrderCreateReq = model.HandleBackendMessage(func(ev rocommon.ProcEvent, cliId model.ClientID) {
@@ -3903,7 +3903,7 @@ func init() {
 		util.InfoF("uid=%v receive SSPayInfoOrderGetAck ms=%v", role.GetUUid(), msg)
 
 		for idx := 0; idx < len(msg.PayOrderOkList); idx++ {
-			role.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderOkList[idx], true, true)
+			role.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderOkList[idx], true, true, false)
 		}
 	})
 	//from gmweb->social 充值成功后gmweb通知给game服务器
@@ -3917,7 +3917,7 @@ func init() {
 			payRole = model2.RoleMag.GetRoleFromOffline(msg.PayOrderInfo.Uid)
 		}
 		if payRole != nil {
-			payRole.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderInfo, true, false)
+			payRole.(model2.RoleLogicOuter).OnPayCallback(msg.PayOrderInfo, true, false, false)
 		}
 	})