From 2a6bacedea0c4d6d49efcca5d0c56b7aa6e33adc Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 19 十一月 2018 14:45:39 +0800
Subject: [PATCH] 2397 【BUG】【1.2】【1.3】符印背包满的情况下合成符印，扣除符印融合石没合成符印，双属性符印升级后分解没返还符印融合石
---
Tool/WebCenter/CouponCode/webapp.py | 136 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 133 insertions(+), 3 deletions(-)
diff --git a/Tool/WebCenter/CouponCode/webapp.py b/Tool/WebCenter/CouponCode/webapp.py
index 97cb5b8..a3f8638 100644
--- a/Tool/WebCenter/CouponCode/webapp.py
+++ b/Tool/WebCenter/CouponCode/webapp.py
@@ -24,6 +24,7 @@
from lib import mylog, CommFunc
import os.path
import zipfile
+import time
# get: request.query.username request.GET.get('username','')
# post: request.forms.get('username') request.POST.get('username')
@@ -98,9 +99,22 @@
return static_file("%s.zip"%couponid, r".\download", download=True)
-# 鍗＄被鍨� 寮�澶村瓧姣嶅仛鏍囪瘑濡� g1~999浠ｈ〃姝ゅ崱鍙兘浣跨敤涓�娆� h1~999鍗″彲浠ラ噸澶嶄娇鐢� z寮�澶翠唬琛ㄥ浐瀹氱爜
+#================瀹㈡埛绔姹傚弬鏁�===============================================================
+# channel 鏄� string Appid 濡俲sgameios
+# code 鏄� string 鍏戞崲鐮�
+# accid 鏄� string 璐﹀彿
+# spid 鏄� string 杩愯惀鍟咺D锛岀爺鍙戣嚜宸遍厤缃殑锛屽jisu浠ｈ〃鏋侀�熷钩鍙�
+# sid 鏄� int 鏈嶅姟鍣↖D 鏁板瓧
+# pushurl 鏄� string 鍩熷悕閾炬帴s222.xxx.com
+# roleid 鏄� string 鐜╁娓告垙鍚�
+# level 鏄� int 鐜╁绛夌骇
+# viplevel 鏄� Int 鐜╁VIP绛夌骇
+#===============================================================================
+
+#2018.10.10 娣锋湇鏀寔瀵艰嚧璐﹀彿鎷兼帴閫昏緫鍙樻洿闇�瑕乻pid
+# 鍗＄被鍨� 寮�澶村瓧姣嶅仛鏍囪瘑濡� g1~999浠ｈ〃姝ゅ崱鍙兘浣跨敤涓�娆� h1~999鍗″彲浠ラ噸澶嶄娇鐢� z寮�澶翠唬琛ㄥ浐瀹氱爜 wx寮�澶翠唬琛ㄥ井淇″晢搴�
# 鐜╁浣跨敤鍗″彿 鍙傛暟 骞冲彴 鍖烘湇 璐﹀彿 鍖烘湇閾炬帴锛圙M鐢級鍗″彿
-# http://center.xxx.com:53003/Coupon/CouponCode.php?channel=appid&code=XXX&accid=YYY&sid=222&pushurl=s222.xxx.com
+# http://center.xxx.com:53003/Coupon/CouponCode.php
@myapp.route('/Coupon/CouponCode.php')
def CouponCode():
dataDict = request.GET
@@ -116,6 +130,14 @@
if not codeStr:
return
+ spID = dataDict.get("spid", "")
+ if not spID:
+ tdict = {"jisugame":"jisu", 'spxjgame':'sipu', 'mrgame':'maoer',
+ "jisugameios":"jisu", 'spyxxjios':'sipu', 'mrgameios':'maoer'}
+
+ # 娌′紶鐨勮瘽榛樿鍜宎ppid涓�鏍�
+ spID = tdict.get(agentName, agentName)
+
accid = dataDict.get("accid", "")
if not accid:
return
@@ -128,7 +150,7 @@
return
# 杞寲涓烘父鎴忚处鍙�
- accid = "%s@%s@s%s"%(accid, agentName, sid)
+ accid = "%s@%s@s%s"%(accid, spID, sid)
dbController = CouponDB.GetDBEventCon()
if not dbController:
@@ -157,6 +179,39 @@
mylog.debug("common ok")
return SendGm(gmresult, pushurl)
+ #-----------寰俊鍟嗗煄----------------------
+ if codeStr.startswith('wx'):
+ operateID = GetOperateID(agentName)
+ if not operateID:
+ mylog.debug("wx no appid = %s"%agentName)
+ return
+ result, wxdata = dbController.find_one(CouponDB.CouponWXColName, {"code":codeStr, "operateid":operateID})
+ if not wxdata:
+ return
+
+ if int(wxdata['status']) == 1:
+ gmresult['status'] = 2
+ mylog.debug("wxcard used!")
+ return SendGm(gmresult, pushurl)
+
+ wxdata['status'] = 1
+ wxdata['accid'] = dataDict.get("accid", "") # 姝ゅ鐢ㄥ師濮嬭处鍙�
+ wxdata['usetime'] = str(datetime.datetime.today()).split(".")[0]
+
+ wxdata['appid'] = agentName
+ wxdata['serverid'] = 's%s'%sid
+ wxdata['roleid'] = dataDict.get("roleid", "")
+ wxdata['level'] = dataDict.get("level", "")
+ wxdata['viplevel'] = dataDict.get("viplevel", "")
+ if SendWXBill(wxdata, pushurl):
+ # 鍏呭�兼垚鍔�
+ dbController.update(CouponDB.CouponWXColName, {"code":codeStr, "operateid":operateID}, wxdata)
+ # 閫氱煡鍚庡彴璁板綍
+ SendDataCollectorBillInfo(wxdata, pushurl, operateID)
+ return
+
+
+ #-----------鎵归噺鍏戞崲鐮佸鐞�----------------------
result, data = dbController.find_one(CouponDB.CouponCodeColName + "_" + agentName, {"code":codeStr, "channel":agentName})
if not data:
@@ -321,3 +376,78 @@
return
+
+# 閫氳繃appid鎵惧埌杩愯惀鍟�
+def GetOperateID(appid):
+ appidDict = eval(ConfigIO.GetValue("Coupon", "appid_dict"))
+ for key, value in appidDict.items():
+ if appid in value:
+ return key
+ return ""
+
+
+
+# 寰俊鍏ュ彛鍏呭��
+def SendWXBill(wxdata, pushurl):
+ try:
+ billurl = "http://%s/api/exchange/index.php"%pushurl
+
+ post = {}
+ post['AccountID'] = wxdata['accid']
+ post['RegionName'] = wxdata['serverid']
+ post['OrderAmount'] = wxdata['money']
+ post['BillNO'] = wxdata['orderid']
+ post['OrderInfo'] = wxdata['orderinfo']
+ post['OperatorID'] = wxdata['appid']
+
+ key = ConfigIO.GetValue("Coupon", "key_%s"%post['OperatorID'])
+ # $sign=md5($AccountID.$OrderAmount.$BillNO.$RegionName.$key)
+ mylog.debug("appid = %s key = %s"%(post['OperatorID'], key))
+
+ sign = md5.md5(post['AccountID'] + str(post['OrderAmount']) + post['BillNO'] + post['RegionName'] + key).hexdigest()
+
+ post['Sign'] = sign
+ result = urllib2.urlopen(billurl, urllib.urlencode(post), 3)
+ resultDict = json.loads(result.read())
+
+ mylog.debug("resultDict = %s "%(resultDict))
+
+ if int(resultDict["errorcode"]) > 0:
+ return True
+ except Exception, e:
+ mylog.info("SendWXBill error %s"%e)
+ return False
+
+# 閫氱煡鍚庡彴鏁版嵁涓績璁板綍
+def SendDataCollectorBillInfo(wxdata, pushurl, operateID):
+ try:
+ billurl = "http://recharge.game.2460web.com:12000/api/notify/swwx"
+
+ post = {}
+ post['appid'] = wxdata['appid']
+ post['regionid'] = wxdata['serverid']
+ post['orderid'] = wxdata['orderid']
+ post['passport'] = wxdata['accid']
+ post['roleid'] = wxdata['roleid']
+ post['ordertitle'] = wxdata['ordertitle'].encode("UTF8")
+ post['orderinfo'] = wxdata['orderinfo']
+ post['money'] = wxdata['money']
+ post['ip'] = wxdata['ip']
+ post['level'] = wxdata['level']
+ post['viplevel'] = wxdata['viplevel']
+ post['time'] = int(time.time())
+
+ key = ConfigIO.GetValue("Coupon", "key_%s"%post['appid'])
+ #md5(appid=$appid®ionid=$regionid&passport=$passport&&money=$money&time=$time$app_secret)
+ signStr = "appid=%s®ionid=%s&passport=%s&money=%s&time=%s%s"%(\
+ post['appid'], post['regionid'], post['passport'], post['money'], post['time'], key)
+ sign = md5.md5(signStr).hexdigest()
+ #mylog.debug("SendDataCollectorBillInfo %s-%s-%s-%s"%(signStr, sign, key, post))
+ post['sign'] = sign
+ result = urllib2.urlopen(billurl +"?" + urllib.urlencode(post), timeout =3)
+ #mylog.debug("SendDataCollectorBillInfo result %s"%result.read())
+
+ except Exception, e:
+ mylog.debug("SendDataCollectorBillInfo error %s"%e)
+
+
--
Gitblit v1.8.0