autotest / jmsf-re · Commits

Commit 54a3656b41f8b6929e10cddd7b3b44b7f7773f42

Authored by liujiqiang
1 parent 385104a9
build: skipped

增加市场普适性

Inline Side-by-side
Showing 5 changed files with 77 additions and 70 deletions
commons/api/entranceFeeBillList/entranceFeeBillList.py
  View file @54a3656
... ... @@ -240,7 +240,7 @@ def do_doPay(host="",autocompletecartype=None,fee_str="",**kwargs):
240 240 "levelType": "", "originId": "{originId}", "tradeTypeId": "{tradeTypeId}",
241 241 "chargeTotalAmount": "{totalMoney}", "chargeTotalAmountYuan": "{chargeTotalAmountYuan}",
242 242 "freezeMoneySymbol": "{chargeTotalAmountYuan}", "comparisonFreezeAmount": "{chargeTotalAmountYuan}",
243   - "created": "{created}", "remark": "", "goodsTagIds": "{goodsTagIds}", "marketFlag": "{firmCode}",
  243 + "created": "{created}", "remark": "", "goodsTagIds": "", "marketFlag": "{firmCode}",
244 244 "totalMoney": "{totalMoney}", "receivable": "{receivable}", "collectionPrice": "{discountAmount}",
245 245 "discountAmount": "{discountAmount}", "handReceivableAmount": "{handReceivableAmount}",
246 246 "itemReceivableAmount": "{receivable}", "correctDiscount": "{correctDiscount}", "shareRatio": "0",
... ... @@ -252,6 +252,12 @@ def do_doPay(host="",autocompletecartype=None,fee_str="",**kwargs):
252 252 "shipperPhone": "", "feeDepName": "", "calcFeeDepId": "", "feeDepId": "","accountId":""}
253 253 data["autocomplete-cartype"] = autocompletecartype
254 254 data = dict(data, **kwargs)
  255 +
  256 + # 当模板没有配置货物标签时，参数不能传递货物标签所以需要删除
  257 + if kwargs["goodsTagIds"] =="":
  258 + del kwargs["goodsTagIds"]
  259 + del data["goodsTagIds"]
  260 +
255 261 data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
256 262 print("================开始请求================")
257 263 res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
... ... @@ -273,6 +279,8 @@ def do_payOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号"
273 279  
274 280 # 正则取值
275 281 regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
  282 + regionName=re.findall('" bind-name="(.*?)" bind-index', resOrderDetails.text)[0]
  283 + print("regionName",regionName)
276 284  
277 285 # bs取值
278 286 orderDetailsList = BeautifulSoup(resOrderDetails.text, "html.parser").findAll("input")
... ... @@ -286,11 +294,17 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
286 294 correctInfo = orderDetailsDict["correctInfo"]
287 295 weightType = orderDetailsDict["weightType"]
288 296 correctDiscount = orderDetailsDict["correctDiscount"]
289   - goodsTagIds = orderDetailsDict["goodsTagIds"]
  297 +
  298 + # goodsTagIds = orderDetailsDict["goodsTagIds"]
  299 + # 货物标签特别判断
  300 + if "goodsTagIds" in orderDetailsDict.keys():
  301 + goodsTagIds = orderDetailsDict["goodsTagIds"]
  302 + else:
  303 + goodsTagIds = ""
  304 +
290 305 sumPrice = orderDetailsDict["sumPrice"]
291 306 tradeTypeId = orderDetailsDict["tradeTypeId"]
292 307 shareRatio = orderDetailsDict["shareRatio"]
293   - regionName=orderDetailsDict["regionName"]
294 308 plate = orderDetailsDict["plate"]
295 309 carTypeName = orderDetailsDict["carTypeName"]
296 310 carTypeCode = orderDetailsDict["carTypeCode"]
... ... @@ -325,16 +339,18 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
325 339  
326 340 # 省市区获取
327 341 res = get_city(host=host, name="万州")
328   - print(res.text)
  342 + print('res.json()["suggestions"]',res.json()["suggestions"])
329 343 originId = res.json()["suggestions"][0]["id"]
330   - # parentId = res.json()["suggestions"][0]["parentId"]
331   - # value = res.json()["suggestions"][0]["value"]
  344 + parentId = res.json()["suggestions"][0]["parentId"]
  345 + productArea = res.json()["suggestions"][0]["value"]
332 346  
333 347 # # 获取缴费金额
334 348 autocompletecartype = f"{carTypeCode}({carTypeName})"
335 349 print(autocompletecartype)
336 350 modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
337 351  
  352 + print("categoryId",categoryId)
  353 +
338 354 # 获取缴费金额
339 355 res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
340 356 weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
... ... @@ -407,9 +423,9 @@ def do_payOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号&quot;
407 423 collectionPrice=collectionPrice, discountAmount=discountAmount,
408 424 handReceivableAmount=handReceivableAmount,
409 425 itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
410   - categoryName=categoryName,
411   - categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
412   - sumPrice=sumPrice,
  426 + categoryName=categoryName,inGreeterName=inGreeterName,inGreeterId=inGreeterId,
  427 + categoryId=categoryId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
  428 + sumPrice=sumPrice,parentId=parentId,
413 429 chargeTotalAmountYuan=chargeTotalAmountYuan)
414 430  
415 431 print(aa.text)
... ...
commons/api/zcApi.py
  View file @54a3656
... ... @@ -14,7 +14,7 @@
14 14 import json,time,random
15 15 from commons.scripts import dealContentType as dct
16 16 from commons.MySession import my
17   -from commons.basic.getLookupList import get_templateAttr as gTA
  17 +from commons.basic import getLookupList as gLL
18 18  
19 19  
20 20 def get_carType(host="",**kwargs):
... ... @@ -198,7 +198,7 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
198 198 """
199 199  
200 200 """
201   - templateAttr_list = gTA(host=host)
  201 + templateAttr_list = gLL.get_templateAttr(host=host)
202 202 print(templateAttr_list)
203 203 # 获取车型
204 204 if "车型" in templateAttr_list:
... ... @@ -233,7 +233,11 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
233 233  
234 234 # 获取接车员信息
235 235 if "进门接车员" in templateAttr_list:
236   - listByExample = get_listByExample(host=host)
  236 + print('my.userInfo["data"]["user"]', my.userInfo["data"]["user"])
  237 + firmCode = my.userInfo["data"]["user"]["firmCode"]
  238 + departmentId = my.userInfo["data"]["user"]["departmentId"]
  239 + listByExample = get_listByExample(host=host,firmCode=firmCode,departmentId=departmentId)
  240 + print("listByExample",listByExample.json())
237 241 if userName == None:
238 242 listByExampleIndex = 0
239 243 else:
... ... @@ -285,8 +289,9 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
285 289 originCode = ""
286 290  
287 291 # 查询部门信息
288   - if "接车部门" in templateAttr_list:
  292 + if "接车部门" in templateAttr_list or "收费部门" in templateAttr_list:
289 293 depRes = get_dep(host=host)
  294 + print("depRes",depRes.json())
290 295 if depName == None:
291 296 depResIndex = 0
292 297 else:
... ...
commons/scripts/readConf.py
  View file @54a3656
... ... @@ -19,7 +19,7 @@ class readConfig(object):
19 19 # 按市场读取配置文件数据
20 20 self.conf = configparser.ConfigParser()
21 21 self.evn_name = os.name
22   - self.file_name = r'test_config_sy.conf'
  22 + self.file_name = r'test_config_heb.conf'
23 23 self.relative_path = r'/config/marketConfig/'
24 24 self.file_path = os.path.abspath(
25 25 os.path.join(os.path.dirname(__file__), "../../")) + self.relative_path + self.file_name
... ...
report/test.log
  View file @54a3656
1   -[2021-08-24 11:03:16] [INFO] : ======================================================================================
2   -[2021-08-24 11:03:16] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
3   -{'data': None, 'json': {'userName': 'sy_chen', 'password': 'Fn0Vsdlp7LCcFuH3lyjGd5Hb5kQQuGyRZyLj12bKitx4YsA/8c0RylHLzkyK5sFZvKB8N2i1UPixOZQszji+U2CNwF4s2WgK1aiHAqmgpAFH9P3ZMMnng/wV+mhgZrz+y9HhqS6b4FOD1xiQVrxOas2BUVWztS/nnJFXN2uEd+w='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
  1 +[2021-08-24 13:13:58] [INFO] : ======================================================================================
  2 +[2021-08-24 13:13:58] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  3 +{'data': None, 'json': {'userName': 'sy_chen', 'password': 'U1+AAFR9FvJLId0P1tq6gimsvcU1Ugop5lcW/UZRRuKE3UjLNUQkA40aPGVXaEXppB5LwYEfMRIqxBWSrsu6FbRbA9ThAJISGRhfEy2ckyFF8bjyiyjckTnbD6SBV2tPfNQeswTCaP1bbNTtPKbfD0ocMe2duZcHYz8OUzc6I6c='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
4 4  
5   -[2021-08-24 11:03:16] [INFO] : ======================================================================================
6   -[2021-08-24 11:03:16] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
7   -{'data': None, 'json': {'userName': '哈尔滨田太子', 'password': 'UODBcRgFJexkpXCdqSFOafmDPoSyXUXltolV7GBQ1ql0Z5r9yoS7SBbkl/4VWvVidsLCBmH6C37jtfgDn0hxht5rYfFkhRju033JBA6XM8rLClhLO67oCMI6xTI2BaSAD1bSvMHjLsWgOCM00GIXh8Q/jx7a+h8HPmipGTjtZvY='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
  5 +[2021-08-24 13:13:58] [INFO] : ======================================================================================
  6 +[2021-08-24 13:13:58] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  7 +{'data': None, 'json': {'userName': '哈尔滨田太子', 'password': 'eSWkUMhbjtrZ+x9f2Yq9CGQU/EwuTZDqkNkl33KFSAWj7iKnP16qxWw4LlJ9/Tp1mJ7bCZDwyVRL1sjZzBJyM2OxXFX0w2lv5T4C6yzYW847PdeM+/3nbs2zQNEP9W9YL+rWnpxAUxBoNB+t017Hz3kFllLuS3X4X42CLOYPE+E='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
8 8  
9   -[2021-08-24 11:03:16] [INFO] : ======================================================================================
10   -[2021-08-24 11:03:16] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/template/getTemplateUnit?marketCode=9&moduleCode=ZC
  9 +[2021-08-24 13:13:59] [INFO] : ======================================================================================
  10 +[2021-08-24 13:13:59] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/template/getTemplateUnit?marketCode=2&moduleCode=ZC
11 11 None
12 12 {}
13 13  
14   -[2021-08-24 11:03:16] [INFO] : ======================================================================================
15   -[2021-08-24 11:03:16] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
  14 +[2021-08-24 13:13:59] [INFO] : ======================================================================================
  15 +[2021-08-24 13:13:59] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
16 16 {"businessCode": "jmsf"}
17 17 {}
18 18  
19   -[2021-08-24 11:03:17] [INFO] : ======================================================================================
20   -[2021-08-24 11:03:17] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  19 +[2021-08-24 13:13:59] [INFO] : ======================================================================================
  20 +[2021-08-24 13:13:59] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
21 21 {"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
22 22 {}
23 23  
24   -[2021-08-24 11:03:17] [INFO] : ======================================================================================
25   -[2021-08-24 11:03:17] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
26   -{"firmCode": "sy", "departmentId": 58, "keyword": ""}
  24 +[2021-08-24 13:13:59] [INFO] : ======================================================================================
  25 +[2021-08-24 13:13:59] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
  26 +{"firmCode": "hd", "departmentId": 6, "keyword": ""}
27 27 {}
28 28  
29   -[2021-08-24 11:03:17] [INFO] : ======================================================================================
30   -[2021-08-24 11:03:17] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
31   -{"pageNum": 100, "pageSize": 100, "marketId": 9}
32   -{}
33   -
34   -[2021-08-24 11:03:17] [INFO] : ======================================================================================
35   -[2021-08-24 11:03:17] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
36   -None
37   -{'params': {'pid': 'goods_tag'}}
38   -
39   -[2021-08-24 11:03:17] [INFO] : ======================================================================================
40   -[2021-08-24 11:03:17] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
41   -{"province": "C", "city": null, "area": null}
42   -{}
43   -
44   -[2021-08-24 11:03:18] [INFO] : ======================================================================================
45   -[2021-08-24 11:03:18] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  29 +[2021-08-24 13:13:59] [INFO] : ======================================================================================
  30 +[2021-08-24 13:13:59] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
46 31 None
47 32 {'params': {'keyword': ''}}
48 33  
49   -[2021-08-24 11:03:18] [INFO] : ======================================================================================
50   -[2021-08-24 11:03:18] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  34 +[2021-08-24 13:14:00] [INFO] : ======================================================================================
  35 +[2021-08-24 13:14:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
51 36 None
52 37 {'params': {'pid': 'prove_type'}}
53 38  
54   -[2021-08-24 11:03:19] [INFO] : ======================================================================================
55   -[2021-08-24 11:03:19] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
  39 +[2021-08-24 13:14:00] [INFO] : ======================================================================================
  40 +[2021-08-24 13:14:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
56 41 None
57 42 {}
58 43  
59   -[2021-08-24 11:03:19] [INFO] : ======================================================================================
60   -[2021-08-24 11:03:19] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
61   -{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA10836", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 2182, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 432, "grossWeightDate": "2021-08-24 11:03:19", "newWeight": 99, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA10836", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 2182, "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": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 70, "id": 0, "protocolId": null, "goodsTagId": 663}
  44 +[2021-08-24 13:14:00] [INFO] : ======================================================================================
  45 +[2021-08-24 13:14:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
  46 +{"carTypeCode": "456", "carTypeId": 158, "carTypeName": "\u5730\u6392\u8f66", "carTypeWeight": 10, "plate": "\u5dddA83150", "inGreeterId": 219, "inGreeterName": "\u54c8\u8fbe\u738b\u521a", "productId": 2182, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 666, "proveTypeName": "\u4ea7\u5730\u8bc1\u660e", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 109, "grossWeightDate": "2021-08-24 13:14:00", "newWeight": 99, "tareWeight": 10, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA83150", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 129, "depName": "\u54c8\u8fbe\u6d4b\u8bd5\u90e8", "cateId": 2182, "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": "", "origin": "", "originCode": "", "tradeType": "", "tradeTypeName": "", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": "", "id": 0, "protocolId": null, "goodsTagId": ""}
62 47 {}
63 48  
64   -[2021-08-24 11:03:20] [INFO] : ======================================================================================
65   -[2021-08-24 11:03:20] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
66   -{'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': '202108240900118'}
  49 +[2021-08-24 13:14:01] [INFO] : ======================================================================================
  50 +[2021-08-24 13:14:01] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
  51 +{'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': '202108240200035'}
67 52 {}
68 53  
69   -[2021-08-24 11:03:20] [INFO] : ======================================================================================
70   -[2021-08-24 11:03:20] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/5067.action
  54 +[2021-08-24 13:14:01] [INFO] : ======================================================================================
  55 +[2021-08-24 13:14:01] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/5140.action
71 56 None
72 57 {}
73 58  
74   -[2021-08-24 11:03:22] [INFO] : ======================================================================================
75   -[2021-08-24 11:03:22] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810033081
  59 +[2021-08-24 13:14:03] [INFO] : ======================================================================================
  60 +[2021-08-24 13:14:03] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=210823173732
76 61 None
77 62 {}
78 63  
79   -[2021-08-24 11:03:23] [INFO] : ======================================================================================
80   -[2021-08-24 11:03:23] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
  64 +[2021-08-24 13:14:03] [INFO] : ======================================================================================
  65 +[2021-08-24 13:14:03] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
81 66 None
82 67 {}
83 68  
84   -[2021-08-24 11:03:23] [INFO] : ======================================================================================
85   -[2021-08-24 11:03:23] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
86   -{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 5067, 'goodsId': '5081', 'number': '202108240900118', 'modified': '2021-08-24 11:03:23', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A10836', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '665', 'grossWeight': '432', 'tareWeight': '333', 'weight': '99', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'calcDepId': '58', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '2182', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '70', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-24 11:03:20', 'remark': 'false', 'goodsTagIds': '663', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '1616', 'driverTel': '', 'grossWeightDate': '2021-08-24 11:03:20', 'tareWeightDate': '2021-08-24 11:03:20', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '测试沈阳', 'inGreeterId': '223', 'outGreeterId': '', 'sumPrice': '9900', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
  69 +[2021-08-24 13:14:03] [INFO] : ======================================================================================
  70 +[2021-08-24 13:14:03] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
  71 +{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 5140, 'goodsId': '5154', 'number': '202108240200035', 'modified': '2021-08-24 13:14:03', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A83150', 'autocomplete-cartype': '456(地排车)', 'carTypeName': '地排车', 'carTypeCode': '456', 'carTypeId': '158', 'carTypeWeight': '10', 'storeTareWeight': '', 'proveType': '666', 'grossWeight': '109', 'tareWeight': '10', 'weight': '99', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '哈达测试部', 'calcDepId': '129', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '2182', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-24 13:14:02', 'remark': 'false', 'goodsTagIds': '', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '1616', 'driverTel': '', 'grossWeightDate': '2021-08-24 13:14:02', 'tareWeightDate': '2021-08-24 13:14:02', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '哈达王刚', 'inGreeterId': '219', 'outGreeterId': '', 'sumPrice': '9900', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
87 72 {}
88 73  
89   -[2021-08-24 11:03:24] [INFO] : ======================================================================================
90   -[2021-08-24 11:03:24] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
91   -protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=5067&goodsId=5081&number=202108240900118&modified=2021-08-24%2011%3A03%3A20&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=4800&customerId=384&fundAccount=103101&ic=888810033081&customerName=%2A%2A%2A%2A%2A%2A&customerPhone=19010001000&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DA10836&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=665&grossWeight=432&tareWeight=333&weight=99&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%B0%B4%E6%9E%9C%E9%83%A8&calcDepId=58&dep=58&regionName=&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=2182&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=70&chargeTotalAmount=4800&chargeTotalAmountYuan=48&freezeMoneySymbol=53&comparisonFreezeAmount=53&created=2021-08-24%2011%3A03%3A20&remark=&goodsTagIds=663&marketFlag=sy&totalMoney=4800&receivable=5300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=5300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=5300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-24%2011%3A03%3A20&tareWeightDate=2021-08-24%2011%3A03%3A20&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=9900&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=103101&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=50.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%3A5000%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
  74 +[2021-08-24 13:14:04] [INFO] : ======================================================================================
  75 +[2021-08-24 13:14:04] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
  76 +protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=5140&goodsId=5154&number=202108240200035&modified=2021-08-24%2013%3A14%3A02&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=20300&customerId=141951&fundAccount=107621&ic=210823173732&customerName=%E5%93%88%E6%B5%8B&customerPhone=18089008005&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DA83150&autocomplete-cartype=456%28%E5%9C%B0%E6%8E%92%E8%BD%A6%29&carTypeName=%E5%9C%B0%E6%8E%92%E8%BD%A6&carTypeCode=456&carTypeId=158&carTypeWeight=10&storeTareWeight=&proveType=666&grossWeight=109&tareWeight=10&weight=99&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E5%93%88%E8%BE%BE%E6%B5%8B%E8%AF%95%E9%83%A8&calcDepId=129&dep=129&regionName=234&regionId=271&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=2182&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=500100&levelType=&originId=500101&tradeTypeId=&chargeTotalAmount=20300&chargeTotalAmountYuan=203&freezeMoneySymbol=203&comparisonFreezeAmount=203&created=2021-08-24%2013%3A14%3A02&remark=&marketFlag=hd&totalMoney=20300&receivable=20300&collectionPrice=0&discountAmount=0&handReceivableAmount=0&itemReceivableAmount=20300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=20300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=1616&driverTel=&grossWeightDate=2021-08-24%2013%3A14%3A02&tareWeightDate=2021-08-24%2013%3A14%3A02&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=%E5%93%88%E8%BE%BE%E7%8E%8B%E5%88%9A&inGreeterId=219&outGreeterId=&sumPrice=9900&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=107621&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=488&488=200.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A488%2C%22name%22%3A%22%E4%BA%A4%E6%98%93%E7%AE%A1%E7%90%86%E8%B4%B9%22%2C%22receivable%22%3A20000%2C%22require%22%3A1%7D&billItemCheckIds=489&489=0.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A489%2C%22name%22%3A%22%E8%BF%94%E7%82%B9%22%2C%22receivable%22%3A0%2C%22require%22%3A1%7D&billItemCheckIds=494&494=3.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A494%2C%22name%22%3A%22%E6%A3%80%E6%B5%8B%E8%B4%B9%22%2C%22receivable%22%3A300%2C%22require%22%3A1%7D
92 77 {}
93 78  
... ...
testcase/sy/test_ZC/demo.py
  View file @54a3656
... ... @@ -58,6 +58,7 @@ import random
58 58 # str = f'assert {res},"123123""'
59 59 # exec(str)
60 60  
61   -# do_ass([1],"==",'[1]',"测试失败")
62   -assert True
  61 +a = {"a1":"1","a2":"a2"}
  62 +del a["a1"]
  63 +print(a)
63 64  
... ...