autotest / trading · Commits

Commit c7c22e903a3c9605cb89e7bdff3fc3932d30788f

Authored by wenleiming
2 parents 1e5dfa53 decaecea
build: skipped

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 2 changed files with 25 additions and 34 deletions
report/test.log
  View file @c7c22e9
1   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
2   -[2021-09-16 17:16:35] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
3   -[2021-09-16 17:16:35] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
4   -{'data': None, 'json': {'userName': '111222', 'password': 'GJF9Y9AdanTWF+hbokRZAZgzrJIwaWUOXHubBeHlCtWXj1/T64c5OfEMN09ZkWUiuMkq3Qfvfjkn4gzYCYq+iokyk/whaiSvHoAYYLTAAgmReMDcL/o60b6ItKesRocbuulvgFxS+3zD2SFsd+St/fjGKEuQurDHNj17ELYEYek='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
5   -
6   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
7   -[2021-09-16 17:16:35] [INFO] : http://test.uap.diligrp.com/login/login.action
8   -[2021-09-16 17:16:35] [INFO] : http://10.28.12.150:80/login/login.action
  1 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  2 +[2021-09-22 13:37:01] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  3 +[2021-09-22 13:37:01] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
  4 +{'data': None, 'json': {'userName': '111222', 'password': 'gb288Fow6PJ5qkTbXyWWUMRrlwpjHWKH51XfK9cfHzh0w06WItN3llZBKjI0YOrbuHHkeRG8vPdWprhV5GKHyXidhhksBF0FHSsNEvJC9mxCHsMDhoaNg9C1fCy4oCzJen2UrUPv3cZGXPy92ikh8K78lN2U0nv3oMb/KO6tnzY='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
  5 +
  6 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  7 +[2021-09-22 13:37:01] [INFO] : http://test.uap.diligrp.com/login/login.action
  8 +[2021-09-22 13:37:01] [INFO] : http://10.28.12.150:80/login/login.action
9 9 {'data': b'userName=111222&password=111111', 'json': None, 'headers': {'Host': 'test.uap.diligrp.com', 'Connection': 'keep-alive', 'Content-Length': '33', 'Cache-Control': 'max-age=0', 'Upgrade-Insecure-Requests': '1', 'Origin': 'http://test.uap.diligrp.com', 'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': 'Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/90.0.4430.212Safari/537.36', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9', 'Referer': 'http://test.uap.diligrp.com/login/index.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7', 'Cookie': 'UAP_accessToken=;UAP_refreshToken=;UAP_loginPath='}, 'allow_redirects': False}
10 10  
11   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
12   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
  11 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  12 +[2021-09-22 13:37:01] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
13 13 {"marketId": 15, "businessType": "501"}
14 14 {}
15 15  
16   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
17   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
  16 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  17 +[2021-09-22 13:37:01] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
18 18 None
19 19 {'params': {'cardNo': '210916163820'}}
20 20  
21   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
22   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  21 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  22 +[2021-09-22 13:37:01] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
23 23 {"marketId": 15, "keyword": "\u8461\u8404", "state": 1}
24 24 {}
25 25  
26   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
27   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
  26 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  27 +[2021-09-22 13:37:01] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
28 28 {"allLevelKeyword": "\u4e07\u5dde"}
29 29 {}
30 30  
31   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
32   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
  31 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  32 +[2021-09-22 13:37:01] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
33 33 {"marketId": 15, "nameLike": "\u897f\u533a"}
34 34 {}
35 35  
36   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
37   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
  36 +[2021-09-22 13:37:01] [INFO] : ======================================================================================
  37 +[2021-09-22 13:37:01] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
38 38 {"businessType": "501", "chargeItem": 518, "marketId": 15}
39 39 {}
40 40  
41   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
42   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
  41 +[2021-09-22 13:37:02] [INFO] : ======================================================================================
  42 +[2021-09-22 13:37:02] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
43 43 {"businessType": "501", "chargeItem": 520, "marketId": 15}
44 44 {}
45 45  
46   -[2021-09-16 17:16:35] [INFO] : ======================================================================================
47   -[2021-09-16 17:16:35] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
  46 +[2021-09-22 13:37:02] [INFO] : ======================================================================================
  47 +[2021-09-22 13:37:02] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
48 48 {"accountId": 108073, "cardNo": "210916163820", "customerId": 142047, "customerCode": "00131749", "customerName": "\u6d4b\u8bd5\u957f\u6b4c\u554a", "fixedphoneNumber": null, "mobilephoneNumber": "18080008055", "identityCardAddress": "", "identityCardNo": "110101200803070875", "identityCardType": "ID", "registerDetailDtoList": [{"id": 0, "areaId": 272, "areaName": "\u897f\u533a", "quantity": 0, "productId": 754107, "registerRecordId": 0, "remark": null, "weight": 100, "weightType": 0, "created": null, "createdById": 0, "createdByName": null, "createdByDepartmentId": 0, "createdByDepartmentName": null, "registerCertificateList": null, "product": null, "registerCertificateDtoList": null, "productDto": {"id": 0, "originId": 500101, "originName": "\u4e07\u5dde\u533a", "pieceWeight": 0, "categoryId": 754107, "categoryCode": 754107, "categoryName": "\u8461\u8404", "created": null}}], "registerFeeDtoList": [{"id": 0, "actualFee": 200, "receivableFee": 1300, "discountFee": 1100, "registerRecordId": 0, "payStatus": 0, "chargeItemName": "\u5176\u4ed6\u6536\u8d39", "chargeType": 1, "chargeItemId": 518, "registerFeeType": 999, "created": null, "createdById": 0, "createdByName": null, "settleDate": null, "isBehalf": 0, "registerLoadingFeeExtDto": null}], "tradePassword": "111111"}
49 49 {}
50 50  
51   -[2021-09-16 17:16:36] [INFO] : ======================================================================================
52   -[2021-09-16 17:16:36] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/settle/changeBatchCodeState
53   -{"batchCode": "2109000475", "state": "2"}
54   -{}
55   -
56   -[2021-09-16 17:16:37] [INFO] : ======================================================================================
57   -[2021-09-16 17:16:37] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/settle/query
58   -None
59   -{'params': {'batchCode': '2109000475'}}
60   -
... ...
testcase/hg/test_batchSettlement/test_batchSettlement.py
  View file @c7c22e9
... ... @@ -68,6 +68,7 @@ class test_batch(unittest.TestCase):
68 68 print(resBatchCode.json())
69 69 batchCode = resBatchCode.json()["data"]["batchCode"]
70 70 print("test_searchState_1 --> self.batchCode:", batchCode)
  71 + print("123123")
71 72 # # 变更交易状态
72 73 # resCAT = sellingGoods.doCreateAndTrade(session=session,host=self.gatewayHost,batchCode=batchCode,
73 74 # ic=self.ic_buyer,posCode=posCode)
... ...