修改

addons/elife/OfpayHelper.py

@@ -61,12 +61,13 @@ def seconds_to_beijing_time(seconds):
     return formatted_time;
 
 class OfpayHelper:
+
     order_simple_data = {
         "awardId": "W1155090378949787660",
         "activityId": "A923605206137307136",
         "activityName": "采集",
         "activityState": "2",
-        "activityStartTime": "2024-01-01 00:00",
+        "activityStartTime": "2022-01-01 00:00",
         "activityEndTime": "2888-12-31 23:59",
         "businessType": "4005",
         "outActivityCode": "eCoffee",
@@ -74,7 +75,7 @@ class OfpayHelper:
         "prizeId": "sku14117",
         "prizeName": "数据采集成功",
         "prizeAlias": "",
-        "prizeDesc": None,
+        "prizeDesc": "",
         "prizeDescUrl": "https://mstatic.ofpay.com/marketing/upload/ca2ed3a05b2846b7909debf2df8e3495.png",
         "prizeBannerUrl": "https://mstatic.ofpay.com/marketing/upload/c4d1a0b94b50462eb0f040306a9badf4.png",
         "categoryId": "1",
@@ -82,8 +83,8 @@ class OfpayHelper:
         "goodsScene": "0",
         "goodsList": [],
         "orderNum": 1,
-        "createTime": None,
-        "imgUrl": "https://mstatic.ofpay.com/marketing/upload/7e21faea6ba94379bf16968c246cb044.png",
+        "createTime": "",
+        "imgUrl": "https://mstatic.ofpay.com/marketing/upload/fc0cc0a86db64f638d4e193913d7efea.png",
         "orderStatus": "3",
         "detailId": "T123456789",
         "clientAccount": "13430389115",
@@ -91,27 +92,27 @@ class OfpayHelper:
         "redeemCodeStatus": "",
         "dynamicCodeSign": "1",
         "startEffectTime": "",
-        "endEffectTime": None,
+        "endEffectTime": "",
         "toExpireFlag": "0",
         "faceVal": "",
-        "orderId": "T240226090160697",
+        "orderId": "T240311090006428",
         "tenantId": "0000000191",
-        "price": "",
-        "awardPrice": "0.0",
-        "salePrice": "0.0",
-        "rechargeId": "R1211608194317672448",
+        "price": "30",
+        "awardPrice": "20.8",
+        "salePrice": "20.8",
+        "rechargeId": "R1216679598197055488",
         "rechargeTime": "2024-01-01 00:00:00",
         "payStatus": "2",
         "discountPrice": "",
         "activityPrice": "",
-        "customerInfo": "{\"device_id\":\"D29ED082-549A-4882-98FC-8BB881D1552B\",\"loginType\":\"interactiveIGoChoose\",\"gameAccount\":\"13430389115\",\"city_code\":\"440100\",\"cisno\":\"ZbHv0CEM2cGjx0DB9DXVJg==\",\"isNewUser\":\"0\",\"marketId\":\"M923156289016692736\",\"city_name\":\"广州市\",\"phone\":\"13430389115\",\"fromEntry\":\"APP\",\"currentTimeMillis\":\"1709515975349\",\"userUuid\":\"Pfd6kjTSmjCfQ8boswe1PpAmfgZW0acz\",\"cust_id\":\"Pfd6kjTSmjCfQ8boswe1PpAmfgZW0acz\",\"invitationCode\":\"BGCKWC\"}",
+        "customerInfo": "{\"device_id\":\"D29ED082-549A-4882-98FC-8BB881D1552B\",\"loginType\":\"interactiveIGoChoose\",\"gameAccount\":\"13430389115\",\"city_code\":\"440100\",\"cisno\":\"ZbHv0CEM2cGjx0DB9DXVJg==\",\"isNewUser\":\"0\",\"marketId\":\"M923156289016692736\",\"city_name\":\"广州市\",\"phone\":\"13430389115\",\"fromEntry\":\"APP\",\"currentTimeMillis\":\"1710119786257\",\"userUuid\":\"Pfd6kjTSmjCfQ8boswe1PpAmfgZW0acz\",\"cust_id\":\"Pfd6kjTSmjCfQ8boswe1PpAmfgZW0acz\",\"invitationCode\":\"BGCKWC\"}",
         "callbackOrder": "",
         "activityRechargeEffectStartTime": "",
         "activityRechargeEffectEndTime": "",
         "accountType": "",
         "payFlag": "1",
         "activityPayFlag": True,
-        "thirdInfo": "{\"faceValue\":\"20.00\",\"customGatewayId\":\"ZDY_ICBC_NJFH\",\"showSign\":\"1\",\"xcxShowSign\":\"2\",\"order\":\"24\",\"toBPrice\":\"19.20\",\"appId\":\"gh_58e6ebeaa1ea\",\"showFlag\":\"eCoffee-Tims\",\"showPhone\":\"1\",\"pointActivity\":\"HD046012y3VGiMMHzP\",\"stockShowSign\":\"2\"}",
+        "thirdInfo": "{\"faceValue\":\"30.00\",\"customGatewayId\":\"ZDY_ICBC_ZJWN\",\"showSign\":\"1\",\"xcxShowSign\":\"2\",\"order\":\"28\",\"toBPrice\":\"30.00\",\"showPhone\":\"1\",\"pointActivity\":\"HD0460132E7oLMG1mH\",\"stockShowSign\":\"2\"}",
         "vendorVoucher": "",
         "productUseMsg": "",
         "proof": "",
@@ -421,6 +422,8 @@ class OfpayHelper:
         simple_data['prizeDesc'] = capture_code;
         simple_data['createTime'] = create_time;
         simple_data['endEffectTime'] = create_time;
+        # simple_data['rechargeTime'] = create_time;
+
         simple_data['clientAccount'] = clientAccount;
 
         rsp_params = json.loads(response.get_text());
@@ -432,6 +435,8 @@ class OfpayHelper:
         sign_time = seconds_to_beijing_time(payload['iat']);
         expire_time = seconds_to_beijing_time(payload['exp']);
         simple_data['createTime'] = expire_time;
+        simple_data['endEffectTime'] = expire_time;
+        # simple_data['rechargeTime'] = expire_time;
 
         sql_query = f'''
             CALL UpdateElifeAccountData(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s);