进门单操作验证

liujiqiang
1 parent e37539e6
Showing 8 changed files with 119 additions and 75 deletions
commons/api/entranceFeeBillList/operationDoAmend.py
commons/api/entranceFeeBillList/operationDoCorrect.py
commons/api/entranceFeeBillList/operationDoInvalid.py
commons/api/entranceFeeBillList/operationDoUpdate.py
commons/api/entranceFeeBillList/operationUnfreeze.py
report/test.log
testcase/test_ZC/demo.py
testcase/test_listPage/test_listPageOperation.py
@@ -113,7 +113,7 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     url = host + "/calculate/index.action"
     headers = dct.urlCode()
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "amend", "optType": "optType", "optUrl": "",
             "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
             "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
             "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -144,10 +144,9 @@ def do_doAmend(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     url = host + "/entranceFeeBill/doAmend.action"
     headers = dct.urlCode()
-    # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"}
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "amend", "optType": "0", "optUrl": "",
             "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
-            "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",
+            "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "2",
             "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
             "accountId": "105847", "ic": "888810032426", "customerName": "长歌买家省内啊啊啊嘿", "customerPhone": "18011501258",
             "payway": "刷卡", "plate": "川B00001", "autocomplete-cartype": "003(板车)", "carTypeName": "板车",
@@ -184,7 +183,7 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     # # 订单详情获取
     resOrderDetails = get_orderAmend(host=host, orderId=orderId)
-    print(resOrderDetails.text)
+    # print(resOrderDetails.text)
     # bs取值
     orderDetailsSoup = BeautifulSoup(resOrderDetails.text, "html.parser")
@@ -192,7 +191,7 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     # 第一种取值
     orderDetailsList = orderDetailsSoup.findAll("input")
     orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList}
-    print("orderDetailsDict",orderDetailsDict)
+    # print("orderDetailsDict",orderDetailsDict)
     unitPrice = orderDetailsDict["unitPrice"]
     regionId=orderDetailsDict["regionId"]
     goodsId = orderDetailsDict["goodsId"]
@@ -248,12 +247,12 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     # 省市区获取
     res = eFBL.get_city(host=host, name="万州")
-    print(res.text)
+    # print(res.text)
     originId = res.json()["suggestions"][0]["id"]
     # # 获取缴费金额
     autocompletecartype = f"{carTypeCode}({carTypeName})"
-    print(autocompletecartype)
+    # print(autocompletecartype)
     modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 获取缴费金额
@@ -113,7 +113,7 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     url = host + "/calculate/index.action"
     headers = dct.urlCode()
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "correct", "optType": "optType", "optUrl": "",
             "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
             "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
             "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -145,10 +145,10 @@ def do_doCorrect(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     headers = dct.urlCode()
     # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"}
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "correct", "optType": "0", "optUrl": "",
             "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
-            "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",
-            "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
+            "modified": "2021-08-11+17:32:50", "status": "2", "source": "1", "updateFeeItems": "2",
+            "correctDiscount": "2", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
             "accountId": "105847", "ic": "888810032426", "customerName": "长歌买家省内啊啊啊嘿", "customerPhone": "18011501258",
             "payway": "刷卡", "plate": "川B00001", "autocomplete-cartype": "003(板车)", "carTypeName": "板车",
             "carTypeCode": "003", "carTypeId": "53", "carTypeWeight": "333", "storeTareWeight": "", "proveType": "1621",
@@ -164,7 +164,8 @@ def do_doCorrect(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
             "driverTel": "", "grossWeightDate": "2021-08-11+17:32:27", "tareWeightDate": "2021-08-11+17:32:27",
             "grossPathName": "", "grossPathId": "", "tarePathId": "", "goodsRemark": "备注", "inGreeterName": "通用测试",
             "inGreeterId": "274", "outGreeterId": "", "sumPrice": "2000", "shipperName": "", "shipperId": "",
-            "shipperPhone": "", "feeDepId": "0"}
+            "shipperPhone": "", "feeDepId": "0","bskinWithGoods":"-1","outGreeterName":"","proveTypeName":"",
+            "feeDepName":"","calcFeeDepId":"","backSkinTwo":"-1"}
     data["autocomplete-cartype"] = autocompletecartype
     data = dict(data, **kwargs)
@@ -201,7 +202,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     optType = orderDetailsDict["optType"]
     correctInfo = orderDetailsDict["correctInfo"]
     weightType = orderDetailsDict["weightType"]
-    correctDiscount = orderDetailsDict["correctDiscount"]
+    correctDiscount = "2"
     goodsTagIds = orderDetailsDict["goodsTagIds"]
     sumPrice = orderDetailsDict["sumPrice"]
     shareRatio = orderDetailsDict["shareRatio"]
@@ -226,6 +227,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     inGreeterId = orderDetailsDict["inGreeterId"]
     productArea = orderDetailsDict["productArea"]
     productPrice = orderDetailsDict["productPrice"]
+    proveTypeName = orderDetailsDict["proveTypeName"]
     # 第二种取法
     selectList = orderDetailsSoup.findAll("select")
@@ -293,42 +295,29 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
         c = tag.findAll("input")
         for i in c:
             if i.get("name") != None:
-                print("=============1===============")
-                print("i", i)
-                print('i.get("name")---', i.get("name"))
-                print('i.get("value")---', i.get("value"))
-                print("\n")
-                # fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
                 if i.get("type") == "text":
-                    print('if i.get("type") == "text" i.get("name")',i.get("name"))
-                    print('if i.get("type") == "text" i.get("value")', i.get("value"))
                     cNum = random.randint(10,100)
                     fee_int = fee_int + int(float(i.get("value")))+cNum
                 if "billItemsDic" == i.get("name"):
                     discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100
                 billItems = i.get("value")
                 if "{" not in billItems and i.get("name") != "billItemCheckIds" and i.get("name")!="billItemDicCheckIds":
-                    print('if "{" not in billItems i.get("name")',i.get("name"))
-                    print('if "{" not in billItems i.get("value")', i.get("value"))
                     billItems = str(int(float(billItems)) + cNum)
                 elif "{" in billItems and i.get("name")!="billItemsDic":
                     billItemsDict = json.loads(billItems)
                     billItemsDict["receivable"] = int(billItemsDict["receivable"]) + cNum * 100
                     billItems = json.dumps(billItemsDict,ensure_ascii=False,separators=(',', ':'))
-                print('i.get("name")---', i.get("name"))
-                print('i.get("value")---', i.get("value"))
-                print("billItems---", billItems)
-                print("type(billItems)",type(billItems))
-                # urllib.parse.quote_plus(str(billItems))
                 fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote_plus(billItems)
-                # cNum=0
-                print("=============2===============\n")
-    print(fee_str)
     id = orderId
-    totalAmount = totalMoney
+    # totalAmount = totalMoney
+    totalAmount = int(fee_int)*100-int(discount_amount)*100
+    # print("totalAmount",totalAmount)
     customerPhone = mobile
-    chargeTotalAmount = totalMoney
+    # chargeTotalAmount = totalMoney
+    chargeTotalAmount = totalAmount
+    # receivable
+    receivable = fee_int*100
     chargeTotalAmountYuan = fee_int - int(discount_amount)
     freezeMoneySymbol = fee_int
     comparisonFreezeAmount = fee_int
@@ -339,7 +328,7 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
-    aa = do_doCorrect(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    res = do_doCorrect(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -359,11 +348,11 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
                   itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
                   categoryName=categoryName,
                   categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
-                  sumPrice=sumPrice,
+                  sumPrice=sumPrice,proveTypeName=proveTypeName,
                   chargeTotalAmountYuan=chargeTotalAmountYuan)
-    print(aa.text)
-    return aa
+    print("res.text",res.text)
+    print("totalAmount",totalAmount)
+    return res,totalAmount
-# time.sleep(5)
-do_correctOrder(attrValue="202108130900144")
 \ No newline at end of file
+# do_correctOrder(attrValue="202108160900001")
 \ No newline at end of file
@@ -113,7 +113,7 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     url = host + "/calculate/index.action"
     headers = dct.urlCode()
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "invalid", "optType": "optType", "optUrl": "",
             "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
             "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
             "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -144,7 +144,7 @@ def do_doInvalid(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     url = host + "/entranceFeeBill/doInvalid.action"
     headers = dct.urlCode()
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "invalid", "optType": "0", "optUrl": "",
             "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
             "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",
             "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
@@ -113,7 +113,7 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     url = host + "/calculate/index.action"
     headers = dct.urlCode()
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "update", "optType": "optType", "optUrl": "",
             "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
             "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
             "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -105,7 +105,7 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
     url = host + "/calculate/index.action"
     headers = dct.urlCode()
-    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "",
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "optType", "optUrl": "",
             "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
             "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
             "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -135,8 +135,6 @@ def do_doUnfreeze(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     """进门单缴费"""
     url = host + "/entranceTrade/doUnfreeze.action"
     headers = dct.urlCode()
-
-    # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"}
     data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "",
             "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
             "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",
-[2021-08-13 18:44:25] [INFO] : ======================================================================================
-[2021-08-13 18:44:25] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sy_chen', 'password': 'gQfSv4XB0l69pfGI1Agdm1jjPXpmA0rk95Qij6gOzAGWCB8tVLWUVtVAr5MTclFKRRBSLlst/UbQHT8bEtXOOs1rc8RMt1ris4a9m4B2KIE2xqK2ja59mueSGUF93lr3LMgcaK7peKzrS+WBcge4rvpqv0iJe0xty+8qnDewNjU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-16 14:10:28] [INFO] : ======================================================================================
+[2021-08-16 14:10:28] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sy_chen', 'password': 'F+lLvnv5lyeecXvMPhnP3qFKKKZ5oiaz+RzYu0Wssxk6syRIbkkC6bWGtC+Fg33Zv25dfEEVVTkvJKc2Vv7/no0y25XEVwyUTj+pAIiQt7mix7VDraxH2FkqJlGxPJ+ZrNbaXVt7dUK0m6DfsgSeXE49jcxUKycSYB5EbIb5fkY='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-13 18:44:25] [INFO] : ======================================================================================
-[2021-08-13 18:44:25] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sygangda', 'password': 'Z0FZQCgEp9dET3kQq3ev9eqDCVPwKvL+U7k5xf9Tj/8hhMltRK2ZhfvUZlP26cuJJ/sIfac6pDYL7LSXfMfooMmbzRn3FU94le7w8Qb/h8PBKjnca82cp7x9zU71vqZfG5wqqnMST0BqCtOHn/LcMeMR054Czl6oUyf2nsWl0Ww='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-16 14:10:29] [INFO] : ======================================================================================
+[2021-08-16 14:10:29] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sygangda', 'password': 'bY/MWKpYUcznJWmbjSXeY9MplKVOOR8dD2gcEuj4z5Py8Wevt8lkai3KQJD8Ve/Ih6wkqVAJH/xZvSUOg3YJnjDjOfOSAM7pQLzxCzarGpLVXakCGktuL3Vy7XA8nEXq8Ngnnsl+jaod+/sPHBPIVBHyRrdLS9dcAAzQ/bIEmek='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-13 18:44:25] [INFO] : ======================================================================================
-[2021-08-13 18:44:25] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
-{'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': '202108130900144'}
+[2021-08-16 14:10:29] [INFO] : ======================================================================================
+[2021-08-16 14:10:29] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
+{"businessCode": "jmsf"}
 {}
-[2021-08-13 18:44:26] [INFO] : ======================================================================================
-[2021-08-13 18:44:26] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/correct/4224.action
+[2021-08-16 14:10:29] [INFO] : ======================================================================================
+[2021-08-16 14:10:29] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 9, "state": 1, "keyword": "\u852c\u83dc"}
+{}
+
+[2021-08-16 14:10:29] [INFO] : ======================================================================================
+[2021-08-16 14:10:29] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
+{"firmCode": "sy", "departmentId": 58, "keyword": ""}
+{}
+
+[2021-08-16 14:10:30] [INFO] : ======================================================================================
+[2021-08-16 14:10:30] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
+{"pageNum": 100, "pageSize": 100, "marketId": 9}
+{}
+
+[2021-08-16 14:10:30] [INFO] : ======================================================================================
+[2021-08-16 14:10:30] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
+{'params': {'pid': 'goods_tag'}}
+
+[2021-08-16 14:10:30] [INFO] : ======================================================================================
+[2021-08-16 14:10:30] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
+{"province": "C", "city": null, "area": null}
 {}
-[2021-08-13 18:44:27] [INFO] : ======================================================================================
-[2021-08-13 18:44:27] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+[2021-08-16 14:10:30] [INFO] : ======================================================================================
+[2021-08-16 14:10:30] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
+None
+{'params': {'keyword': ''}}
+
+[2021-08-16 14:10:31] [INFO] : ======================================================================================
+[2021-08-16 14:10:31] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
+{'params': {'pid': 'prove_type'}}
+
+[2021-08-16 14:10:31] [INFO] : ======================================================================================
+[2021-08-16 14:10:31] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
+None
+{}
+
+[2021-08-16 14:10:31] [INFO] : ======================================================================================
+[2021-08-16 14:10:31] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
+{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA24287", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14152, "productName": "\u852c\u83dc", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 432, "grossWeightDate": "2021-08-16 14:10:31", "newWeight": 99, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA24287", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14152, "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}
+{}
+
+[2021-08-16 14:10:32] [INFO] : ======================================================================================
+[2021-08-16 14:10:32] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
+{'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': '202108160900009'}
+{}
+
+[2021-08-16 14:10:32] [INFO] : ======================================================================================
+[2021-08-16 14:10:32] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/correct/4233.action
+None
+{}
+
+[2021-08-16 14:10:34] [INFO] : ======================================================================================
+[2021-08-16 14:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+None
+{}
+
+[2021-08-16 14:10:34] [INFO] : ======================================================================================
+[2021-08-16 14:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
+{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'correct', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 4233, 'goodsId': '4247', 'number': '202108160900009', 'modified': '2021-08-16 14:10:34', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '2', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A24287', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1895', 'grossWeight': '432', 'tareWeight': '333', 'weight': '99', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'regionName': '', 'regionId': '0', 'productName': '蔬菜', 'productId': '14152', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '80', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-16 14:10:32', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '蔬菜', 'categoryId': '14152', 'driverTel': '', 'grossWeightDate': '2021-08-16 14:10:32', 'tareWeightDate': '2021-08-16 14:10:32', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '测试沈阳', 'inGreeterId': '223', 'outGreeterId': '', 'sumPrice': '9900', 'shipperName': '', 'shipperId': '', 'shipperPhone': ''}
 {}
-[2021-08-13 18:44:27] [INFO] : ======================================================================================
-[2021-08-13 18:44:27] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
-{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 4224, 'goodsId': '4238', 'number': '202108130900144', 'modified': '2021-08-13 18:44:27', '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': '1895', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '80', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-13 16:52:59', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '青笋', 'categoryId': '53', 'driverTel': '', 'grossWeightDate': '2021-08-13 16:52:59', 'tareWeightDate': '2021-08-13 16:52:59', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': ''}
+[2021-08-16 14:10:34] [INFO] : ======================================================================================
+[2021-08-16 14:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/doCorrect.action
+protocolId=&pwd=111111&clientRedirectTag=&viewType=correct&optType=0&optUrl=&correctInfo=1&weightType=1&id=4233&goodsId=4247&number=202108160900009&modified=2021-08-16%2014%3A10%3A32&status=2&source=1&updateFeeItems=2&correctDiscount=1&totalAmount=19400&customerId=&fundAccount=&accountId=&ic=&customerName=&customerPhone=&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DA24287&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=1895&grossWeight=432&tareWeight=333&weight=99&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%B0%B4%E6%9E%9C%E9%83%A8&dep=58&regionId=&productName=%E8%94%AC%E8%8F%9C&productId=14152&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&originId=500101&tradeTypeId=80&chargeTotalAmount=19400&chargeTotalAmountYuan=194&freezeMoneySymbol=199&comparisonFreezeAmount=199&created=2021-08-16%2014%3A10%3A32&remark=%E5%A4%87%E6%B3%A8&goodsTagIds=1900&shareRatio=0&handlingTeam=&steveTeamId=&handlingRatio=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&marketFlag=sy&totalMoney=600&receivable=19900&collectionPrice=200&discountAmount=500&handReceivableAmount=10000&itemReceivableAmount=19900&receivableAmount=19900&categoryName=%E8%94%AC%E8%8F%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-16%2014%3A10%3A32&tareWeightDate=2021-08-16%2014%3A10%3A32&grossPathName=&grossPathId=&tarePathId=&goodsRemark=%E5%A4%87%E6%B3%A8&inGreeterName=%E9%80%9A%E7%94%A8%E6%B5%8B%E8%AF%95&inGreeterId=274&outGreeterId=&sumPrice=9900&shipperName=&shipperId=&shipperPhone=&feeDepId=0&bskinWithGoods=-1&outGreeterName=&proveTypeName=%E9%A3%9F%E5%93%81%E5%AE%89%E5%85%A8&feeDepName=&calcFeeDepId=&backSkinTwo=-1&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=108&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%3A10800%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=91&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%3A9100%2C%22require%22%3A1%7D
 {}
-[2021-08-13 18:44:28] [INFO] : ======================================================================================
-[2021-08-13 18:44:28] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/doCorrect.action
-protocolId=&pwd=111111&clientRedirectTag=&viewType=unfreeze&optType=0&optUrl=&correctInfo=1&weightType=1&id=4224&goodsId=4238&number=202108130900144&modified=2021-08-13%2016%3A52%3A59&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=900&customerId=&fundAccount=&accountId=&ic=&customerName=&customerPhone=&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=1895&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%B0%B4%E6%9E%9C%E9%83%A8&dep=58&regionId=&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&originId=500101&tradeTypeId=80&chargeTotalAmount=800&chargeTotalAmountYuan=164&freezeMoneySymbol=169&comparisonFreezeAmount=169&created=2021-08-13%2016%3A52%3A59&remark=%E5%A4%87%E6%B3%A8&goodsTagIds=1900&shareRatio=0&handlingTeam=&steveTeamId=&handlingRatio=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&receivableAmount=1300&categoryName=%E9%9D%92%E7%AC%8B&categoryId=53&driverTel=&grossWeightDate=2021-08-13%2016%3A52%3A59&tareWeightDate=2021-08-13%2016%3A52%3A59&grossPathName=&grossPathId=&tarePathId=&goodsRemark=%E5%A4%87%E6%B3%A8&inGreeterName=%E9%80%9A%E7%94%A8%E6%B5%8B%E8%AF%95&inGreeterId=274&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepId=0&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=106&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%3A10600%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=63&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%3A6300%2C%22require%22%3A1%7D
+[2021-08-16 14:10:36] [INFO] : ======================================================================================
+[2021-08-16 14:10:36] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
+{'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': '202108160900009'}
 {}
@@ -14,12 +14,11 @@ import random
 # a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId"]
 # b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","calcDepId","dep","regionName","regionId","productName","productId","productArea","parentId","levelType","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
-"""
+
 # a系统
-a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveTypeName","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","backSkinTwo","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","bskinWithGoods","goodsRemark","inGreeterName","inGreeterId","outGreeterName","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
+a =["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveTypeName","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","backSkinTwo","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","bskinWithGoods","goodsRemark","inGreeterName","inGreeterId","outGreeterName","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
 # b自己
-b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems"]
-
+b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems"]
 c = list(set(a)^set(b))
 # print(c)
@@ -34,7 +33,7 @@ for i in c:
 print(aa)
 print(bb)
-"""
+
 from bs4 import BeautifulSoup
 import random
@@ -49,5 +48,5 @@ import json
 # print(selectDict)
-a  = "123"
-print(a.isdigit())
 \ No newline at end of file
+# a  = "123"
+# print(a.isdigit())
 \ No newline at end of file
@@ -110,9 +110,13 @@ class test_listPage(unittest.TestCase):
         cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
-        res_unfreezeOrder = oDC.do_correctOrder(host=self.jmsfHost,attrValue=number)
+        res_unfreezeOrder,totalAmount = oDC.do_correctOrder(host=self.jmsfHost,attrValue=number)
         assert res_unfreezeOrder.json()["success"]==True,"作废测试失败"
         assert res_unfreezeOrder.json()["msg"] == "操作成功", "作废测试失败"
+        resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
+        print(resListPage.json())
+        assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
+        assert resListPage.json()["rows"][0]["$_totalPrice"] == totalAmount,"按照收费单号查询失败"
     def test_amendOrder(self):
         plate = f"川A{random.randint(10000,99999)}"
@@ -120,5 +124,5 @@ class test_listPage(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         res_unfreezeOrder = oDA.do_amendOrder(host=self.jmsfHost,attrValue=number)
-        assert res_unfreezeOrder.json()["success"]==True,"作废测试失败"
-        assert res_unfreezeOrder.json()["message"] == "操作成功", "作废测试失败"
+        assert res_unfreezeOrder.json()["success"]==True,"更正操作失败"
+        assert res_unfreezeOrder.json()["message"] == "操作成功", "更正操作失败"