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
|
|
b6ed652b
zhouhaihai
充值
|
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
local function makeOrder(roleId, rechargeId)
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
重置
|
20
|
|
b6ed652b
zhouhaihai
充值
|
21
22
|
-- 入口在正式服关闭 -- mock 充值
function _M.rechargeRpc(agent , data)
|
cccc9c70
zhouhaihai
商城
|
23
24
25
26
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
|
cccc9c70
zhouhaihai
商城
|
27
|
if not dataSet then return end
|
b6ed652b
zhouhaihai
充值
|
28
29
|
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
30
|
--创建订单号
|
b6ed652b
zhouhaihai
充值
|
31
32
|
local partnerOrderId = makeOrder(roleId, id)
SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
|
192b96d3
zhouhaihai
重置
|
33
|
|
39bcd7ca
zhouhaihai
LOG
|
34
|
|
b6ed652b
zhouhaihai
充值
|
35
36
37
38
39
40
41
42
43
44
45
46
47
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
|
-- 测试的 直接发奖励了
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
重置
|
77
|
|
192b96d3
zhouhaihai
重置
|
78
|
role.ignoreHeartbeat = true
|
b6ed652b
zhouhaihai
充值
|
79
80
81
82
83
84
|
--创建订单号
local partnerOrderId = makeOrder(roleId, id)
-- 签名
local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
85
|
money = dataSet.rmb * 100,
|
b6ed652b
zhouhaihai
充值
|
86
87
|
game_money = dataSet.diamond,
product_id = dataSet.productId,
|
f9f877b1
zhouhaihai
商店
|
88
|
notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/google"
|
b6ed652b
zhouhaihai
充值
|
89
90
91
92
|
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_googleRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
192b96d3
zhouhaihai
重置
|
93
94
95
|
return true
end
|
8ae04b5a
zhouhaihai
mycard
|
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
-- 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
--创建订单号
local partnerOrderId = makeOrder(roleId, id)
-- 签名
local secret_key = "48759e07540f46d9af17ec82669b4272"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
112
|
money = dataSet.rmb * 100,
|
8ae04b5a
zhouhaihai
mycard
|
113
|
game_money = dataSet.diamond,
|
f9f877b1
zhouhaihai
商店
|
114
|
notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/mycard"
|
8ae04b5a
zhouhaihai
mycard
|
115
116
117
|
}
local sign = signPms(need, secret_key)
|
e629295d
zhouhaihai
协议
|
118
|
SendPacket(actionCodes.Store_myCardRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
8ae04b5a
zhouhaihai
mycard
|
119
120
|
return true
end
|
b6ed652b
zhouhaihai
充值
|
121
|
|
9e25c63d
zhouhaihai
iospay
|
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
-- 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
--创建订单号
local partnerOrderId = makeOrder(roleId, id)
-- 签名
local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
138
|
money = dataSet.rmb * 100,
|
9e25c63d
zhouhaihai
iospay
|
139
|
game_money = dataSet.diamond,
|
3ab906d5
zhouhaihai
重置项目
|
140
|
product_id = dataSet.iap_product_id,
|
f9f877b1
zhouhaihai
商店
|
141
|
notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/ios"
|
9e25c63d
zhouhaihai
iospay
|
142
143
144
145
146
147
148
|
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
192b96d3
zhouhaihai
重置
|
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
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
|
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
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规范
order_type = self.getProperty("rmbC") > 0 and 0 or 1, -- 订单类型,首充记录为1,否则为0
order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
})
|
192b96d3
zhouhaihai
重置
|
184
185
186
187
188
|
return true
end
if orderObject:getProperty("finishTime") > 0 then
return true
|
cccc9c70
zhouhaihai
商城
|
189
190
|
end
|
192b96d3
zhouhaihai
重置
|
191
|
orderObject:setProperty("status", msg.status)
|
3133cb76
zhouhaihai
日志
|
192
|
|
192b96d3
zhouhaihai
重置
|
193
|
redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
|
cccc9c70
zhouhaihai
商城
|
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
return true
end
function _M.dailyBuyRpc(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_diamondCsv"][id]
if not dataSet then return 1 end
local dailySDC = role.dailyData:getProperty("dailySDC")
if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dailySDC[id] or 0))) then return 1 end
local cost = dataSet.cost
|
2ab0d91b
zhouhaihai
每日商店删掉 type [王宇杰]
|
212
213
214
215
|
local dailySDD = role.dailyData:getProperty("dailySDD")
if dailySDD[id] then -- 折扣
cost = math.ceil(cost * (1 - dataSet.disount / 100))
|
cccc9c70
zhouhaihai
商城
|
216
217
|
end
|
b216676d
zhouhaihai
log
|
218
|
if not role:costDiamond({count = cost * count, log = {desc = "dailyShop", int1 = id, int2 = count}}) then
|
cccc9c70
zhouhaihai
商城
|
219
220
221
222
223
224
225
|
return 4
end
if dataSet.limit ~= 0 then
dailySDC[id] = (dailySDC[id] or 0) + count
role.dailyData:updateProperty({field = "dailySDC", value = dailySDC})
end
|
aa5cbb54
zhouhaihai
商店bug
|
226
227
228
229
230
|
local gift = {}
for itemId, count_ in pairs(dataSet.gift:toNumMap()) do
gift[itemId] = count_ * count
end
local reward = role:award(gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
|
7228c195
zhouhaihai
商城 购买
|
231
|
role:checkTaskEnter("ShopAll", {count = count})
|
3133cb76
zhouhaihai
日志
|
232
233
|
role:log("role_action", {desc = "dailyShop", int1 = id, int2 = count})
|
cccc9c70
zhouhaihai
商城
|
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
SendPacket(actionCodes.Store_dailyBuyRpc, MsgPack.pack({reward = reward}))
return true
end
function _M.dinerBuyRpc(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_dinerCsv"][id]
if not dataSet then return end
local dinerS = role:getProperty("dinerS")
if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dinerS[id] or 0))) then return 1 end
|
d284e3ee
zhouhaihai
商店扣除错误
|
252
|
local cost = {[ItemId.DinerCoin] = dataSet.cost * count}
|
cccc9c70
zhouhaihai
商城
|
253
254
255
256
257
258
259
|
if not role:checkItemEnough(cost) then return end
if dataSet.limit ~= 0 then
dinerS[id] = (dinerS[id] or 0) + count
role:updateProperty({field = "dinerS", value = dinerS})
end
|
3133cb76
zhouhaihai
日志
|
260
|
role:costItems(cost, {log = {desc = "dinerShop", int1 = id, int2 = count}})
|
cccc9c70
zhouhaihai
商城
|
261
262
263
264
265
|
local gift = {}
for _id, _count in pairs(dataSet.gift:toNumMap()) do
gift[_id] = _count * count
end
|
3133cb76
zhouhaihai
日志
|
266
267
268
|
local reward = role:award(gift, {log = {desc = "dinerShop", int1 = id, int2 = count}})
role:log("role_action", {desc = "dinerShop", int1 = id, int2 = count})
|
cccc9c70
zhouhaihai
商城
|
269
270
271
272
273
|
SendPacket(actionCodes.Store_dinerBuyRpc, MsgPack.pack({reward = reward}))
return true
end
|
c5825110
saicom
新增用户商城相关数据
|
274
275
276
277
278
279
280
281
282
|
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
限时礼包
|
283
284
285
286
287
288
289
|
if dataSet.unlock ~= "" then
if not role:checkHangPass(tonumber(config.unlock)) then
skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
return 1
end
end
|
3e20f499
saicom
完善商城相关协议
|
290
291
292
293
294
|
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
新增用户商城相关数据
|
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
|
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
完善商城相关协议
|
315
|
role.storeData:updateProperty({field = "buyR", value = buyRecord})
|
c5825110
saicom
新增用户商城相关数据
|
316
|
end
|
c5825110
saicom
新增用户商城相关数据
|
317
318
319
320
321
322
323
324
|
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
循环周活动
|
325
326
327
|
if dataSet.shop == 1 then
role:checkTaskEnter("ShopAll", {count = count})
end
|
c5825110
saicom
新增用户商城相关数据
|
328
329
330
331
332
333
|
role:log("role_action", {desc = desc, int1 = id, int2 = count})
SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
return true
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
334
|
function _M.getFreeChestRpc(agent, data)
|
3e20f499
saicom
完善商城相关协议
|
335
336
337
338
339
340
341
342
343
344
345
346
|
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
翻倍掉落活动,商城免费宝箱
|
347
|
local reward, _ = role:award(config.itemFirst, {log = {desc = "freeGift", int1 = id}})
|
3e20f499
saicom
完善商城相关协议
|
348
349
350
351
|
rechargeRecord[id] = getCount + 1
role.storeData:updateProperty({field = "payR", value = rechargeRecord})
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
352
|
SendPacket(actionCodes.Store_getFreeChestRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
353
|
return true
|
3e20f499
saicom
完善商城相关协议
|
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
|
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
添加特权卡
|
389
|
return true
|
3e20f499
saicom
完善商城相关协议
|
390
391
392
393
394
395
396
397
398
399
400
|
end
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
月卡赛季卡发送邮件奖励
|
401
|
local battleCardFlag = role.storeData:getProperty("battleCard")
|
3e20f499
saicom
完善商城相关协议
|
402
403
404
405
406
407
408
409
410
411
412
|
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
月卡赛季卡发送邮件奖励
|
413
|
if battleCardFlag == 1 and limitFlag == "1" then
|
3e20f499
saicom
完善商城相关协议
|
414
415
416
|
return 1
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
417
|
if role:getProperty("battlePoint") < config.point then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
418
419
420
421
|
skynet.error(string.format("user do not have enough battle point, user_id:%d", role:getProperty("id")))
return 1
end
|
3e20f499
saicom
完善商城相关协议
|
422
423
424
425
426
427
428
429
|
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
battleCardFreeRecord = string.setbit(battleCardFreeRecord, id)
role.storeData:updateProperty({field = "battleFR", value = battleCardFreeRecord})
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
430
|
if battleCardFlag == 1 and limitFlag == "0" then
|
3e20f499
saicom
完善商城相关协议
|
431
432
433
434
435
436
|
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
battleCardLimitRecord = string.setbit(battleCardLimitRecord, id)
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
437
|
role.storeData:updateProperty({field = "battleLR", value = battleCardLimitRecord})
|
3e20f499
saicom
完善商城相关协议
|
438
439
440
441
442
|
end
local reward, _ = role:award(gift, {log = {desc = "battleCard", int1 = id}})
SendPacket(actionCodes.Store_getBattlePassRewardRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
443
|
return true
|
3e20f499
saicom
完善商城相关协议
|
444
445
|
end
|
cccc9c70
zhouhaihai
商城
|
446
|
return _M
|