autotest / jmsf-re · Commits

Commit 8ea79cf5ea8fa64b62d4ac9ea518d52656054eab

Authored by liujiqiang
1 parent c27e28cd
build: skipped

备注添加

Inline Side-by-side
Showing 5 changed files with 331 additions and 130 deletions
commons/api/entranceFeeBillList/operationDoUndo.py 0 → 100644
  View file @8ea79cf
  1 +# -*- coding: utf-8 -*-
  2 +
  3 +# @Time : 2021/8/16 15:15
  4 +# @Author : Ljq
  5 +# @File : operationDoUndo.py
  6 +# @Software: PyCharm
  7 +
  8 +"""
  9 +
  10 +"""
  11 +
  12 +import json,time,random,re
  13 +from commons.scripts import dealContentType as dct
  14 +from commons.scripts import jsonToUrlcode
  15 +from commons.MySession import my
  16 +from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
  17 +from bs4 import BeautifulSoup
  18 +import urllib.parse
  19 +
  20 +def get_orderRefund(host="",orderId=None):
  21 + """获取订单详情"""
  22 + headers = dct.urlCode()
  23 + url = host + f"/entranceFeeBill/refund/{orderId}.action"
  24 + res = my.useHeadersRequests("get", url=url, headers=headers)
  25 + return res
  26 +
  27 +def get_calculateRes(host="",autocompletecartype=None,**kwargs):
  28 + """缴费金额获取"""
  29 + url = host + "/calculate/index.action"
  30 + headers = dct.urlCode()
  31 +
  32 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "refund", "optType": "optType", "optUrl": "",
  33 + "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
  34 + "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
  35 + "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
  36 + "accountId":"","ic": "","customerName": "", "customerPhone": "", "payway": "刷卡", "plate": "plate",
  37 + "autocomplete-cartype": "carTypeCode(carTypeName)", "carTypeName": "carTypeName",
  38 + "carTypeCode": "carTypeCode", "carTypeId": "carTypeId", "carTypeWeight": "carTypeWeight",
  39 + "storeTareWeight": "", "proveType": "proveTypeCode", "grossWeight": "grossWeight",
  40 + "tareWeight": "tareWeight", "weight": "grossWeight", "goodsNum": "", "itemWeight": "",
  41 + "productPrice": "1.00000", "unitPrice": "unitPrice", "depName": "feeDepName", "calcDepId": "feeDepId",
  42 + "regionName": "", "regionId": "0", "productName": "productName", "productId": "productId",
  43 + "productArea": "重庆,重庆市,万州区", "parentId": "", "levelType": "", "originId": "originId", "tradeTypeId": "tradeTypeId",
  44 + "chargeTotalAmount": "", "chargeTotalAmountYuan": "", "freezeMoneySymbol": "", "comparisonFreezeAmount": "",
  45 + "created": "created", "remark": "false", "goodsTagIds": "goodsTagIds", "shareRatio": "shareRatio",
  46 + "handlingTeam": "", "handlingRatio": "", "handActualAmount": "", "handManageAmount": "",
  47 + "handCollectionAmount": "", "receivableAmount": "", "categoryName": "productName",
  48 + "categoryId": "productId", "driverTel": "", "grossWeightDate": "grossWeightDate",
  49 + "tareWeightDate": "tareWeightDate", "grossPathName": "", "grossPathId": "", "tarePathId": "",
  50 + "goodsRemark": "", "inGreeterName": "", "inGreeterId": "0", "outGreeterId": "", "sumPrice": "sumPrice",
  51 + "shipperName": "", "shipperId": "", "shipperPhone": "", "feeDepName": "", "calcFeeDepId": ""}
  52 + data["autocomplete-cartype"]=autocompletecartype
  53 + data = dict(data,**kwargs)
  54 + print("get_calculateRes",data)
  55 + res = my.useHeadersRequests("post", url=url,data=data,headers=headers)
  56 + return res
  57 +
  58 +
  59 +def do_doUndo(host="",autocompletecartype=None,fee_str="",**kwargs):
  60 + """进门单缴费"""
  61 + url = host + "/entranceTrade/doPay.action"
  62 + headers = dct.urlCode()
  63 +
  64 + data = {"protocolId": "", "pwd": "{pwd}", "clientRedirectTag": "", "viewType": "refund", "optType": "{optType}",
  65 + "optUrl": "", "correctInfo": "{correctInfo}", "weightType": "{weightType}", "id": "{orderId}",
  66 + "goodsId": "{goodsId}", "number": "{number}", "modified": "{created}", "status": "{status}",
  67 + "source": "{source}", "updateFeeItems": "", "correctDiscount": "{correctDiscount}",
  68 + "totalAmount": "{totalMoney}", "customerId": "{customerId}", "fundAccount": "{accountId}", "ic": "{ic}",
  69 + "customerName": "{customerName}", "customerPhone": "{mobile}", "payway": "刷卡", "plate": "{plate}",
  70 + "autocomplete-cartype": "{carTypeCode}({carTypeName})", "carTypeName": "{carTypeName}",
  71 + "carTypeCode": "{carTypeCode}", "carTypeId": "{carTypeId}", "carTypeWeight": "{carTypeWeight}",
  72 + "storeTareWeight": "", "proveType": "{proveTypeCode}", "grossWeight": "{grossWeight}",
  73 + "tareWeight": "{tareWeight}", "weight": "{newWeight}", "goodsNum": "", "itemWeight": "",
  74 + "productPrice": "{productPrice}", "unitPrice": "{unitPrice}", "depName": "{feeDepName}",
  75 + "calcDepId": "{feeDepId}", "dep": "{feeDepId}", "regionName": "{regionName}", "regionId": "{regionId}",
  76 + "productName": "{productName}", "productId": "{productId}", "productArea": "{origin}", "parentId": "",
  77 + "levelType": "", "originId": "{originId}", "tradeTypeId": "{tradeTypeId}",
  78 + "chargeTotalAmount": "{totalMoney}", "chargeTotalAmountYuan": "{chargeTotalAmountYuan}",
  79 + "freezeMoneySymbol": "{chargeTotalAmountYuan}", "comparisonFreezeAmount": "{chargeTotalAmountYuan}",
  80 + "created": "{created}", "remark": "", "goodsTagIds": "{goodsTagIds}", "marketFlag": "{firmCode}",
  81 + "totalMoney": "{totalMoney}", "receivable": "{receivable}", "collectionPrice": "{discountAmount}",
  82 + "discountAmount": "{discountAmount}", "handReceivableAmount": "{handReceivableAmount}",
  83 + "itemReceivableAmount": "{receivable}", "correctDiscount": "{correctDiscount}", "shareRatio": "0",
  84 + "handlingTeam": "", "handActualAmount": "0", "handManageAmount": "0", "handCollectionAmount": "0",
  85 + "receivableAmount": "{receivable}", "categoryName": "{productName}", "categoryId": "{productId}",
  86 + "driverTel": "", "grossWeightDate": "{grossWeightDate}", "tareWeightDate": "{tareWeightDate}",
  87 + "grossPathName": "", "grossPathId": "", "tarePathId": "", "goodsRemark": "", "inGreeterName": "",
  88 + "inGreeterId": "0", "outGreeterId": "", "sumPrice": "{sumPrice}", "shipperName": "", "shipperId": "",
  89 + "shipperPhone": "", "feeDepName": "", "calcFeeDepId": "", "feeDepId": "","accountId":""}
  90 + data["autocomplete-cartype"] = autocompletecartype
  91 + data = dict(data, **kwargs)
  92 + data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
  93 + print("================开始请求================")
  94 + res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
  95 + return res
  96 +
  97 +
  98 +
  99 +def do_undoOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032",pwd="111111",
  100 + ic=888810032426):
  101 + a = eFBL.listPage(host=host, attrName=attrName, attrValue=attrValue)
  102 + print("listPage", a.json())
  103 + orderId = a.json()["rows"][0]["id"]
  104 + number = a.json()["rows"][0]["number"]
  105 + created = a.json()["rows"][0]["created"]
  106 + print(orderId)
  107 +
  108 + # # 订单详情获取
  109 + resOrderDetails = get_orderRefund(host=host, orderId=orderId)
  110 +
  111 + # 正则取值
  112 + regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
  113 +
  114 + # bs取值
  115 + orderDetailsList = BeautifulSoup(resOrderDetails.text, "html.parser").findAll("input")
  116 + orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList}
  117 + print("orderDetailsDict",orderDetailsDict)
  118 + unitPrice = orderDetailsDict["unitPrice"]
  119 + goodsId = orderDetailsDict["goodsId"]
  120 + status = orderDetailsDict["status"]
  121 + source = orderDetailsDict["source"]
  122 + optType = orderDetailsDict["optType"]
  123 + correctInfo = orderDetailsDict["correctInfo"]
  124 + weightType = orderDetailsDict["weightType"]
  125 + correctDiscount = orderDetailsDict["correctDiscount"]
  126 + goodsTagIds = orderDetailsDict["goodsTagIds"]
  127 + sumPrice = orderDetailsDict["sumPrice"]
  128 + tradeTypeId = orderDetailsDict["tradeTypeId"]
  129 + shareRatio = orderDetailsDict["shareRatio"]
  130 + regionName=orderDetailsDict["regionName"]
  131 + plate = orderDetailsDict["plate"]
  132 + carTypeName = orderDetailsDict["carTypeName"]
  133 + carTypeCode = orderDetailsDict["carTypeCode"]
  134 + carTypeId = orderDetailsDict["carTypeId"]
  135 + carTypeWeight = orderDetailsDict["carTypeWeight"]
  136 + proveType = orderDetailsDict["proveType"]
  137 + grossWeight = orderDetailsDict["grossWeight"]
  138 + tareWeight = orderDetailsDict["tareWeight"]
  139 + depName = orderDetailsDict["depName"]
  140 + feeDepId = orderDetailsDict["calcDepId"]
  141 + productName = orderDetailsDict["productName"]
  142 + productId = orderDetailsDict["productId"]
  143 + grossWeightDate = orderDetailsDict["grossWeightDate"]
  144 + tareWeightDate = orderDetailsDict["tareWeightDate"]
  145 + weight = orderDetailsDict["weight"]
  146 + calcDepId = orderDetailsDict["calcDepId"]
  147 + categoryName = orderDetailsDict["categoryName"]
  148 + categoryId = orderDetailsDict["categoryId"]
  149 + inGreeterName = orderDetailsDict["inGreeterName"]
  150 + inGreeterId = orderDetailsDict["inGreeterId"]
  151 + productArea = orderDetailsDict["productArea"]
  152 + productPrice = orderDetailsDict["productPrice"]
  153 +
  154 +
  155 + # 用户信息获取
  156 + res = get_icCheck(host=host, ic=ic)
  157 + print(res.text)
  158 + customerId = res.json()["data"]["aInfo"]["customerId"]
  159 + customerName = res.json()["data"]["aInfo"]["customerName"]
  160 + accountId = res.json()["data"]["aInfo"]["accountId"]
  161 + mobile = res.json()["data"]["aInfo"]["mobile"]
  162 +
  163 + # 省市区获取
  164 + res = get_city(host=host, name="万州")
  165 + print(res.text)
  166 + originId = res.json()["suggestions"][0]["id"]
  167 + # parentId = res.json()["suggestions"][0]["parentId"]
  168 + # value = res.json()["suggestions"][0]["value"]
  169 +
  170 + # # 获取缴费金额
  171 + autocompletecartype = f"{carTypeCode}({carTypeName})"
  172 + print(autocompletecartype)
  173 + modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
  174 +
  175 + # 获取缴费金额
  176 + res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
  177 + weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
  178 + status=status,
  179 + source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
  180 + carTypeCode=carTypeCode,
  181 + carTypeId=carTypeId, carTypeWeight=carTypeWeight, proveType=proveType,
  182 + grossWeight=grossWeight,
  183 + tareWeight=tareWeight, unitPrice=unitPrice, depName=depName, productName=productName,
  184 + productId=productId, originId=originId, tradeTypeId=tradeTypeId, created=created,
  185 + goodsTagIds=goodsTagIds,
  186 + shareRatio=shareRatio, categoryName=categoryName, categoryId=categoryId,
  187 + grossWeightDate=grossWeightDate,
  188 + tareWeightDate=tareWeightDate, sumPrice=sumPrice, calcDepId=calcDepId, weight=weight,
  189 + inGreeterName=inGreeterName, inGreeterId=inGreeterId)
  190 +
  191 + # 缴费信息
  192 + totalMoney = re.findall('name="totalMoney" value="(.*?)">', res.text)[0]
  193 + discountAmount = re.findall('name="discountAmount" value="(.*?)">', res.text)[0]
  194 + handReceivableAmount = re.findall('name="handReceivableAmount" value="(.*?)">', res.text)[0]
  195 + correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">', res.text)[0]
  196 + receivable = re.findall('id="creceivableLong" name="receivable" value="(.*?)">', res.text)[0]
  197 + collectionPrice = re.findall('name="collectionPrice" value="(.*?)"', res.text)[0]
  198 +
  199 + # 查找dl标签class为包含'ui-font-'字符的所有dl标签
  200 + soup = BeautifulSoup(res.text, "html.parser")
  201 + fee_str = "correctDiscount=1&billItems=&billItemsDic="
  202 + fee_int = 0
  203 + discount_amount = 0
  204 + for tag in soup.findAll("div", class_="d-flex align-items-center"):
  205 + c = tag.findAll("input")
  206 + for i in c:
  207 + if i.get("name") != None:
  208 + fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
  209 + if i.get("type") == "text":
  210 + fee_int = fee_int + int(float(i.get("value")))
  211 + if "优惠" in i.get("value"):
  212 + discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100
  213 +
  214 + id = orderId
  215 + totalAmount = totalMoney
  216 + customerPhone = mobile
  217 + dep = feeDepId
  218 + chargeTotalAmount = totalMoney
  219 + chargeTotalAmountYuan = fee_int - int(discount_amount)
  220 + freezeMoneySymbol = fee_int
  221 + comparisonFreezeAmount = fee_int
  222 + modified = created
  223 + firmCode = my.userInfo["data"]["user"]["firmCode"]
  224 + marketFlag = firmCode
  225 + itemReceivableAmount = receivable
  226 + receivableAmount = receivable
  227 + tareWeightDate = tareWeightDate
  228 +
  229 + aa = do_doUndo(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
  230 + weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
  231 + source=source,
  232 + correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
  233 + fundAccount=accountId,
  234 + accountId=accountId, ic=ic, customerName=customerName, customerPhone=customerPhone, plate=plate,
  235 + carTypeName=carTypeName, carTypeCode=carTypeCode, carTypeId=carTypeId, carTypeWeight=carTypeWeight,
  236 + proveType=proveType, grossWeight=grossWeight, tareWeight=tareWeight, weight=weight,
  237 + productPrice=productPrice,
  238 + unitPrice=unitPrice, depName=depName, calcDepId=calcDepId, dep=dep, regionName=regionName,
  239 + regionId=regionId,
  240 + productName=productName, productId=productId, productArea=productArea, originId=originId,
  241 + tradeTypeId=tradeTypeId, correctInfo=correctInfo, chargeTotalAmount=chargeTotalAmount,
  242 + freezeMoneySymbol=freezeMoneySymbol, comparisonFreezeAmount=comparisonFreezeAmount, modified=modified,
  243 + goodsTagIds=goodsTagIds, marketFlag=marketFlag, totalMoney=totalMoney, receivable=receivable,
  244 + collectionPrice=collectionPrice, discountAmount=discountAmount,
  245 + handReceivableAmount=handReceivableAmount,
  246 + itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
  247 + categoryName=categoryName,
  248 + categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
  249 + sumPrice=sumPrice,
  250 + chargeTotalAmountYuan=chargeTotalAmountYuan)
  251 +
  252 + print(aa.text)
  253 + return aa
  254 +
  255 +do_undoOrder(attrValue="202108160900059")
0 256 \ No newline at end of file
... ...
report/test.log
  View file @8ea79cf
1   -[2021-08-16 15:10:33] [INFO] : ======================================================================================
2   -[2021-08-16 15:10:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
3   -{'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'}}
  1 +[2021-08-16 16:06:02] [INFO] : ======================================================================================
  2 +[2021-08-16 16:06:02] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  3 +{'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'}}
4 4  
5   -[2021-08-16 15:10:33] [INFO] : ======================================================================================
6   -[2021-08-16 15:10:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
7   -{'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'}}
  5 +[2021-08-16 16:06:02] [INFO] : ======================================================================================
  6 +[2021-08-16 16:06:02] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  7 +{'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'}}
8 8  
9   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
10   -[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
11   -{'provider': 'carTypeForJmsfProvider'}
12   -{}
13   -
14   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
15   -[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
16   -{'provider': 'categoryProvider'}
17   -{}
18   -
19   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
20   -[2021-08-16 15:10:34] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
21   -None
22   -{'params': {'keyword': ''}}
23   -
24   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
25   -[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
26   -{'provider': 'entranceFeeBillTypeProvider'}
27   -{}
28   -
29   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
30   -[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
31   -{'provider': 'entranceFeeBillStateProvider'}
32   -{}
33   -
34   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
35   -[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
36   -{'provider': 'tradeTypeProvider'}
37   -{}
38   -
39   -[2021-08-16 15:10:34] [INFO] : ======================================================================================
40   -[2021-08-16 15:10:34] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
  9 +[2021-08-16 16:06:03] [INFO] : ======================================================================================
  10 +[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
41 11 {"businessCode": "jmsf"}
42 12 {}
43 13  
44   -[2021-08-16 15:10:35] [INFO] : ======================================================================================
45   -[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
46   -{"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
  14 +[2021-08-16 16:06:03] [INFO] : ======================================================================================
  15 +[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  16 +{"marketId": 9, "state": 1, "keyword": "\u706b\u9f99\u679c"}
47 17 {}
48 18  
49   -[2021-08-16 15:10:35] [INFO] : ======================================================================================
50   -[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
  19 +[2021-08-16 16:06:03] [INFO] : ======================================================================================
  20 +[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
51 21 {"firmCode": "sy", "departmentId": 58, "keyword": ""}
52 22 {}
53 23  
54   -[2021-08-16 15:10:35] [INFO] : ======================================================================================
55   -[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
  24 +[2021-08-16 16:06:03] [INFO] : ======================================================================================
  25 +[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
56 26 {"pageNum": 100, "pageSize": 100, "marketId": 9}
57 27 {}
58 28  
59   -[2021-08-16 15:10:35] [INFO] : ======================================================================================
60   -[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  29 +[2021-08-16 16:06:03] [INFO] : ======================================================================================
  30 +[2021-08-16 16:06:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
61 31 None
62 32 {'params': {'pid': 'goods_tag'}}
63 33  
64   -[2021-08-16 15:10:35] [INFO] : ======================================================================================
65   -[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
  34 +[2021-08-16 16:06:04] [INFO] : ======================================================================================
  35 +[2021-08-16 16:06:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
66 36 {"province": "C", "city": null, "area": null}
67 37 {}
68 38  
69   -[2021-08-16 15:10:36] [INFO] : ======================================================================================
70   -[2021-08-16 15:10:36] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  39 +[2021-08-16 16:06:04] [INFO] : ======================================================================================
  40 +[2021-08-16 16:06:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
71 41 None
72 42 {'params': {'keyword': ''}}
73 43  
74   -[2021-08-16 15:10:36] [INFO] : ======================================================================================
75   -[2021-08-16 15:10:36] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  44 +[2021-08-16 16:06:04] [INFO] : ======================================================================================
  45 +[2021-08-16 16:06:04] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
76 46 None
77 47 {'params': {'pid': 'prove_type'}}
78 48  
79   -[2021-08-16 15:10:37] [INFO] : ======================================================================================
80   -[2021-08-16 15:10:37] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
81   -None
82   -{}
83   -
84   -[2021-08-16 15:10:37] [INFO] : ======================================================================================
85   -[2021-08-16 15:10:37] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
86   -{"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}
87   -{}
88   -
89   -[2021-08-16 15:10:37] [INFO] : ======================================================================================
90   -[2021-08-16 15:10:37] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
91   -{'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'}
92   -{}
93   -
94   -[2021-08-16 15:10:38] [INFO] : ======================================================================================
95   -[2021-08-16 15:10:38] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/4283.action
96   -None
97   -{}
98   -
99   -[2021-08-16 15:10:39] [INFO] : ======================================================================================
100   -[2021-08-16 15:10:39] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
101   -None
102   -{}
103   -
104   -[2021-08-16 15:10:40] [INFO] : ======================================================================================
105   -[2021-08-16 15:10:40] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
  49 +[2021-08-16 16:06:05] [INFO] : ======================================================================================
  50 +[2021-08-16 16:06:05] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
106 51 None
107 52 {}
108 53  
109   -[2021-08-16 15:10:40] [INFO] : ======================================================================================
110   -[2021-08-16 15:10:40] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
111   -{'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': ''}
112   -{}
113   -
114   -[2021-08-16 15:10:41] [INFO] : ======================================================================================
115   -[2021-08-16 15:10:41] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
116   -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
117   -{}
118   -
119   -[2021-08-16 15:10:46] [INFO] : ======================================================================================
120   -[2021-08-16 15:10:46] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
121   -{'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'}
122   -{}
123   -
124   -[2021-08-16 15:10:46] [INFO] : ======================================================================================
125   -[2021-08-16 15:10:46] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
126   -{'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'}
  54 +[2021-08-16 16:06:05] [INFO] : ======================================================================================
  55 +[2021-08-16 16:06:05] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
  56 +{"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}
127 57 {}
128 58  
... ...
testcase/test_HP/test_HP.py
  View file @8ea79cf
... ... @@ -17,8 +17,8 @@ from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
17 17 from commons.api import hpApi
18 18 import time,random
19 19  
20   -class test_ZCCreate(unittest.TestCase):
21   - """整车-创建整车进门单"""
  20 +class test_HPCreate(unittest.TestCase):
  21 + """整车-车辆回皮"""
22 22 def setUp(self) -> None:
23 23 pass
24 24  
... ... @@ -37,6 +37,7 @@ class test_ZCCreate(unittest.TestCase):
37 37 pass
38 38  
39 39 def test_hp(self):
  40 + """整车-车辆回皮：创建回皮进门单"""
40 41 plate = f"川B{random.randint(10000,99999)}"
41 42 goods = "雪莲果"
42 43 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
... ... @@ -48,6 +49,7 @@ class test_ZCCreate(unittest.TestCase):
48 49 assert "data" in res.text,"回皮失败"
49 50  
50 51 def test_SearchByPlate(self):
  52 + """整车-车辆回皮：根据车牌号查询"""
51 53 plate = f"川B{random.randint(10000,99999)}"
52 54 goods="火龙果"
53 55 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
... ... @@ -59,7 +61,21 @@ class test_ZCCreate(unittest.TestCase):
59 61 assert res.json()["code"]=="200","车号查询失败"
60 62 assert res.json()["data"][-1]["number"]==number,"车号查询失败"
61 63  
  64 + def test_SearchByNumber(self):
  65 + """整车-车辆回皮：根据收费单号查询"""
  66 + plate = f"川B{random.randint(10000,99999)}"
  67 + goods="火龙果"
  68 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
  69 + print(cre_res.json())
  70 + number = cre_res.json()["data"]["number"]
  71 + aa = eFBL.do_freezeOrder(host=self.jmsfHost,attrValue=number)
  72 + res = hpApi.get_listBackSkinTrucks(host=self.gatewayHost,number=number)
  73 + print(res.json())
  74 + assert res.json()["code"]=="200","车号查询失败"
  75 + assert res.json()["data"][-1]["number"]==number,"车号查询失败"
  76 +
62 77 def test_SearchByCusName(self):
  78 + """整车-车辆回皮：根据客户查询"""
63 79 plate = f"川B{random.randint(10000,99999)}"
64 80 goods="雪莲果"
65 81 ic = self.ic
... ...
testcase/test_SJ/test_SJ.py
  View file @8ea79cf
... ... @@ -36,6 +36,7 @@ class test_ZCCreate(unittest.TestCase):
36 36 pass
37 37  
38 38 def test_createSJ(self):
  39 + """整车-创建散件进门单"""
39 40 # 依赖数据
40 41 plate = f"川A{random.randint(10000, 99999)}"
41 42 trailerNumber = plate
... ...
testcase/test_ZC/demo.py
  View file @8ea79cf
... ... @@ -15,38 +15,37 @@ import random
15 15 # 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"]
16 16  
17 17  
18   -# a系统
19   -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"]
20   -# b自己
21   -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"]
22   -c = list(set(a)^set(b))
23   -# print(c)
24   -
25   -aa = []
26   -bb = []
27   -
28   -for i in c:
29   - if i not in a:
30   - aa.append(i)
31   - if i not in b:
32   - bb.append(i)
33   -
34   -print(aa)
35   -print(bb)
  18 +# # a系统
  19 +# 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"]
  20 +# # b自己
  21 +# 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"]
  22 +# c = list(set(a)^set(b))
  23 +# # print(c)
  24 +#
  25 +# aa = []
  26 +# bb = []
  27 +#
  28 +# for i in c:
  29 +# if i not in a:
  30 +# aa.append(i)
  31 +# if i not in b:
  32 +# bb.append(i)
  33 +#
  34 +# print(aa)
  35 +# print(bb)
36 36  
37 37  
38   -from bs4 import BeautifulSoup
39   -import random
40   -import json
  38 +def something(numA=None,*numB,**data):
  39 + print(numA)
  40 + print(numB)
  41 + print(data)
  42 + # print(numC)
41 43  
42   -# with open("demo_a.html",encoding="utf-8") as com:
43   -# data = com.read()
44   -#
45   -# orderDetailsSoup = BeautifulSoup(data, "html.parser")
46   -# selectList = orderDetailsSoup.findAll("select")
47   -# selectDict = {i.get("name"):a.get("value") for i in selectList for a in i.findAll("option")}
48   -# print(selectDict)
  44 +something(1,1,2,3,numC="4",e="5")
49 45  
  46 +def do(a=None,b=None):
  47 + print(a)
  48 + print(b)
50 49  
51   -# a = "123"
52   -# print(a.isdigit())
53 50 \ No newline at end of file
  51 +num = {"a":"b"}
  52 +do(num)
54 53 \ No newline at end of file
... ...