Commit ee19a925c88254f689af1355b08fc4cc813bb40a

Authored by liujiqiang
1 parent d5b8359c

文件上传

commons/api/entranceFeeBillList.py
@@ -399,4 +399,4 @@ def do_payOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号" @@ -399,4 +399,4 @@ def do_payOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号"
399 print(aa.text) 399 print(aa.text)
400 return aa 400 return aa
401 401
402 -do_payOrder(attrValue="202108100900016")  
403 \ No newline at end of file 402 \ No newline at end of file
  403 +# do_payOrder(attrValue="202108100900016")
404 \ No newline at end of file 404 \ No newline at end of file
report/test.log
1 -[2021-08-10 15:28:58] [INFO] : ======================================================================================  
2 -[2021-08-10 15:28:58] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb  
3 -{'data': None, 'json': {'userName': 'sy_chen', 'password': 'VCXTzDLTCJoE5Ap1Eubd7jpUa+bMkJUS8pP0W6Rw2+gslSOnRoe+hUKXJvO9ZgN9Arg6fOSqYAMRd3M+GUn2A6BjJ8N8dkAmLhVFBy6niPkO9yS1yVnDOOIZuBXt51zT6t/XDulohPCs7D3UhkFupgyPunQrNYQWr0SDGm8h/EQ='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}} 1 +[2021-08-10 15:40:03] [INFO] : ======================================================================================
  2 +[2021-08-10 15:40:03] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  3 +{'data': None, 'json': {'userName': 'sy_chen', 'password': 'e5gw9dDaOPPEZkiK6zSJUURUHcHxUHrDwJEJhc1pD2mEJUFLgiMBIf1yRrsRPqHmztKH9eI6BE7MqxIJWFfHVjaVwPxyjd4bSUevO3IRZeKEphQfaiOVr28UMDTvi3EWvlhML8YJDe+syTlboul0mwDdLY940xVaOjuDrWOw6zU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
4 4
5 -[2021-08-10 15:28:59] [INFO] : ======================================================================================  
6 -[2021-08-10 15:28:59] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb  
7 -{'data': None, 'json': {'userName': 'sygangda', 'password': 'j0KGGo/lplX7i7ey1ejk+RFWiua+UVH+MhmhrC60YeNWiGEMxaaS4u5qtsLxllm68Z683sl/qG0HvVlq78CeD8VcYRN8MhEYkpkZ2w5aP/bK5T4wAmc/ZL4jrFWMe+KE1RRzJxZ2sONNJWObGpHx6KAn4b9nLq30PGIpmhLd4MA='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}} 5 +[2021-08-10 15:40:04] [INFO] : ======================================================================================
  6 +[2021-08-10 15:40:04] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  7 +{'data': None, 'json': {'userName': 'sygangda', 'password': 'UBxtkYEVDcwm4E6LPccZ7zoEbHtWWk2YVGkazHSADOQt3Bnsmlxrk8+WrVH6NdFcGXKdptdoWINzxpbaFsw++lAvxYjPMG/zRNh/FG1lj9Pyb4UrBqxfVXzh2vSU1QzqHam4yZTlbg3GAqHYQx9vwxVvHgr3SfSfodgFjq77frc='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
8 8
9 -[2021-08-10 15:28:59] [INFO] : ======================================================================================  
10 -[2021-08-10 15:28:59] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action  
11 -{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108100900016'} 9 +[2021-08-10 15:40:04] [INFO] : ======================================================================================
  10 +[2021-08-10 15:40:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
  11 +{"businessCode": "jmsf"}
12 {} 12 {}
13 13
14 -[2021-08-10 15:28:59] [INFO] : ======================================================================================  
15 -[2021-08-10 15:28:59] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3793.action  
16 -None 14 +[2021-08-10 15:40:04] [INFO] : ======================================================================================
  15 +[2021-08-10 15:40:04] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  16 +{"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
  17 +{}
  18 +
  19 +[2021-08-10 15:40:05] [INFO] : ======================================================================================
  20 +[2021-08-10 15:40:05] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
  21 +{"firmCode": "sy", "departmentId": 58, "keyword": ""}
  22 +{}
  23 +
  24 +[2021-08-10 15:40:05] [INFO] : ======================================================================================
  25 +[2021-08-10 15:40:05] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
  26 +{"pageNum": 100, "pageSize": 100, "marketId": 9}
17 {} 27 {}
18 28
19 -[2021-08-10 15:29:01] [INFO] : ======================================================================================  
20 -[2021-08-10 15:29:01] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426 29 +[2021-08-10 15:40:05] [INFO] : ======================================================================================
  30 +[2021-08-10 15:40:05] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
21 None 31 None
  32 +{'params': {'pid': 'goods_tag'}}
  33 +
  34 +[2021-08-10 15:40:05] [INFO] : ======================================================================================
  35 +[2021-08-10 15:40:05] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
  36 +{"province": "C", "city": null, "area": null}
22 {} 37 {}
23 38
24 -[2021-08-10 15:29:01] [INFO] : ======================================================================================  
25 -[2021-08-10 15:29:01] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州 39 +[2021-08-10 15:40:06] [INFO] : ======================================================================================
  40 +[2021-08-10 15:40:06] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  41 +None
  42 +{'params': {'keyword': ''}}
  43 +
  44 +[2021-08-10 15:40:06] [INFO] : ======================================================================================
  45 +[2021-08-10 15:40:06] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  46 +None
  47 +{'params': {'pid': 'prove_type'}}
  48 +
  49 +[2021-08-10 15:40:06] [INFO] : ======================================================================================
  50 +[2021-08-10 15:40:06] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
26 None 51 None
27 {} 52 {}
28 53
29 -[2021-08-10 15:29:01] [INFO] : ======================================================================================  
30 -[2021-08-10 15:29:01] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action  
31 -{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3793, 'goodsId': '3807', 'number': '202108100900016', 'modified': '2021-08-10 15:29:01', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00001', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1621', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '接车部', 'calcDepId': '103', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-10 15:28:37', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-10 15:28:37', 'tareWeightDate': '2021-08-10 15:28:37', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''} 54 +[2021-08-10 15:40:06] [INFO] : ======================================================================================
  55 +[2021-08-10 15:40:06] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
  56 +{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddB00001", "inGreeterId": 274, "inGreeterName": "\u901a\u7528\u6d4b\u8bd5", "productId": 14158, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 1621, "proveTypeName": "\u7eff\u8272\u852c\u83dc", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 353, "grossWeightDate": "2021-08-10 15:40:06", "newWeight": 20, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddB00001", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 103, "depName": "\u63a5\u8f66\u90e8", "cateId": 14158, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9002", "tradeTypeName": "\u6c88\u96332\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 71, "id": 0, "protocolId": null, "goodsTagId": 1900}
32 {} 57 {}
33 58
34 -[2021-08-10 15:29:02] [INFO] : ======================================================================================  
35 -[2021-08-10 15:29:02] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action  
36 -protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3793&goodsId=3807&number=202108100900016&modified=2021-08-10%2015%3A28%3A37&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=800&customerId=389&fundAccount=105847&ic=888810032426&customerName=%E9%95%BF%E6%AD%8C%E4%B9%B0%E5%AE%B6%E7%9C%81%E5%86%85%E5%95%8A%E5%95%8A%E5%95%8A%E5%98%BF&customerPhone=18011501258&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DB00001&autocomplete-cartype=003%28%E6%9D%BF%E8%BD%A6%29&carTypeName=%E6%9D%BF%E8%BD%A6&carTypeCode=003&carTypeId=53&carTypeWeight=333&storeTareWeight=&proveType=1621&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%8E%A5%E8%BD%A6%E9%83%A8&calcDepId=103&dep=103&regionName=&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=14158&productArea=%E9%87%8D%E5%BA%86%2C%E9%87%8D%E5%BA%86%E5%B8%82%2C%E4%B8%87%E5%B7%9E%E5%8C%BA&parentId=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-10%2015%3A28%3A37&remark=&goodsTagIds=1900&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-10%2015%3A28%3A37&tareWeightDate=2021-08-10%2015%3A28%3A37&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.00&billItems=%7B%22discount%22%3A500%2C%22id%22%3A103%2C%22name%22%3A%22%E4%BA%A4%E6%98%93%E7%AE%A1%E7%90%86%E8%B4%B9%22%2C%22receivable%22%3A1000%2C%22require%22%3A1%7D&billItemDicCheckIds=105&billItemsDic=%7B%22discount%22%3A0%2C%22id%22%3A105%2C%22name%22%3A%22%E4%BC%98%E6%83%A0%E6%94%B6%E8%B4%B9%22%2C%22receivable%22%3A500%2C%22require%22%3A0%7D&billItemCheckIds=106&106=3.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A106%2C%22name%22%3A%22%E6%A3%80%E6%B5%8B%E8%B4%B9%22%2C%22receivable%22%3A300%2C%22require%22%3A1%7D 59 +[2021-08-10 15:40:07] [INFO] : ======================================================================================
  60 +[2021-08-10 15:40:07] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
  61 +{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108100900022'}
37 {} 62 {}
38 63
testcase/test_listPage/test_listPage.py
@@ -34,4 +34,24 @@ class test_listPage(unittest.TestCase): @@ -34,4 +34,24 @@ class test_listPage(unittest.TestCase):
34 34
35 @classmethod 35 @classmethod
36 def tearDownClass(cls) -> None: 36 def tearDownClass(cls) -> None:
37 - pass  
38 \ No newline at end of file 37 \ No newline at end of file
  38 + pass
  39 +
  40 + def test_searchByNumber(self):
  41 + cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",
  42 + userName="ty_test",transactionName="沈阳2号",newWeight=20,
  43 + depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜")
  44 + number = cre_res.json()["data"]["number"]
  45 + resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
  46 + print(resListPage.json())
  47 + assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
  48 + assert len(resListPage.json()["rows"]) == 1,"按照收费单号查询失败"
  49 +
  50 + def test_searchByNumber(self):
  51 + cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",
  52 + userName="ty_test",transactionName="沈阳2号",newWeight=20,
  53 + depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜")
  54 + number = cre_res.json()["data"]["number"]
  55 + resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
  56 + print(resListPage.json())
  57 + assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
  58 + assert len(resListPage.json()["rows"]) == 1,"按照收费单号查询失败"
39 \ No newline at end of file 59 \ No newline at end of file