Skip to content

金学艇 / xhx

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 86cc6ba3 86cc6ba35fde3e2597ece5cfea03f2a11e556b84 by jinwawa
Options

0703

1 parent fe08f20f
Inline Side-by-side
Showing 10 changed files with 86 additions and 56 deletions
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
34 </platform> 34 </platform>
35 <!--天津--> 35 <!--天津-->
36 <platform id="103,102" channel="cucc"> 36 <platform id="103,102" channel="cucc">
37 <pay id="6" name="10钻石" type="1" extra="0" item="100000,10" rmb="1.0" product="dclyac001" productPuTao="qjqp006" agentLv="0" notice="0"/> 37 <pay id="6" name="10钻石" type="1" extra="0" item="100000,10" rmb="1.0" product="dclyac001" server="dclyac001" content="tjlhdcylyac001@" productPuTao="qjqp006" agentLv="0" notice="0"/>
38 <pay id="7" name="100钻石" type="1" extra="0" item="100000,100" rmb="10.0" product="dclyac010" productPuTao="qjqp007" agentLv="0" notice="1"/> 38 <pay id="7" name="100钻石" type="1" extra="0" item="100000,100" rmb="10.0" product="dclyac010" server="dclyac010" content="tjlhdcylyac010@" productPuTao="qjqp007" agentLv="0" notice="1"/>
39 <pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="dclyac030" productPuTao="qjqp008" agentLv="0" notice="1"/> 39 <pay id="8" name="300钻石" type="1" extra="10" item="100000,310" rmb="30.0" product="dclyac030" server="dclyac030" content="tjlhdcylyac030@" productPuTao="qjqp008" agentLv="0" notice="1"/>
40 <pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="dclyac050" productPuTao="qjqp009" agentLv="0" notice="1"/> 40 <pay id="9" name="500钻石" type="1" extra="20" item="100000,520" rmb="50.0" product="dclyac050" server="dclyac050" content="tjlhdcylyac050@" productPuTao="qjqp009" agentLv="0" notice="1"/>
41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" productPuTao="qjqp010" agentLv="0" notice="1"/> 41 <pay id="10" name="1000钻石" type="1" extra="50" item="100000,1050" rmb="100.0" product="dclyac100" server="dclyac100" content="tjlhdcylyac100@" productPuTao="qjqp010" agentLv="0" notice="1"/>
42 <pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyac025" productPuTao="qjqp201" notice="1"/> 42 <pay id="201" name="月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="25.0" product="dclyby025" server="dclyby025" content="tjlhdcylyby025@" productPuTao="qjqp201" notice="1"/>
43 <pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" productPuTao="qjqp202" notice="1"/> 43 <pay id="202" name="年卡（365天）" type="2" des="年卡" day="365" item="100001,2000;600002,5;200001,1" payitem="" rmb="198.0" product="dclybn198" server="dclybn198" content="tjlhdcylyac198@" productPuTao="qjqp202" notice="1"/>
44 <pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="tjlhdcylyby020@207" productPuTao="qjqp999" notice="1"/> 44 <pay id="301" name="自动续包月卡（31天）" type="2" des="月卡" day="31" item="100001,1000;600001,5" payitem="" rmb="20.0" product="dclyby020" server="dclyby020" content="tjlhdcylyby020@"productPuTao="qjqp999" notice="1"/>
45 </platform> 45 </platform>
46 <!--上海电信--> 46 <!--上海电信-->
47 <platform id="106" channel="shdx"> 47 <platform id="106" channel="shdx">
......
...@@ -114,6 +114,10 @@ local function init() ...@@ -114,6 +114,10 @@ local function init()
114 else 114 else
115 info.product = vv.attr.product; 115 info.product = vv.attr.product;
116 end 116 end
117 if CHANNEL=="cucc" then
118 info.server = vv.attr.server; --新增两个字段用于天津续包月支付
119 info.content = vv.attr.content;
120 end
117 if info.product and info.product ~= "" then 121 if info.product and info.product ~= "" then
118 if info.type == 1 then 122 if info.type == 1 then
119 info.extra = tonumber(vv.attr.extra); 123 info.extra = tonumber(vv.attr.extra);
...@@ -349,4 +353,15 @@ function ShopInfo.getPayInfoByProduct(product) ...@@ -349,4 +353,15 @@ function ShopInfo.getPayInfoByProduct(product)
349 return info; 353 return info;
350 end 354 end
351 355
356 --针对天津联通配置表问题
357 function ShopInfo.getPayInfoByContent(product)
358 local info = nil;
359 for i,v in ipairs(vipList) do
360 if v.content == product then
361 info = v;
362 end
363 end
364 return info;
365 end
366
352 return ShopInfo 367 return ShopInfo
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -140,7 +140,7 @@ end ...@@ -140,7 +140,7 @@ end
140 140
141 -- 天津联通支付 141 -- 天津联通支付
142 function ShopModel.payCucc(productId, productName, productPrice, callBack, timeoutCallBack, gameid) 142 function ShopModel.payCucc(productId, productName, productPrice, callBack, timeoutCallBack, gameid)
143 --logUI("ShopModel------------------------------>"..productId); 143 logUI("ShopModel------------------------------>"..productId);
144 local function onGetPayIDSuccessFun(_params) 144 local function onGetPayIDSuccessFun(_params)
145 local data = json.decode(_params); 145 local data = json.decode(_params);
146 if data.pay_id == "" then 146 if data.pay_id == "" then
...@@ -187,7 +187,9 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo ...@@ -187,7 +187,9 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo
187 end 187 end
188 188
189 local pay_params = tradeNo .. "," .. productId .. "," .. subject .. "," .. amount .. "," .. notificationURL .. "," .. peng_bo_shi_token; 189 local pay_params = tradeNo .. "," .. productId .. "," .. subject .. "," .. amount .. "," .. notificationURL .. "," .. peng_bo_shi_token;
190 local payInfo = ShopInfo.getPayInfoByProduct(productId); 190 logUI("ShopModel payCucc pay_params= "..pay_params);
191 local payInfo = ShopInfo.getPayInfoByContent(productId); --天津联通根据content筛选
192 logUI("ShopModel payCucc payInfo.id= "..payInfo.id);
191 if payInfo.id == 301 then 193 if payInfo.id == 301 then
192 DeviceUtil.cycleBilling(pay_params, payCallbackFromJava); 194 DeviceUtil.cycleBilling(pay_params, payCallbackFromJava);
193 else 195 else
...@@ -207,7 +209,7 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo ...@@ -207,7 +209,7 @@ function ShopModel.payCucc(productId, productName, productPrice, callBack, timeo
207 if CHANNEL == "cucc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then 209 if CHANNEL == "cucc" and cc.Application:getInstance():getTargetPlatform() == cc.PLATFORM_OS_ANDROID then
208 local paramsStr = "uid=" .. UserModel.getStringUID() .. "&product=" .. productId .. "&account=" .. UserModel.account .. "&gameid=" .. gameid; 210 local paramsStr = "uid=" .. UserModel.getStringUID() .. "&product=" .. productId .. "&account=" .. UserModel.account .. "&gameid=" .. gameid;
209 --logUI("ShopModel sendHttpRequest------------------------------>"); 211 --logUI("ShopModel sendHttpRequest------------------------------>");
210 --logUI("ShopModel sendHttpRequest------------------------------>".."POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr); 212 logUI("ShopModel sendHttpRequest------------------------------>".."POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr);
211 DeviceUtil.sendHttpRequest("POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr, onGetPayIDSuccessFun); 213 DeviceUtil.sendHttpRequest("POST," .. get_pay_id_url .. "," .. PROXY_HTTP_ADDR .. "," .. paramsStr, onGetPayIDSuccessFun);
212 else 214 else
213 HttpRequest:getInstance():post(get_pay_id_url, { uid = UserModel.getStringUID(), product = productId, account = UserModel.account, gameid = gameid }, onGetPayIDSuccessFun, onGetPayIDFaildFun); 215 HttpRequest:getInstance():post(get_pay_id_url, { uid = UserModel.getStringUID(), product = productId, account = UserModel.account, gameid = gameid }, onGetPayIDSuccessFun, onGetPayIDFaildFun);
......
...@@ -413,24 +413,32 @@ function UserModel.onConnectSuccess(params) ...@@ -413,24 +413,32 @@ function UserModel.onConnectSuccess(params)
413 --APK容易崩溃，查找原因中。。。 413 --APK容易崩溃，查找原因中。。。
414 --已解决，Android中加上了runOnUIThread导致的 414 --已解决，Android中加上了runOnUIThread导致的
415 local targetPlatform = cc.Application:getInstance():getTargetPlatform(); 415 local targetPlatform = cc.Application:getInstance():getTargetPlatform();
416 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then 416 if CHANNEL == "shdx" and targetPlatform == cc.PLATFORM_OS_ANDROID then --上海电信鉴权
417 local function callbackLua(params) 417 local function callbackLua(params)
418 local arr = StringUtil.split(params,","); 418 --logUI("鉴权返回数据:"..params);
419 if arr[1] and arr[1] == "success" and arr[2] then --支付成功 419 --local arr = StringUtil.split(params,",");
420 logUI("on connect success callbackLua"); 420 --if arr[1] and arr[1] == "success" and arr[2] then --支付成功
421 IS_MEMBER = 1; --初始化会员全局变量 421 --logUI("on connect success callbackLua");
422 SocketClient:getInstance():send("gateway_msg.login_msg", 422 --IS_MEMBER = 1; --初始化会员全局变量
423 --SocketClient:getInstance():send("gateway_msg.login_msg",
424 --{
425 -- platform = PLATFORM,
426 -- account = account,
427 -- session = session,
428 --shanghai_dianxin_pay_id=tonumber(arr[2]),
429 --} );
430 --logUI("从服务端返回会员类型：" .. arr[2]);
431 --else
432 --logUI("鉴权失败！");
433 -- end
434 end
435 SocketClient:getInstance():send("gateway_msg.login_msg",
423 { 436 {
424 platform = PLATFORM, 437 platform = PLATFORM,
425 account = account, 438 account = account,
426 session = session, 439 session = session,
427 shanghai_dianxin_pay_id=tonumber(arr[2]), 440 --shanghai_dianxin_pay_id=tonumber(arr[2]),
428 } ); 441 } );
429 logUI("从服务端返回会员类型：" .. arr[2]);
430 else
431 logUI("鉴权失败！");
432 end
433 end
434 local luaj = require "cocos.cocos2d.luaj"; --引入luaj 442 local luaj = require "cocos.cocos2d.luaj"; --引入luaj
435 local className = "org/cocos2dx/lua/AppActivity"; 443 local className = "org/cocos2dx/lua/AppActivity";
436 local args = { callbackLua }; 444 local args = { callbackLua };
...@@ -442,10 +450,31 @@ function UserModel.onConnectSuccess(params) ...@@ -442,10 +450,31 @@ function UserModel.onConnectSuccess(params)
442 -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有） 450 -- 当成功时，第一个值为 true，第二个值是 Java 方法的返回值（如果有）
443 -- 当失败时，第一个值为 false，第二个值是错误代码 451 -- 当失败时，第一个值为 false，第二个值是错误代码
444 --local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs); 452 --local ok, ret = luaj.callStaticMethod(className, "sendPayInfo", args, sigs);
453 logUI("callStaticMethod----->authPermission");
445 local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs); 454 local ok, ret = luaj.callStaticMethod(className, "authPermission", args, sigs);
446 if not ok then 455 if not ok then
447 print("sendPayInfo error:" .. ret); 456 print("sendPayInfo error:" .. ret);
448 end 457 end
458 elseif CHANNEL == "cucc" and targetPlatform == cc.PLATFORM_OS_ANDROID then --天津联通鉴权
459 local function callbackLua(params)
460 logUI("天津鉴权返回数据: "..params);
461 if params=="success" then
462 IS_MEMBER = 1; --初始化会员全局变量
463 else --还不是会员，鉴权返回的productid保存再AppActivity中
464
465 end
466 end
467 SocketClient:getInstance():send("gateway_msg.login_msg",
468 {
469 platform = PLATFORM,
470 account = account,
471 session = session,
472 --shanghai_dianxin_pay_id=tonumber(arr[2]),
473 } );
474
475 local vipList = ShopInfo.getVipList();
476 --续包月这里应该是server和content，但是配置表配反了
477 DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",1,"..vipList[3].server, callbackLua);
449 else 478 else
450 SocketClient:getInstance():send("gateway_msg.login_msg", 479 SocketClient:getInstance():send("gateway_msg.login_msg",
451 { 480 {
......
...@@ -40,7 +40,7 @@ function ActivityVipView:init() ...@@ -40,7 +40,7 @@ function ActivityVipView:init()
40 self.yilingqu_month:setVisible(false); 40 self.yilingqu_month:setVisible(false);
41 self.btn_lingqu_month:setVisible(false); 41 self.btn_lingqu_month:setVisible(false);
42 self.btn_vip_lianxu:setVisible(false); 42 self.btn_vip_lianxu:setVisible(false);
43 local function authCallbackLua(result) 43 --[[local function authCallbackLua(result)
44 -- 去鉴权看看有没有订购连续包月 44 -- 去鉴权看看有没有订购连续包月
45 self.orderStaus = result; 45 self.orderStaus = result;
46 if self.orderStaus == "success" then 46 if self.orderStaus == "success" then
...@@ -57,7 +57,7 @@ function ActivityVipView:init() ...@@ -57,7 +57,7 @@ function ActivityVipView:init()
57 -- return self:update(true); --处理好订购关系后在更新后续内容 57 -- return self:update(true); --处理好订购关系后在更新后续内容
58 end 58 end
59 local vipList = ShopInfo.getVipList(); 59 local vipList = ShopInfo.getVipList();
60 DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",2", authCallbackLua); 60 DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",2", authCallbackLua);--]]
61 61
62 62
63 return self:update(true); 63 return self:update(true);
...@@ -238,26 +238,18 @@ function ActivityVipView:update(_is_init) ...@@ -238,26 +238,18 @@ function ActivityVipView:update(_is_init)
238 end 238 end
239 239
240 function ActivityVipView:onGetClick(ref) 240 function ActivityVipView:onGetClick(ref)
241 local shopInfo = ShopInfo.getPayInfo(ref.id); 241 local vipList = ShopInfo.getVipList();
242 242 local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
243 -- ShopModel.onPayResFun({data={product=shopInfo.product}});
244
245 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num); 243 ShopModel.pay(shopInfo.product, shopInfo.name, shopInfo.costList[1].num);
246 end 244 end
247 245
248 -- 包月(取消连续包月功能暂未实现，取消连续包月返回时应该调用update_msg接口通知后端服务器) 246 -- 包月(取消连续包月功能暂未实现，取消连续包月返回时应该调用update_msg接口通知后端服务器)
249 function ActivityVipView:onGetContinueClick(ref) 247 function ActivityVipView:onGetContinueClick(ref)
250 local shopInfo = ShopInfo.getPayInfo(ref.id); 248 local vipList = ShopInfo.getVipList();
249 local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
251 -- 包月卡的id，获取包月卡的item信息 250 -- 包月卡的id，获取包月卡的item信息
252 -- 天津联通支付，支持连续包月 251 -- 天津联通支付，支持连续包月
253 local function authCallbackLua(result) 252 ShopModel.pay(shopInfo.content, shopInfo.name, shopInfo.costList[1].num);
254 -- if nil~=result then
255 logUI("ActivityVipView:onGetContinueClick------------------>" .. result);
256 ShopModel.pay(result, shopInfo.name, shopInfo.costList[1].num);
257 -- end
258 end
259 local vipList = ShopInfo.getVipList();
260 DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",2", authCallbackLua);
261 end 253 end
262 254
263 function ActivityVipView:onLingquClick(ref) 255 function ActivityVipView:onLingquClick(ref)
......
...@@ -450,11 +450,11 @@ function LoginView:doLogin(account) ...@@ -450,11 +450,11 @@ function LoginView:doLogin(account)
450 verifystring = md5(verifystring); 450 verifystring = md5(verifystring);
451 logUI("登录验证："..verifystring); 451 logUI("登录验证："..verifystring);
452 452
453 if CHANNEL=="gzdt" then 453 --if CHANNEL=="gzdt" then
454 UserModel.login("http://183.234.214.1","10400","xiaokanggogogo",""); --直接调用gateway,跳过登录接口 __TODO:jinwawa 454 -- UserModel.login("http://183.234.214.1","10400","xiaokanggogogo",""); --直接调用gateway,跳过登录接口 __TODO:jinwawa
455 else 455 --else
456 HttpRequest:getInstance():post(GAME_LOGIN_URL,{platform=PLATFORM,account=self.account,verify=verifystring,openid=self.openid,access_token=self.access_token},handler(self,self.onLoginServerBackFun),handler(self,self.onLoginServerFaildFun)); 456 HttpRequest:getInstance():post(GAME_LOGIN_URL,{platform=PLATFORM,account=self.account,verify=verifystring,openid=self.openid,access_token=self.access_token},handler(self,self.onLoginServerBackFun),handler(self,self.onLoginServerFaildFun));
457 end 457 --end
458 end 458 end
459 end 459 end
460 460
......
...@@ -346,7 +346,11 @@ function ShopView:onBuyClick(ref,event) ...@@ -346,7 +346,11 @@ function ShopView:onBuyClick(ref,event)
346 346
347 if shopItemInfo.costList[1].id == 0 then 347 if shopItemInfo.costList[1].id == 0 then
348 --RMB充值购买道具 348 --RMB充值购买道具
349 ShopModel.pay(shopItemInfo.product,shopItemInfo.name,shopItemInfo.costList[1].num,callBack,timeoutCallBack); 349 if CHANNEL=="cucc" then --天津联通支付采用content字段，并且需要拼接省份标识carrierId
350 ShopModel.pay(shopItemInfo.content,shopItemInfo.name,shopItemInfo.costList[1].num,callBack,timeoutCallBack);
351 else
352 ShopModel.pay(shopItemInfo.product,shopItemInfo.name,shopItemInfo.costList[1].num,callBack,timeoutCallBack);
353 end
350 else 354 else
351 --游戏币购买道具 355 --游戏币购买道具
352 local myNum = UserModel.getItemNum(shopItemInfo.costList[1].id); 356 local myNum = UserModel.getItemNum(shopItemInfo.costList[1].id);
......
...@@ -129,21 +129,9 @@ function XyxPayView:onBuyClick(ref,event) ...@@ -129,21 +129,9 @@ function XyxPayView:onBuyClick(ref,event)
129 --[[self.shop_reciever = require("app.views.view.ActivityView"):show("ActivityVipView"); 129 --[[self.shop_reciever = require("app.views.view.ActivityView"):show("ActivityVipView");
130 self.shop_reciever:setLocalZOrder(dialog.ZORDER_POP); 130 self.shop_reciever:setLocalZOrder(dialog.ZORDER_POP);
131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(self.shop_reciever);--]] 131 cc.Director:getInstance():getRunningScene().keypadManager:addKeypadReceiver(self.shop_reciever);--]]
132
133 local vipList = ShopInfo.getVipList(); 132 local vipList = ShopInfo.getVipList();
134 local shopInfo = ShopInfo.getPayInfo(vipList[3].id); 133 local shopInfo = ShopInfo.getPayInfo(vipList[3].id);
135 -- 包月卡的id，获取包月卡的item信息 134 ShopModel.pay(shopInfo.content, shopInfo.name, shopInfo.costList[1].num);
136 -- 天津联通支付，支持连续包月
137 local function authCallbackLua(result)
138 -- if nil~=result then
139 --logUI("ActivityVipView:onGetContinueClick------------------>" .. result);
140 ShopModel.pay(result, shopInfo.name, shopInfo.costList[1].num);
141 -- end
142 end
143 local vipList = ShopInfo.getVipList();
144 DeviceUtil.authPermissionForPruductId(vipList[3].product .. ",2", authCallbackLua);
145
146 -- self:onPayCallBack("success");
147 end 135 end
148 136
149 function XyxPayView:onPayCallBack(params) 137 function XyxPayView:onPayCallBack(params)
......