new html

blueprints/KeyData

@@ -16,7 +16,7 @@ term = 6
 amount = 10000
 productid = 1
 repaymenttype = 微信
-bancode = {'ICBC':'62220202','PINGAN':'62229848'}
+bancode = {'ICBC':'62220202'}
 terms = [1,2,3,6,9,12]
 amounts = [2000,4000,6000,10000,20000,30000]
 productids = [1,4]
@@ -33,23 +33,23 @@ applyno = AN000000143573824630185984
 password = 123456aaa
 biztype = 0
 token = eb298e58-b438-4437-ab29-70973e7210a2
-passportapitoken = 87ff232a-d8bd-427d-9455-43e41146703a
+passportapitoken = a78e9038-92e6-46a3-a66e-309edf189019
 opapitoken = 5375b6c5-527e-4c3a-8c66-b9ef96a7412d
 cardnoprovider = ICBC
 apitoken = 87ff232a-d8bd-427d-9455-43e41146703a
 mapitoken = ddf2c21774ea6741f278a7b7172dbe9a3dd7
 quotarecordorderno = {'msg': None, 'code': '0000', 'data': []}
 hetongtoken = 190db434e2e91c21086623c0b7cc22af
-cardno = 6222020206041670466
+cardno = 6222020230273986330
 msgtoken = {token}
 sceneid = 5
-deadline = 1589787429000
-paymenttoken = ff928a66-15f2-444f-852a-e4cff2a508e5
+deadline = 1589801844000
+paymenttoken = 62979fec-b060-4b0f-85b8-d01691b5b9e1
 requestid = 63119890137088
 vcode = 238345
 applyno = AN000000143183669801000960
 voicetoken = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1ODgxNTE1OTgsInVzZXJuYW1lIjoidHgueHlxYiJ9.W4fKn-tdbOORELBfUd6KOjrygjzWWFY0zf6dmcqsjiI
-logindata = None
+logindata = phone=18801012591
 
 [testsuit]
 cases_numbertemp = [{'passportapi':[816,817,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,574,575,577,576,368,371,372,374,375,376,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 392,389, 390, 394, 395, 396, 397]}]
@@ -57,7 +57,7 @@ cases_number1 = [358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,4
 case_number_fengkong = [509, 510, 511, 512, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549]
 case_number3 = [358, 359, 360,323,382, 383,399, 385,407,367,368,371,372,374,375,376,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 392,389, 390, 394, 395, 396, 397]
 case_number_usercenter = [504, 494, 508,479, 477, 498, 476, 499, 495, 483, 505, 488, 471, 502, 484, 492, 493,  503, 470, 489, 473, 490, 486, 500, 501, 487, 491, 472, 496, 480, 506, 475, 474, 507, 481, 497, 478,482,485]
-person_test_number = case_number_sidecar
+person_test_number = case_number_payment
 cases_number_temp = [358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,368]
 case_number_33 = [358, 359, 360,323,383,385,399,367,372,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 389, 390, 394, 395, 396, 397]
 case_number_newhetong = [416, 420, 421, 417, 426, 427, 431, 424, 432, 428, 425, 414, 422, 418, 419, 423, 415]
@@ -68,7 +68,7 @@ case_number_zijin = [517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528,
 case_number_zijintemp = [{'zijin': [517, 518, 519, 520, 521, 523, 524, 525, 526, 527, 529, 530, 531, 532, 533, 534, 535, 550, 551, 552, 553, 554, 555, 556, 557, 562, 579, 580, 581, 587, 588, 640, 641, 642, 727, 728, 729, 730, 731, 745, 746, 747]}]
 case_number_account = [{'account':[594, 598, 599, 604, 605, 606, 686, 687, 696,721]}]
 case_number_configuration_center = [{'configuration_center':[590, 591, 592, 681, 682, 683,814,815]}]
-case_number_payment = [{'passportapi':[323,382,383,384]},{'payment':[565, 566, 607, 608, 609, 610, 611, 652, 688, 716, 743, 744, 762, 763, 764]}]
+case_number_payment = [{'passportapi':[323,382,383,384]},{'payment':[565, 566, 607, 608, 609, 610, 611, 652, 688, 716, 743, 744, 762, 763, 764, 819,834, 831, 833,832]}]
 case_number_risk = [{'risk':[643, 644, 645, 646, 647, 648, 649, 650, 651, 654, 717, 718, 719, 720]}]
 case_number_trade = [{'trade':[617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 689, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744]}]
 case_number_zhongtai_hetong = [{'zhongtai_hetong':[277, 684, 711, 713, 811, 812, 813]}]
@@ -85,5 +85,5 @@ case_number_case_fengkong = [{'koala_risk':[699]},{'usercenter':[500]},{'risk':[
 case_number_case_fangkuan = [{'ka_koala_loan':[801,818,802,798,799,800,820]}]
 
 [sqldata]
-sqldata = [64, '14']
+sqldata = ['6222020234701809463', '6222800007291022938', '6222800007438754336', '6222000003436617201', '6222800002393783578', '6222000001862553460', '6222020221310214650', '6222020247453948818', '6222020222273103940', '6222020234701809463', '6222020243969697839', '6222020244828238910', '6222020234701809463', '6222020241761813559', '6222984827650227', '6222984827650437', '6222020234701809463', '6222020234701809463', '6222986928006526', '6222020258629127881', '6222020230427672215', '6222020243140726451', '6222020234701809463', '6222020248066509138', '6222020230198257445', '6222020244580838957', '6222800008789891438', '6214830110386975', '6214830110386976', '6222800007525616851', '6222986928006526', '6222020230273986330', '6222020248269209912', '6222020234701809463', '6222020234701809463', '6222020234701809463', '6222020247877570170', '6222020267634108853', '6222980657818946', '6217005814863930197', '6222020235808441998', '6222020234445722390', '6222020240492096864', '6222988829174825', '6222020243457719151', '6222020222435861837', '6222989171771366', '6222800004648482337', '6222800007828007774', '6222988016372562', '6217001491079512228', '6222020218007326557', '6222020226591933817', '6222020227045568996', '6222020230599467450', '6222020234954443306', '6222020218004048926', '6222020222354776183', '6222020235430472625', '6222020235519733869', '6222020250204390523']
 

blueprints/exec-temp.py

@@ -169,7 +169,7 @@ if __name__ == '__main__':
     # 串流程
     name='ka_koala_repay'
     # name='case_fangkuan'
-    name='sidecar'
+    name='payment'
 
     # ############
 

blueprints/requestResult.py

@@ -33,7 +33,14 @@ class requestResult:
 
         self.keydata = rwKeyData(config)
         #setGloablValue(self.keydata,self.casefile)
-        self.casefile=deal_globalParam(self.config,self.casefile)
+
+        try:
+            setup_step(self.casefile)
+            self.casefile = deal_globalParam(self.config, self.casefile)
+        except:
+            self.casefile = deal_globalParam(self.config, self.casefile)
+            setup_step(self.casefile)
+
         #print('*****',self.casefile)
         self.casefilename=casefile
         self.namespace=self.config.namespace
@@ -41,7 +48,7 @@ class requestResult:
         self.baseSleepTime=self.keydata.readKeyData('baseinfo','defaluttime') or 2
         self.timeout=int(self.keydata.readKeyData('baseinfo','timeout')) or 20
         self.keydata.deleteKeyData('circleData')
-        setup_step(self.casefile)
+
 
 
     def person_timeout(self):
@@ -689,7 +696,7 @@ if __name__ == '__main__':
     cases_number= [323, 382, 383, 384, 385,361, 402, 403, 404, 405]
     cases_number=[786]
     cases_number = [445]
-    cases_number=[523]
+    cases_number=[611]
 
     #cases_number = [369,370,409,373]
     #cases_number=[358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,368,371,372,374,375,376,378,363,364,369,370]
@@ -697,7 +704,7 @@ if __name__ == '__main__':
     #casefile = [{'passportapi':['323.json', '382.json','383.json', '384.json', '385.json']},{'payment': t.split(',')}]
 
 
-    casefile =[{'zijin': t.split(',')}]
+    casefile =[{'payment': t.split(',')}]
 
 
     #casefile = [{'ka_koala_repay': t.split(',')}]

blueprints/tools/dealScene.py

@@ -11,7 +11,7 @@ from blueprints.tools.dealCasefile import readCaseFile
 from blueprints.settings import config,qa3Config
 from blueprints.tools.rwKeyData import rwKeyData
 
-def dealScene(config,cases,houzhui="json",nostatus=["notfinfish","skip","noexec","notfinish"]):
+def dealScene(config,cases,houzhui="json",nostatus=["notfinfish","skip","noexec","notfinish","notexec"]):
 
     '''
 

blueprints/tools/deals.py

@@ -186,7 +186,7 @@ if __name__ == '__main__':
     #print(t)
 
     tt=[]
-    t='/Users/dm/Desktop/python_script/autoInterface/testCase/msg'
+    t='/Users/dm/Desktop/python_script/autoInterface/testCase/payment'
 
     for i in os.listdir(t):
 

blueprints/tools/zentaopms_cases.py

@@ -257,8 +257,6 @@ def zentaopms_data(panda_name,projectId,psid):
 if __name__ == "__main__":
 
 
-
-
     #names=['ka_koala_repay','koala_risk','ka_koala_loan','trade']
     # names = ['risk']
     names=['zhongtai_hetong','msg','configuration_center','payment']

testCase/configuration_center/814.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/configuration_center/815.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/msg/808.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/809.json

@@ -15,4 +15,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/payment/565.json

@@ -31,4 +31,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/566.json

@@ -23,4 +23,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/607.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/608.json

@@ -24,4 +24,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/609.json

@@ -3,7 +3,7 @@
     "commit": "无验证码还款(POST)",
     "url": "/ex/common/repay/direct",
     "casename": "token",
-    "sql": "select r.`amount`,r.`merchant_order_no`,r.`merchant_repay_order_no`,r.`card_no`,r.`uid`,r.`repayment_description`, r.`business_flow_no`\r\nfrom `payment_center`.`repay_order` r\r\ninner join xyqb_user.user u\r\non r.uid=u.id\r\norder by rand() limit 1;",
+    "sql": "select r.`amount`,r.`merchant_order_no`,r.`merchant_repay_order_no`,r.`card_no`,r.`uid`,r.`repayment_description`, r.`business_flow_no`\r\nfrom `payment_center`.`repay_order` r\r\ninner join xyqb_user.user u\r\non r.uid=u.id where r.repay_status=0\r\norder by rand() limit 1;",
     "db": "xyqb_user",
     "result": {
         "code": "0"
@@ -34,4 +34,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/610.json

@@ -32,4 +32,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/611.json

@@ -3,7 +3,7 @@
     "commit": "自动代扣-必选项(POST)",
     "url": "/ex/auto/repay",
     "casename": "token",
-    "sql": "select c.user_id,c.monthly_repayment,c.loan_application_history_id,a.call_flow_no,'10002','测试',h.business_flow_no\r\nfrom payment_center.pay_channel_order a \r\njoin xyqb.repayment_plan b on a.user_id =b.user_id \r\njoin xyqb.loan_application_manifest_history c on a.user_id=c.user_id\r\njoin xyqb_user.user_detail d on a.user_id=d.user_id\r\njoin xyqb_user.user e on e.id=a.user_id\r\njoin payment_center.user f on f.uuid=e.uuid\r\njoin  payment_center.bank_card g on f.id=g.user_id \r\njoin xyqb.pay_order h on e.id=h.user_id\r\njoin contract.contracts i on i.user_id=e.id\r\njoin xyqb.loan_application_history j on j.id=c.loan_application_history_id\r\norder by rand() limit 1;",
+    "sql": "select distinct c.user_id,c.monthly_repayment,c.loan_application_history_id,a.call_flow_no,'10002','测试',h.business_flow_no,hh.id,f.id\r\nfrom payment_center.pay_channel_order a \r\njoin xyqb.repayment_plan b on a.user_id =b.user_id \r\njoin xyqb.loan_application_manifest_history c on a.user_id=c.user_id\r\njoin xyqb_user.user_detail d on a.user_id=d.user_id\r\njoin xyqb_user.user e on e.id=a.user_id\r\njoin payment_center.user f on f.uuid=e.uuid\r\njoin  payment_center.bank_card g on f.id=g.user_id \r\njoin xyqb.pay_order h on e.id=h.user_id\r\njoin payment_center.merchant_card_rel  hh on hh.user_id=f.id and hh.card_bind_id=g.id\r\njoin payment_center.bank_card_info hhh on hhh.user_id=f.id\r\njoin contract.contracts i on i.user_id=e.id\r\njoin xyqb.loan_application_history j on j.id=c.loan_application_history_id\r\nwhere hh.merchant_id=10005  order by rand() limit 1;",
     "db": "xyqb_user",
     "result": {
         "code": "0"
@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/652.json

@@ -5,6 +5,7 @@
     "casename": "token",
     "sql": "select r.`amount`,r.`merchant_order_no`,r.`merchant_repay_order_no`,r.`card_no`,r.`uid`,r.`repayment_description`, r.`business_flow_no`\r\nfrom `payment_center`.`repay_order` r\r\ninner join xyqb_user.user u\r\non r.uid=u.id\r\norder by rand() limit 1;",
     "db": "xyqb_user",
+    "status": "notexec",
     "result": {
         "code": "0"
     },
@@ -34,4 +35,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/688.json

@@ -16,4 +16,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/716.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/743.json

@@ -16,4 +16,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/744.json

@@ -16,4 +16,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/763.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/764.json

@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/819.json

@@ -13,9 +13,9 @@
     "type": "payment",
     "param": {
         "merchantId": "%s",
-        "bizType": "%s"
+        "bizType": "2"
     },
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/payment/831.json

+{
+    "method": "GET",
+    "commit": "根据卡号获取银行卡信息(GET)",
+    "url": "/ex/common/card/query_card",
+    "casename": "token",
+    "sql": "select card_no from payment_center.bank_card_info order by rand() limit 1;",
+    "db": "xyqb_user",
+    "result": {
+        "code": "0",
+        "notmustexist": "['code', 'businessCode', 'success', 'bankName', 'bankCode', 'cardNo', 'cardType']",
+        "bankCode": "select bank_code from payment_center.bank_card_info where card_no={{sqldata_0}}"
+    },
+    "type": "payment",
+    "param": {
+        "cardNo": "%s"
+    },
+    "header": {
+        "Content-Type": "application/x-www-form-urlencoded"
+    }
+}

testCase/payment/832.json

+{
+    "method": "POST",
+    "commit": "api绑卡短验确认(POST)",
+    "url": "/ex/common/card/sms_confirm",
+    "casename": "token",
+    "sql": " select card_no from payment_center.bank_card_info;",
+    "db": "msg",
+    "result": {
+        "code": "0",
+        "mustexist": "['data', 'bankCardId']",
+        "notmustexist": "['code', 'businessCode', 'success']"
+    },
+    "type": "payment",
+    "body": {
+        "cardNo": "%s",
+        "requestId": "1",
+        "validateCode": "000000"
+    },
+    "header": {
+        "Content-Type": "application/json"
+    }
+}

testCase/payment/833.json

+{
+    "method": "POST",
+    "commit": "api绑卡发短验(POST)",
+    "url": "/ex/common/card/bind_card/request",
+    "casename": "token",
+    "sql": "select b.phone_no,64,a.user_id,a.order_no,a.uuid from xyqb.apply_quota_record a \r\njoin xyqb_user.user b on a.uuid=b.uuid\r\njoin xyqb_user.user_detail c on c.user_id=b.id\r\norder by rand() limit 1;",
+    "db": "msg",
+    "result": {
+        "code": "0",
+        "notmustexist": "['code', 'businessCode', 'success']"
+    },
+    "type": "payment",
+    "setup": {
+        "a": "fakeinfo('cardNo',flag=0)"
+    },
+    "body": {
+        "requestId": "1",
+        "bankCode": "{{cardnoprovider}}",
+        "cardNo": "{{cardno}}",
+        "preservePhoneNo": "%s",
+        "province": "北京",
+        "city": "北京",
+        "channel": "%s",
+        "userId": "%s",
+        "orderNo": "%s",
+        "uuid": "%s"
+    },
+    "header": {
+        "Content-Type": "application/json"
+    }
+}

testCase/payment/834.json

+{
+    "method": "GET",
+    "commit": "获取支持的银行列表-1(GET)",
+    "url": "/ex/common_bank_card/bank_info",
+    "casename": "token",
+    "sql": "select  merchant_id,biz_type from payment_center.merchant_channel_config where is_active=1 order by rand() limit 1; ",
+    "db": "xyqb_user",
+    "result": {
+        "code": "0",
+        "mustexist": "['bankName', 'bankCode']",
+        "notmustexist": "['msg', 'code', 'businessCode', 'success']"
+    },
+    "type": "payment",
+    "param": {
+        "merchantId": "%s",
+        "bizType": "1"
+    },
+    "header": {
+        "Content-Type": "application/x-www-form-urlencoded"
+    }
+}

testCase/zhongtai_hetong/811.json

@@ -20,4 +20,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/zhongtai_hetong/812.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/zhongtai_hetong/813.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file