cccc9c70
zhouhaihai
商城
|
1
2
|
local _M = {}
|
192b96d3
zhouhaihai
重置
|
3
|
local serverId = tonumber(skynet.getenv("servId"))
|
b6ed652b
zhouhaihai
充值
|
4
|
local md5 = require "md5"
|
192b96d3
zhouhaihai
重置
|
5
|
|
3a3a3ddf
liuzujun
下单前检测商品限购次数
|
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
local function makeOrder(role, rechargeId)
local roleId = role:getProperty("id")
local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
if not rechargeData then
skynet.error("recharge id not exist", rechargeId)
return ""
end
local limit = rechargeData.limit
local rechargeRecord = role:getProperty("payR") or {}
if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
skynet.error(string.format("recharge id:%d count over limit, user id:%d", rechargeId, roleId))
return ""
end
|
b6ed652b
zhouhaihai
充值
|
20
21
22
23
24
25
26
27
28
29
30
31
32
|
local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
local orderKey = string.format("order:%d:%d", roleId, orderId)
redisproxy:del(orderKey)
local order = require("models.Order").new({
key = orderKey,
order = partnerOrderId,
rechargeId = rechargeId,
})
order:create()
redisproxy:sadd(string.format("role:%d:orders", roleId), partnerOrderId)
return partnerOrderId
end
|
192b96d3
zhouhaihai
重置
|
33
|
|
b6ed652b
zhouhaihai
充值
|
34
35
|
-- 入口在正式服关闭 -- mock 充值
function _M.rechargeRpc(agent , data)
|
cccc9c70
zhouhaihai
商城
|
36
37
38
39
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
|
cccc9c70
zhouhaihai
商城
|
40
|
if not dataSet then return end
|
b6ed652b
zhouhaihai
充值
|
41
42
|
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
43
|
--创建订单号
|
3a3a3ddf
liuzujun
下单前检测商品限购次数
|
44
|
local partnerOrderId = makeOrder(role, id)
|
b6ed652b
zhouhaihai
充值
|
45
|
SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
|
192b96d3
zhouhaihai
重置
|
46
|
|
39bcd7ca
zhouhaihai
LOG
|
47
|
|
b6ed652b
zhouhaihai
充值
|
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
-- 测试的 直接发奖励了
skynet.timeout(10, function ()
role:handlePurchase({
order = partnerOrderId,
amount = dataSet.rmb,
game_money = dataSet.diamond,
product_id = dataSet.productId,
pay_time = skynet.timex(),
transactionId = "onlyTest",
})
end)
return true
end
local function table_keys( t )
local keys = {}
for k, _ in pairs( t ) do
keys[#keys + 1] = k
end
return keys
end
local function signPms(params, secret_key)
local keys = table_keys(params)
table.sort(keys)
local urlCode = ""
for index, key in ipairs(keys) do
urlCode = urlCode .. params[key]
end
return md5.sumhexa(urlCode .. secret_key):lower()
end
-- google 充值 入口
function _M.googleRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
90
|
|
192b96d3
zhouhaihai
重置
|
91
|
role.ignoreHeartbeat = true
|
b6ed652b
zhouhaihai
充值
|
92
|
--创建订单号
|
3a3a3ddf
liuzujun
下单前检测商品限购次数
|
93
|
local partnerOrderId = makeOrder(role, id)
|
b6ed652b
zhouhaihai
充值
|
94
95
96
97
|
-- 签名
local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
98
|
money = dataSet.rmb * 100,
|
b6ed652b
zhouhaihai
充值
|
99
100
|
game_money = dataSet.diamond,
product_id = dataSet.productId,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
101
|
notify_url = msg.notifyUrl
|
b6ed652b
zhouhaihai
充值
|
102
103
104
105
|
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_googleRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
192b96d3
zhouhaihai
重置
|
106
107
108
|
return true
end
|
8ae04b5a
zhouhaihai
mycard
|
109
110
111
112
113
114
115
116
117
118
119
|
-- mycard 充值 入口
function _M.myCardRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
3a3a3ddf
liuzujun
下单前检测商品限购次数
|
120
|
local partnerOrderId = makeOrder(role, id)
|
8ae04b5a
zhouhaihai
mycard
|
121
122
123
124
|
-- 签名
local secret_key = "48759e07540f46d9af17ec82669b4272"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
125
|
money = dataSet.rmb * 100,
|
8ae04b5a
zhouhaihai
mycard
|
126
|
game_money = dataSet.diamond,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
127
|
notify_url = msg.notifyUrl
|
8ae04b5a
zhouhaihai
mycard
|
128
129
130
|
}
local sign = signPms(need, secret_key)
|
e629295d
zhouhaihai
协议
|
131
|
SendPacket(actionCodes.Store_myCardRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
8ae04b5a
zhouhaihai
mycard
|
132
133
|
return true
end
|
b6ed652b
zhouhaihai
充值
|
134
|
|
9e25c63d
zhouhaihai
iospay
|
135
136
137
138
139
140
141
142
143
144
145
|
-- mycard 充值 入口
function _M.iosRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
3a3a3ddf
liuzujun
下单前检测商品限购次数
|
146
|
local partnerOrderId = makeOrder(role, id)
|
9e25c63d
zhouhaihai
iospay
|
147
148
149
150
|
-- 签名
local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
151
|
money = dataSet.rmb * 100,
|
9e25c63d
zhouhaihai
iospay
|
152
|
game_money = dataSet.diamond,
|
3ab906d5
zhouhaihai
重置项目
|
153
|
product_id = dataSet.iap_product_id,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
154
|
notify_url = msg.notifyUrl
|
9e25c63d
zhouhaihai
iospay
|
155
156
157
158
159
160
161
|
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
192b96d3
zhouhaihai
重置
|
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
function _M.purchaseOrderResult(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
role.ignoreHeartbeat = false
local partnerOrderStr = msg.order
local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
if not orderObject:load() then
-- 订单不存在
skynet.error("cancelPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
return true
end
if msg.status == "success" then
orderObject:setProperty("transactionId", msg.platformOrder or "")
|
39bcd7ca
zhouhaihai
LOG
|
181
182
183
184
185
186
187
188
189
190
191
192
|
local rechargeId = orderObject:getProperty("rechargeId")
local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
role:log("setOrder", {
order_status = 100, -- "订单状态:100 - 开始下单(玩家还未开始付费行为记录)200 - 支付完成并发货(SDK通知可以发货时记录),300 - 订单被取消,1000 - 其他"
item_id = rechargeId, -- 道具id
item_type = dataSet.type, -- 购买的道具类型,具体见"onItems"方法中道具类型枚举表
item_name = dataSet.title, -- 购买的道具名
item_number = 1, -- 购买的道具数量
item_level = 1, -- 购买的道具等级
order_cost = dataSet.rmb * 100, -- 此次消费的现金金额(单位:分),如 51800即未518元,对应客户端SDK传入的'total_fee'
order_currency = "CNY", -- 货币类型,默认为"CNY"(人民币),遵循ISO 4217规范
|
43293781
zhouhaihai
日志bug
|
193
|
order_type = role:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型,首充记录为1,否则为0
|
39bcd7ca
zhouhaihai
LOG
|
194
195
196
|
order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
})
|
192b96d3
zhouhaihai
重置
|
197
198
199
200
201
|
return true
end
if orderObject:getProperty("finishTime") > 0 then
return true
|
cccc9c70
zhouhaihai
商城
|
202
203
|
end
|
192b96d3
zhouhaihai
重置
|
204
|
orderObject:setProperty("status", msg.status)
|
3133cb76
zhouhaihai
日志
|
205
|
|
192b96d3
zhouhaihai
重置
|
206
|
redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
|
cccc9c70
zhouhaihai
商城
|
207
208
209
210
|
return true
end
|
c5825110
saicom
新增用户商城相关数据
|
211
212
213
214
215
216
217
218
219
|
function _M.shopBuyRpc(agent , data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local count = msg.count or 1
local dataSet = csvdb["shop_normalCsv"][id]
if not dataSet then return end
|
9ea0c502
liuzujun
限时礼包
|
220
|
if dataSet.unlock ~= "" then
|
c72853af
liuzujun
修改每日礼包检测开启bug
|
221
|
if not role:checkHangPass(tonumber(dataSet.unlock)) then
|
9ea0c502
liuzujun
限时礼包
|
222
223
224
225
226
|
skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
return 1
end
end
|
3e20f499
saicom
完善商城相关协议
|
227
228
229
230
231
|
local buyRecord = role.storeData:getProperty("buyR")
if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (buyRecord[id] or 0))) then
skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
return 1
end
|
c5825110
saicom
新增用户商城相关数据
|
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
local cost = {[dataSet.icon] = dataSet.cost * count}
local desc = "unknown"
if dataSet.shop == 1 then -- 普通商店
desc = "dailyShop"
local dailySDD = role.dailyData:getProperty("dailySDD")
if dailySDD[id] then -- 折扣
cost = math.ceil(dataSet.cost * (1 - dataSet.disount / 100))
end
elseif dataSet.shop == 2 then -- 美食商店
desc = "dinerShop"
elseif dataSet.shop == 3 then -- 竞技场商店
desc = "pvpShop"
end
if not role:checkItemEnough(cost) then return end
if dataSet.limit ~= 0 then
buyRecord[id] = (buyRecord[id] or 0) + count
|
3e20f499
saicom
完善商城相关协议
|
252
|
role.storeData:updateProperty({field = "buyR", value = buyRecord})
|
c5825110
saicom
新增用户商城相关数据
|
253
|
end
|
c5825110
saicom
新增用户商城相关数据
|
254
255
256
257
258
259
260
261
|
role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count}})
local gift = {}
for _id, _count in pairs(dataSet.gift:toNumMap()) do
gift[_id] = _count * count
end
local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count}})
|
7f9f002d
liuzujun
循环周活动
|
262
263
264
|
if dataSet.shop == 1 then
role:checkTaskEnter("ShopAll", {count = count})
end
|
c59e058b
zhouhaihai
新一批日志记录
|
265
266
267
268
269
270
271
272
273
274
275
|
local costId, costCount = next(cost)
role:log("shop_purchase", {
item_id = id, -- 道具id
item_type = 0, -- 道具类型,具体见枚举表中道具类型枚举表
item_level = 0, -- 道具等级
item_cnt = count, -- 购买数量技术
currency_type = costId or 0, -- 购买道具消耗的货币类型,记录货币ID
shop_purchase_current = costCount or 0, -- 购买道具消耗的货币数量
shop_id = dataSet.shop, -- 商店ID
})
|
f22a33af
zhouhaihai
自己的日志
|
276
|
role:mylog("role_action", {desc = desc, int1 = id, int2 = count})
|
c5825110
saicom
新增用户商城相关数据
|
277
278
279
280
|
SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
return true
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
281
|
function _M.getFreeChestRpc(agent, data)
|
3e20f499
saicom
完善商城相关协议
|
282
283
284
285
286
287
288
289
290
291
292
293
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local config = csvdb["shop_rechargeCsv"][id]
if not config then return end
local rechargeRecord = role.storeData:getProperty("payR")
local getCount = (rechargeRecord[id] or 0)
if getCount >= config.limit then
return 1
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
294
|
local reward, _ = role:award(config.itemFirst, {log = {desc = "freeGift", int1 = id}})
|
3e20f499
saicom
完善商城相关协议
|
295
296
297
298
|
rechargeRecord[id] = getCount + 1
role.storeData:updateProperty({field = "payR", value = rechargeRecord})
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
299
|
SendPacket(actionCodes.Store_getFreeChestRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
300
|
return true
|
3e20f499
saicom
完善商城相关协议
|
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
|
end
function _M.getGrowFundRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local config = csvdb["reward_newbeeCsv"][id]
if not config then return end
local growFundFlag = role.storeData:getProperty("growFund")
local growFundRecord = role.storeData:getProperty("growFundR")
if growFundFlag == 0 then
skynet.error("user do not buy grow fund")
return 1
end
if not role:checkHangPass(config.condition) then
skynet.error(string.format("user do not finish hang pass, user_id:%d", role:getProperty("id")))
return 1
end
local b = string.getbit(growFundRecord, id)
if string.char(b) == "1" then
return 1
end
growFundRecord = string.setbit(growFundRecord, id)
role.storeData:updateProperty({field = "growFundR", value = growFundRecord})
local gift = config.giftFree .. " " .. config.giftLimit
local reward, _ = role:award(gift, {log = {desc = "grownFund", int1 = id}})
SendPacket(actionCodes.Store_getGrowFundRewardRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
336
|
return true
|
3e20f499
saicom
完善商城相关协议
|
337
338
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
339
|
-- 赛季卡
|
3e20f499
saicom
完善商城相关协议
|
340
341
342
343
344
345
346
347
348
|
function _M.getBattlePassRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local config = csvdb["reward_battlepassCsv"][id]
if not config then return end
local timeNow = skynet.timex()
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
349
|
local battleCardFlag = role.storeData:getProperty("battleCard")
|
3e20f499
saicom
完善商城相关协议
|
350
351
352
353
354
355
356
357
358
359
360
|
local battleCardFreeRecord = role.storeData:getProperty("battleFR")
local battleCardLimitRecord = role.storeData:getProperty("battleLR")
local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
if freeFlag == "1" and limitFlag == "1" then
skynet.error("user already get battle pass reward")
return 1
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
361
|
if battleCardFlag == 1 and limitFlag == "1" then
|
3e20f499
saicom
完善商城相关协议
|
362
363
364
|
return 1
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
365
|
if role:getProperty("battlePoint") < config.point then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
366
367
368
369
|
skynet.error(string.format("user do not have enough battle point, user_id:%d", role:getProperty("id")))
return 1
end
|
3e20f499
saicom
完善商城相关协议
|
370
371
372
373
374
375
376
377
|
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
battleCardFreeRecord = string.setbit(battleCardFreeRecord, id)
role.storeData:updateProperty({field = "battleFR", value = battleCardFreeRecord})
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
378
|
if battleCardFlag == 1 and limitFlag == "0" then
|
3e20f499
saicom
完善商城相关协议
|
379
380
381
382
383
384
|
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
battleCardLimitRecord = string.setbit(battleCardLimitRecord, id)
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
385
|
role.storeData:updateProperty({field = "battleLR", value = battleCardLimitRecord})
|
3e20f499
saicom
完善商城相关协议
|
386
387
388
389
390
|
end
local reward, _ = role:award(gift, {log = {desc = "battleCard", int1 = id}})
SendPacket(actionCodes.Store_getBattlePassRewardRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
391
|
return true
|
3e20f499
saicom
完善商城相关协议
|
392
393
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
394
395
396
397
398
399
400
|
-- 探索指令奖励
function _M.getExploreCommandRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id -- 探索id
local subId = msg.subId -- 领取的阶段id
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
401
|
local tab_name = "reward_levelpass" .. id .. "Csv"
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
402
|
local config = csvdb[tab_name][subId]
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
403
404
|
if not config then return end
|
c99f08df
liuzujun
探索指令调试完成
|
405
|
local bpInfo = role.storeData:getProperty("bpInfo") or {}
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
406
407
|
local info = bpInfo[id] or {}
local flag = info["flag"] or 0
|
c99f08df
liuzujun
探索指令调试完成
|
408
|
--if flag == 0 then return 1 end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
|
local freeRecord = info["fr"] or ""
local buyRecord = info["br"] or ""
local freeFlag = string.char(string.getbit(freeRecord, subId))
local limitFlag = string.char(string.getbit(buyRecord, subId))
if freeFlag == "1" and limitFlag == "1" then
skynet.error("user already get explore command reward")
return 2
end
if flag == 1 and limitFlag == "1" then
return 3
end
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
425
|
if not role:checkHangPass(config.level) then
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
426
427
428
429
430
431
432
|
return 4
end
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
|
c99f08df
liuzujun
探索指令调试完成
|
433
|
freeRecord = string.setbit(freeRecord, subId)
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
434
435
436
437
438
439
440
441
442
|
info["fr"] = freeRecord
end
if flag == 1 and limitFlag == "0" then
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
|
c99f08df
liuzujun
探索指令调试完成
|
443
|
buyRecord = string.setbit(buyRecord, subId)
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
444
445
446
|
info["br"] = buyRecord
end
|
c99f08df
liuzujun
探索指令调试完成
|
447
448
|
bpInfo[id] = info
role.storeData:updateProperty({field = "bpInfo", value = bpInfo})
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
449
450
451
452
453
454
455
|
local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}})
SendPacket(actionCodes.Store_getExploreCommandRewardRpc, MsgPack.pack({reward = reward}))
return true
end
|
cccc9c70
zhouhaihai
商城
|
456
|
return _M
|