备注添加

liujiqiang
1 parent c27e28cd
Showing 5 changed files with 331 additions and 130 deletions
commons/api/entranceFeeBillList/operationDoUndo.py
report/test.log
testcase/test_HP/test_HP.py
testcase/test_SJ/test_SJ.py
testcase/test_ZC/demo.py
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/16 15:15
+# @Author  : Ljq
+# @File    : operationDoUndo.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+import json,time,random,re
+from commons.scripts import dealContentType as dct
+from commons.scripts import jsonToUrlcode
+from commons.MySession import my
+from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
+from bs4 import BeautifulSoup
+import urllib.parse
+
+def get_orderRefund(host="",orderId=None):
+    """获取订单详情"""
+    headers = dct.urlCode()
+    url = host + f"/entranceFeeBill/refund/{orderId}.action"
+    res = my.useHeadersRequests("get", url=url, headers=headers)
+    return res
+
+def get_calculateRes(host="",autocompletecartype=None,**kwargs):
+    """缴费金额获取"""
+    url = host + "/calculate/index.action"
+    headers = dct.urlCode()
+
+    data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "refund", "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": "",
+            "accountId":"","ic": "","customerName": "", "customerPhone": "", "payway": "刷卡", "plate": "plate",
+            "autocomplete-cartype": "carTypeCode(carTypeName)", "carTypeName": "carTypeName",
+            "carTypeCode": "carTypeCode", "carTypeId": "carTypeId", "carTypeWeight": "carTypeWeight",
+            "storeTareWeight": "", "proveType": "proveTypeCode", "grossWeight": "grossWeight",
+            "tareWeight": "tareWeight", "weight": "grossWeight", "goodsNum": "", "itemWeight": "",
+            "productPrice": "1.00000", "unitPrice": "unitPrice", "depName": "feeDepName", "calcDepId": "feeDepId",
+            "regionName": "", "regionId": "0", "productName": "productName", "productId": "productId",
+            "productArea": "重庆,重庆市,万州区", "parentId": "", "levelType": "", "originId": "originId", "tradeTypeId": "tradeTypeId",
+            "chargeTotalAmount": "", "chargeTotalAmountYuan": "", "freezeMoneySymbol": "", "comparisonFreezeAmount": "",
+            "created": "created", "remark": "false", "goodsTagIds": "goodsTagIds", "shareRatio": "shareRatio",
+            "handlingTeam": "", "handlingRatio": "", "handActualAmount": "", "handManageAmount": "",
+            "handCollectionAmount": "", "receivableAmount": "", "categoryName": "productName",
+            "categoryId": "productId", "driverTel": "", "grossWeightDate": "grossWeightDate",
+            "tareWeightDate": "tareWeightDate", "grossPathName": "", "grossPathId": "", "tarePathId": "",
+            "goodsRemark": "", "inGreeterName": "", "inGreeterId": "0", "outGreeterId": "", "sumPrice": "sumPrice",
+            "shipperName": "", "shipperId": "", "shipperPhone": "", "feeDepName": "", "calcFeeDepId": ""}
+    data["autocomplete-cartype"]=autocompletecartype
+    data = dict(data,**kwargs)
+    print("get_calculateRes",data)
+    res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
+    return res
+
+
+def do_doUndo(host="",autocompletecartype=None,fee_str="",**kwargs):
+    """进门单缴费"""
+    url = host + "/entranceTrade/doPay.action"
+    headers = dct.urlCode()
+
+    data = {"protocolId": "", "pwd": "{pwd}", "clientRedirectTag": "", "viewType": "refund", "optType": "{optType}",
+            "optUrl": "", "correctInfo": "{correctInfo}", "weightType": "{weightType}", "id": "{orderId}",
+            "goodsId": "{goodsId}", "number": "{number}", "modified": "{created}", "status": "{status}",
+            "source": "{source}", "updateFeeItems": "", "correctDiscount": "{correctDiscount}",
+            "totalAmount": "{totalMoney}", "customerId": "{customerId}", "fundAccount": "{accountId}", "ic": "{ic}",
+            "customerName": "{customerName}", "customerPhone": "{mobile}", "payway": "刷卡", "plate": "{plate}",
+            "autocomplete-cartype": "{carTypeCode}({carTypeName})", "carTypeName": "{carTypeName}",
+            "carTypeCode": "{carTypeCode}", "carTypeId": "{carTypeId}", "carTypeWeight": "{carTypeWeight}",
+            "storeTareWeight": "", "proveType": "{proveTypeCode}", "grossWeight": "{grossWeight}",
+            "tareWeight": "{tareWeight}", "weight": "{newWeight}", "goodsNum": "", "itemWeight": "",
+            "productPrice": "{productPrice}", "unitPrice": "{unitPrice}", "depName": "{feeDepName}",
+            "calcDepId": "{feeDepId}", "dep": "{feeDepId}", "regionName": "{regionName}", "regionId": "{regionId}",
+            "productName": "{productName}", "productId": "{productId}", "productArea": "{origin}", "parentId": "",
+            "levelType": "", "originId": "{originId}", "tradeTypeId": "{tradeTypeId}",
+            "chargeTotalAmount": "{totalMoney}", "chargeTotalAmountYuan": "{chargeTotalAmountYuan}",
+            "freezeMoneySymbol": "{chargeTotalAmountYuan}", "comparisonFreezeAmount": "{chargeTotalAmountYuan}",
+            "created": "{created}", "remark": "", "goodsTagIds": "{goodsTagIds}", "marketFlag": "{firmCode}",
+            "totalMoney": "{totalMoney}", "receivable": "{receivable}", "collectionPrice": "{discountAmount}",
+            "discountAmount": "{discountAmount}", "handReceivableAmount": "{handReceivableAmount}",
+            "itemReceivableAmount": "{receivable}", "correctDiscount": "{correctDiscount}",  "shareRatio": "0",
+            "handlingTeam": "", "handActualAmount": "0", "handManageAmount": "0", "handCollectionAmount": "0",
+            "receivableAmount": "{receivable}", "categoryName": "{productName}", "categoryId": "{productId}",
+            "driverTel": "", "grossWeightDate": "{grossWeightDate}", "tareWeightDate": "{tareWeightDate}",
+            "grossPathName": "", "grossPathId": "", "tarePathId": "", "goodsRemark": "", "inGreeterName": "",
+            "inGreeterId": "0", "outGreeterId": "", "sumPrice": "{sumPrice}", "shipperName": "", "shipperId": "",
+            "shipperPhone": "", "feeDepName": "", "calcFeeDepId": "", "feeDepId": "","accountId":""}
+    data["autocomplete-cartype"] = autocompletecartype
+    data = dict(data, **kwargs)
+    data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
+    print("================开始请求================")
+    res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
+    return res
+
+
+
+def do_undoOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111",
+                ic=888810032426):
+    a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
+    print("listPage", a.json())
+    orderId = a.json()["rows"][0]["id"]
+    number = a.json()["rows"][0]["number"]
+    created = a.json()["rows"][0]["created"]
+    print(orderId)
+
+    # # 订单详情获取
+    resOrderDetails = get_orderRefund(host=host, orderId=orderId)
+
+    # 正则取值
+    regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
+
+    # bs取值
+    orderDetailsList = BeautifulSoup(resOrderDetails.text, "html.parser").findAll("input")
+    orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList}
+    print("orderDetailsDict",orderDetailsDict)
+    unitPrice = orderDetailsDict["unitPrice"]
+    goodsId = orderDetailsDict["goodsId"]
+    status = orderDetailsDict["status"]
+    source = orderDetailsDict["source"]
+    optType = orderDetailsDict["optType"]
+    correctInfo = orderDetailsDict["correctInfo"]
+    weightType = orderDetailsDict["weightType"]
+    correctDiscount = orderDetailsDict["correctDiscount"]
+    goodsTagIds = orderDetailsDict["goodsTagIds"]
+    sumPrice = orderDetailsDict["sumPrice"]
+    tradeTypeId = orderDetailsDict["tradeTypeId"]
+    shareRatio = orderDetailsDict["shareRatio"]
+    regionName=orderDetailsDict["regionName"]
+    plate = orderDetailsDict["plate"]
+    carTypeName = orderDetailsDict["carTypeName"]
+    carTypeCode = orderDetailsDict["carTypeCode"]
+    carTypeId = orderDetailsDict["carTypeId"]
+    carTypeWeight = orderDetailsDict["carTypeWeight"]
+    proveType = orderDetailsDict["proveType"]
+    grossWeight = orderDetailsDict["grossWeight"]
+    tareWeight = orderDetailsDict["tareWeight"]
+    depName = orderDetailsDict["depName"]
+    feeDepId = orderDetailsDict["calcDepId"]
+    productName = orderDetailsDict["productName"]
+    productId = orderDetailsDict["productId"]
+    grossWeightDate = orderDetailsDict["grossWeightDate"]
+    tareWeightDate = orderDetailsDict["tareWeightDate"]
+    weight = orderDetailsDict["weight"]
+    calcDepId = orderDetailsDict["calcDepId"]
+    categoryName = orderDetailsDict["categoryName"]
+    categoryId = orderDetailsDict["categoryId"]
+    inGreeterName = orderDetailsDict["inGreeterName"]
+    inGreeterId = orderDetailsDict["inGreeterId"]
+    productArea = orderDetailsDict["productArea"]
+    productPrice = orderDetailsDict["productPrice"]
+
+
+    # 用户信息获取
+    res = get_icCheck(host=host, ic=ic)
+    print(res.text)
+    customerId = res.json()["data"]["aInfo"]["customerId"]
+    customerName = res.json()["data"]["aInfo"]["customerName"]
+    accountId = res.json()["data"]["aInfo"]["accountId"]
+    mobile = res.json()["data"]["aInfo"]["mobile"]
+
+    # 省市区获取
+    res = get_city(host=host, name="万州")
+    print(res.text)
+    originId = res.json()["suggestions"][0]["id"]
+    # parentId = res.json()["suggestions"][0]["parentId"]
+    # value = res.json()["suggestions"][0]["value"]
+
+    # # 获取缴费金额
+    autocompletecartype = f"{carTypeCode}({carTypeName})"
+    print(autocompletecartype)
+    modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+    # 获取缴费金额
+    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+                           weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
+                           status=status,
+                           source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
+                           carTypeCode=carTypeCode,
+                           carTypeId=carTypeId, carTypeWeight=carTypeWeight, proveType=proveType,
+                           grossWeight=grossWeight,
+                           tareWeight=tareWeight, unitPrice=unitPrice, depName=depName, productName=productName,
+                           productId=productId, originId=originId, tradeTypeId=tradeTypeId, created=created,
+                           goodsTagIds=goodsTagIds,
+                           shareRatio=shareRatio, categoryName=categoryName, categoryId=categoryId,
+                           grossWeightDate=grossWeightDate,
+                           tareWeightDate=tareWeightDate, sumPrice=sumPrice, calcDepId=calcDepId, weight=weight,
+                           inGreeterName=inGreeterName, inGreeterId=inGreeterId)
+
+    # 缴费信息
+    totalMoney = re.findall('name="totalMoney" value="(.*?)">', res.text)[0]
+    discountAmount = re.findall('name="discountAmount" value="(.*?)">', res.text)[0]
+    handReceivableAmount = re.findall('name="handReceivableAmount" value="(.*?)">', res.text)[0]
+    correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">', res.text)[0]
+    receivable = re.findall('id="creceivableLong" name="receivable" value="(.*?)">', res.text)[0]
+    collectionPrice = re.findall('name="collectionPrice" value="(.*?)"', res.text)[0]
+
+    # 查找dl标签class为包含'ui-font-'字符的所有dl标签
+    soup = BeautifulSoup(res.text, "html.parser")
+    fee_str = "correctDiscount=1&billItems=&billItemsDic="
+    fee_int = 0
+    discount_amount = 0
+    for tag in soup.findAll("div", class_="d-flex align-items-center"):
+        c = tag.findAll("input")
+        for i in c:
+            if i.get("name") != None:
+                fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
+                if i.get("type") == "text":
+                    fee_int = fee_int + int(float(i.get("value")))
+                if "优惠" in i.get("value"):
+                    discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100
+
+    id = orderId
+    totalAmount = totalMoney
+    customerPhone = mobile
+    dep = feeDepId
+    chargeTotalAmount = totalMoney
+    chargeTotalAmountYuan = fee_int - int(discount_amount)
+    freezeMoneySymbol = fee_int
+    comparisonFreezeAmount = fee_int
+    modified = created
+    firmCode = my.userInfo["data"]["user"]["firmCode"]
+    marketFlag = firmCode
+    itemReceivableAmount = receivable
+    receivableAmount = receivable
+    tareWeightDate = tareWeightDate
+
+    aa = do_doUndo(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,
+                  fundAccount=accountId,
+                  accountId=accountId, ic=ic, customerName=customerName, customerPhone=customerPhone, plate=plate,
+                  carTypeName=carTypeName, carTypeCode=carTypeCode, carTypeId=carTypeId, carTypeWeight=carTypeWeight,
+                  proveType=proveType, grossWeight=grossWeight, tareWeight=tareWeight, weight=weight,
+                  productPrice=productPrice,
+                  unitPrice=unitPrice, depName=depName, calcDepId=calcDepId, dep=dep, regionName=regionName,
+                  regionId=regionId,
+                  productName=productName, productId=productId, productArea=productArea, originId=originId,
+                  tradeTypeId=tradeTypeId, correctInfo=correctInfo, chargeTotalAmount=chargeTotalAmount,
+                  freezeMoneySymbol=freezeMoneySymbol, comparisonFreezeAmount=comparisonFreezeAmount, modified=modified,
+                  goodsTagIds=goodsTagIds, marketFlag=marketFlag, totalMoney=totalMoney, receivable=receivable,
+                  collectionPrice=collectionPrice, discountAmount=discountAmount,
+                  handReceivableAmount=handReceivableAmount,
+                  itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
+                  categoryName=categoryName,
+                  categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
+                  sumPrice=sumPrice,
+                  chargeTotalAmountYuan=chargeTotalAmountYuan)
+
+    print(aa.text)
+    return aa
+
+do_undoOrder(attrValue="202108160900059")
 \ No newline at end of file
-[2021-08-16 15:10:33] [INFO] : ======================================================================================
-[2021-08-16 15:10:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sy_chen', 'password': 'EFQkrmRJoJ6LdeaAl1gEsYb/iArRAvwFJcpLKHrKlU2280lYhdxeSPkrxxlbUcaSKvQfNNoOXEiNW9YnsgYZtSoNtqEjOAJKNXPAw/6UG/MxOl6NwzNiQrXVJ587MosqW7wmloUZ5pGLz7EY+oNtBN4UgHHCP9NO2i5MSKbRcuM='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-16 16:06:02] [INFO] : ======================================================================================
+[2021-08-16 16:06:02] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sy_chen', 'password': 'n8d9EUNNIfA1OmiFCoCsse6JsQuL2X27GdoL7MXyE2VsM0pdj+7tm2UWJ+e/RqjnlFx4I7DXb00dGEmy+NnqXes95SymiPcXNFGh6vOjZBM2mOaU0/AokZv17ibNeMnADe2G8yoOSeOqLqpF6jgz8th7erAXsFC9Yd3jswX/RqU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-16 15:10:33] [INFO] : ======================================================================================
-[2021-08-16 15:10:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sygangda', 'password': 'Z4guFblVxIfgFAzI4jcAFrIq/ERjbS1nQX2ZvfuP87kV5imfCsa4FURuEo0PEalYWsJlw/S+0vBgUbv4ovxFwOm0sDnPdL+PV/3gt5zeMHl2k8rriSCA3RZYc8AFYOrKj5K5Bc6Zr/bzki2FzVUP24T2x8XiGUglOgrgNBEO950='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-16 16:06:02] [INFO] : ======================================================================================
+[2021-08-16 16:06:02] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sygangda', 'password': 'DZ2/wMCxFP2C9Q4UysO29kQ9Jmv/k/RdRtoBb5DP4WCNXmHSDCmA8jucmDkzLsagG+X2llVO3WWNEMh34RHOwW6z89QPlgfsySHzE0ox4QpCCtDtEcQwkHyJ9RYDHNUnadAcMBB7Sx/DkFJV6KpO19rCfjU2ZyypARufS7DYdOE='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
-{'provider': 'carTypeForJmsfProvider'}
-{}
-
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
-{'provider': 'categoryProvider'}
-{}
-
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
-None
-{'params': {'keyword': ''}}
-
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
-{'provider': 'entranceFeeBillTypeProvider'}
-{}
-
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
-{'provider': 'entranceFeeBillStateProvider'}
-{}
-
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
-{'provider': 'tradeTypeProvider'}
-{}
-
-[2021-08-16 15:10:34] [INFO] : ======================================================================================
-[2021-08-16 15:10:34] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
+[2021-08-16 16:06:03] [INFO] : ======================================================================================
+[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
 {"businessCode": "jmsf"}
 {}
-[2021-08-16 15:10:35] [INFO] : ======================================================================================
-[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
-{"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
+[2021-08-16 16:06:03] [INFO] : ======================================================================================
+[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 9, "state": 1, "keyword": "\u706b\u9f99\u679c"}
 {}
-[2021-08-16 15:10:35] [INFO] : ======================================================================================
-[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
+[2021-08-16 16:06:03] [INFO] : ======================================================================================
+[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
 {"firmCode": "sy", "departmentId": 58, "keyword": ""}
 {}
-[2021-08-16 15:10:35] [INFO] : ======================================================================================
-[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
+[2021-08-16 16:06:03] [INFO] : ======================================================================================
+[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
 {"pageNum": 100, "pageSize": 100, "marketId": 9}
 {}
-[2021-08-16 15:10:35] [INFO] : ======================================================================================
-[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+[2021-08-16 16:06:03] [INFO] : ======================================================================================
+[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
 {'params': {'pid': 'goods_tag'}}
-[2021-08-16 15:10:35] [INFO] : ======================================================================================
-[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
+[2021-08-16 16:06:04] [INFO] : ======================================================================================
+[2021-08-16 16:06:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
 {"province": "C", "city": null, "area": null}
 {}
-[2021-08-16 15:10:36] [INFO] : ======================================================================================
-[2021-08-16 15:10:36] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
+[2021-08-16 16:06:04] [INFO] : ======================================================================================
+[2021-08-16 16:06:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
 None
 {'params': {'keyword': ''}}
-[2021-08-16 15:10:36] [INFO] : ======================================================================================
-[2021-08-16 15:10:36] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+[2021-08-16 16:06:04] [INFO] : ======================================================================================
+[2021-08-16 16:06:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
 {'params': {'pid': 'prove_type'}}
-[2021-08-16 15:10:37] [INFO] : ======================================================================================
-[2021-08-16 15:10:37] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
-None
-{}
-
-[2021-08-16 15:10:37] [INFO] : ======================================================================================
-[2021-08-16 15:10:37] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
-{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA75326", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14158, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 432, "grossWeightDate": "2021-08-16 15:10:37", "newWeight": 99, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA75326", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\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": "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 15:10:37] [INFO] : ======================================================================================
-[2021-08-16 15:10:37] [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': '202108160900059'}
-{}
-
-[2021-08-16 15:10:38] [INFO] : ======================================================================================
-[2021-08-16 15:10:38] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/4283.action
-None
-{}
-
-[2021-08-16 15:10:39] [INFO] : ======================================================================================
-[2021-08-16 15:10:39] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
-None
-{}
-
-[2021-08-16 15:10:40] [INFO] : ======================================================================================
-[2021-08-16 15:10:40] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+[2021-08-16 16:06:05] [INFO] : ======================================================================================
+[2021-08-16 16:06:05] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
 None
 {}
-[2021-08-16 15:10:40] [INFO] : ======================================================================================
-[2021-08-16 15:10:40] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
-{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 4283, 'goodsId': '4297', 'number': '202108160900059', 'modified': '2021-08-16 15:10:40', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A75326', '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': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '70', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-16 15:10:37', 'remark': 'false', 'goodsTagIds': '663', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-16 15:10:37', 'tareWeightDate': '2021-08-16 15:10:37', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '测试沈阳', 'inGreeterId': '223', 'outGreeterId': '', 'sumPrice': '9900', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
-{}
-
-[2021-08-16 15:10:41] [INFO] : ======================================================================================
-[2021-08-16 15:10:41] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
-protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=4283&goodsId=4297&number=202108160900059&modified=2021-08-16%2015%3A10%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%9DA75326&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=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=70&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-16%2015%3A10%3A37&remark=&goodsTagIds=663&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-16%2015%3A10%3A37&tareWeightDate=2021-08-16%2015%3A10%3A37&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=9900&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
-{}
-
-[2021-08-16 15:10:46] [INFO] : ======================================================================================
-[2021-08-16 15:10:46] [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': '202108160900059'}
-{}
-
-[2021-08-16 15:10:46] [INFO] : ======================================================================================
-[2021-08-16 15:10:46] [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', 'startPayTime': '2021-08-16 15:10:44', 'endPayTime': '2021-08-16 15:10:44'}
+[2021-08-16 16:06:05] [INFO] : ======================================================================================
+[2021-08-16 16:06:05] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
+{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddB31763", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 3927, "productName": "tctest04", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 432, "grossWeightDate": "2021-08-16 16:06:05", "newWeight": 99, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddB31763", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 3927, "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}
 {}
@@ -17,8 +17,8 @@ from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from commons.api import hpApi
 import time,random
-class test_ZCCreate(unittest.TestCase):
-    """整车-创建整车进门单"""
+class test_HPCreate(unittest.TestCase):
+    """整车-车辆回皮"""
     def setUp(self) -> None:
         pass
@@ -37,6 +37,7 @@ class test_ZCCreate(unittest.TestCase):
         pass
     def test_hp(self):
+        """整车-车辆回皮：创建回皮进门单"""
         plate = f"川B{random.randint(10000,99999)}"
         goods = "雪莲果"
         cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
@@ -48,6 +49,7 @@ class test_ZCCreate(unittest.TestCase):
         assert "data" in res.text,"回皮失败"
     def test_SearchByPlate(self):
+        """整车-车辆回皮：根据车牌号查询"""
         plate = f"川B{random.randint(10000,99999)}"
         goods="火龙果"
         cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
@@ -59,7 +61,21 @@ class test_ZCCreate(unittest.TestCase):
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
+    def test_SearchByNumber(self):
+        """整车-车辆回皮：根据收费单号查询"""
+        plate = f"川B{random.randint(10000,99999)}"
+        goods="火龙果"
+        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
+        print(cre_res.json())
+        number = cre_res.json()["data"]["number"]
+        aa = eFBL.do_freezeOrder(host=self.jmsfHost,attrValue=number)
+        res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,number=number)
+        print(res.json())
+        assert res.json()["code"]=="200","车号查询失败"
+        assert res.json()["data"][-1]["number"]==number,"车号查询失败"
+
     def test_SearchByCusName(self):
+        """整车-车辆回皮：根据客户查询"""
         plate = f"川B{random.randint(10000,99999)}"
         goods="雪莲果"
         ic = self.ic
@@ -36,6 +36,7 @@ class test_ZCCreate(unittest.TestCase):
         pass
     def test_createSJ(self):
+        """整车-创建散件进门单"""
         # 依赖数据
         plate = f"川A{random.randint(10000, 99999)}"
         trailerNumber = plate
@@ -15,38 +15,37 @@ import random
 # 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"]
-# 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","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)
-
-aa = []
-bb = []
-
-for i in c:
-    if i not in a:
-        aa.append(i)
-    if i not in b:
-        bb.append(i)
-
-print(aa)
-print(bb)
+# # 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"]
+# # 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","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)
+#
+# aa = []
+# bb = []
+#
+# for i in c:
+#     if i not in a:
+#         aa.append(i)
+#     if i not in b:
+#         bb.append(i)
+#
+# print(aa)
+# print(bb)
-from bs4 import BeautifulSoup
-import random
-import json
+def something(numA=None,*numB,**data):
+    print(numA)
+    print(numB)
+    print(data)
+    # print(numC)
-# with open("demo_a.html",encoding="utf-8") as com:
-#     data = com.read()
-#
-# orderDetailsSoup = BeautifulSoup(data, "html.parser")
-# selectList = orderDetailsSoup.findAll("select")
-# selectDict = {i.get("name"):a.get("value") for i in selectList for a in i.findAll("option")}
-# print(selectDict)
+something(1,1,2,3,numC="4",e="5")
+def do(a=None,b=None):
+    print(a)
+    print(b)
-# a  = "123"
-# print(a.isdigit())
 \ No newline at end of file
+num = {"a":"b"}
+do(num)
 \ No newline at end of file