进门缴费

liujiqiang
1 parent eb9c8c02
Showing 11 changed files with 81 additions and 261 deletions
commons/api/addJmsfDemo.py
commons/api/entranceFeeBillList.py
commons/api/zcApi.py
commons/scripts/jsonToUrlcode.py
report/test.log
testcase/test_ZC/demo.py
testcase/test_ZC/test_ZC.py
testcase/test_demo/__init__.py
testcase/test_demo/test_demo_class.py
testcase/test_demo/test_demo_classB.py
testcase/test_demo/test_demo_def.py
-# -*- coding: utf-8 -*-
-
-# @Time    : 2021/7/27 16:36
-# @Author  : Ljq
-# @File    : jmsf.py
-# @Software: PyCharm
-
-"""
-三种接口定义方式
-"""
-
-import json
-from commons.scripts import dealContentType as dct
-from commons import common
-from commons.MySession import my
-
-# 使用def的方式直接定义
-def get_carType(host="",**kwargs):
-    url = host + "/jmsf-web/api/jmsf/query/listCarType"
-    data = {"businessCode":"jmsf"}
-    headers = dct.jsonCode()
-    data=dict(data,**kwargs)
-    res = my.useHeadersRequests(method="POST",url=url,data=json.dumps(data),headers=headers)
-    return res
-
-
-
-# 使用类的方式将参数聚合
-class get_carTypeClass(object):
-    def __init__(self,host):
-        self.method = "post"
-        self.url = host + "/jmsf-web/api/jmsf/query/listCarType"
-        self.data = {"businessCode": "jmsf"}
-        self.headers = dct.jsonCode()
-
-# 使用类的方式将参数聚合
-class get_carTypeClassB(object):
-    url = "http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType"
-    method = "post"
-    data = {"businessCode": "jmsf"}
-    headers = dct.jsonCode()
-
-    def __init__(self):
-        self.url = get_carTypeClassB.url.replace("http://test.", common.get_global_config("global_data", "environment", "en"))
-        # self.header = get_carTypeClassB.headers
-        # self.method = get_carTypeClassB.method
-        # self.data = get_carTypeClassB.data
 \ No newline at end of file
@@ -14,6 +14,7 @@ from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
 from commons.MySession import my
 from bs4 import BeautifulSoup
+import urllib.parse
 def listPage(host="",attrName="收费单号",attrValue=None,**kwargs):
     """
@@ -181,15 +182,15 @@ calcFeeDepId:
     data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "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": "", "ic": "",
-            "customerName": "", "customerPhone": "", "payway": "刷卡", "plate": "plate",
+            "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",
+            "productArea": "重庆,重庆市,万州区", "parentId": "", "levelType": "", "originId": "originId", "tradeTypeId": "tradeTypeId",
             "chargeTotalAmount": "", "chargeTotalAmountYuan": "", "freezeMoneySymbol": "", "comparisonFreezeAmount": "",
             "created": "created", "remark": "false", "goodsTagIds": "goodsTagIds", "shareRatio": "shareRatio",
             "handlingTeam": "", "handlingRatio": "", "handActualAmount": "", "handManageAmount": "",
@@ -239,14 +240,16 @@ def do_doPay(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data = dict(data, **kwargs)
     print("get_calculateRes", data)
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
+    # data_uc = urllib.parse.urlencode(data)+"&"+fee_str
     print(data_uc)
+    # data_uc = urllib.parse.quote(data_uc)
     print("================开始请求================")
     res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
-a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108040900002")
+a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108050900003")
 print("listPage",a.json())
 orderId = a.json()["rows"][0]["id"]
 number = a.json()["rows"][0]["number"]
@@ -275,6 +278,7 @@ tradeTypeId = re.findall(&#39;input type=&quot;hidden&quot; class=&quot;form-control&quot; name=&quot;tradeTy
 shareRatio = re.findall('input type="hidden" id="shareRatioVal" name="shareRatio" value="(.*?)"',res.text)[0]
 regionName = re.findall('" bind-name="(.*?)"',res.text)[0]
+
 # 用户信息获取
 ic=888810032426
 res = get_icCheck(host="http://test.jmsf.diligrp.com:8385",ic=ic)
@@ -292,29 +296,30 @@ parentId = res.json()[&quot;suggestions&quot;][0][&quot;parentId&quot;]
 value = res.json()["suggestions"][0]["value"]
 # 获取缴费金额
-plate="川B00002"
+plate="川B00001"
 host="http://test.jmsf.diligrp.com:8385"
 modified=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
 carTypeName="板车"
 carTypeCode = "003"
 carTypeId = "53"
 carTypeWeight = "333"
-proveTypeCode = "665"
+proveTypeCode = "1621"
 proveType = proveTypeCode
 grossWeight="353"
 newWeight="20"
 tareWeight="333"
-depName="水果部"
-feeDepId="53"
-productName="蔬菜"
-productId="14152"
+depName="接车部"
+feeDepId="103"
+productName="雪莲果"
+productId="14158"
 grossWeightDate=created
 tareWeightDate=created
-weight=grossWeight
-weight=weight
+weight=newWeight
 calcDepId=feeDepId
-categoryName=productName
-categoryId=productId
+categoryName="水果"
+categoryId="14436"
+inGreeterName="通用测试"
+inGreeterId="274"
 autocompletecartype = f"{carTypeCode}({carTypeName})"
 print(autocompletecartype)
@@ -323,11 +328,12 @@ res = get_calculateRes(host=host,autocompletecartype=autocompletecartype,optType
                        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,
-                       newWeight=newWeight,tareWeight=tareWeight,unitPrice=unitPrice,depName=depName,productName=productName,
+                       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)
-# print(res.text)
+                       tareWeightDate=tareWeightDate,sumPrice=sumPrice,calcDepId=calcDepId,weight=weight,
+                       inGreeterName=inGreeterName,inGreeterId=inGreeterId)
+
 # backSkinTwo = re.findall('name="backSkinTwo" value="(.*?)" >',res.text)[0]
 # 缴费信息
 totalMoney = re.findall('name="totalMoney" value="(.*?)">',res.text)[0]
@@ -343,48 +349,54 @@ receivable = re.findall(&#39;id=&quot;creceivableLong&quot; name=&quot;receivable&quot; value=&quot;(.*?)&quot;&gt;&#39;,
 soup = BeautifulSoup(res.text, "html.parser")
 # 查找dl标签class为包含'ui-font-'字符的所有dl标签
 fee_str = "correctDiscount=1&billItems=&billItemsDic="
+fee_int = 0
 for tag in soup.findAll("div", class_="d-flex align-items-center"):
     print("=============================================")
     c = tag.findAll("input")
     for i in c:
         print(i)
-        print(i.get("name"))
+        # print(i.get("name"))
         if i.get("name") != None:
-            fee_str = fee_str + "&" + i.get("name") + "=" + i.get("value")
+            fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
+            if i.get("type") == "text":
+                print("---------------- f 2 s----------------")
+                fee_int = fee_int+int(float(i.get("value")))
+                print("---------------- f 2 e----------------")
+            # fee_int = fee_int+int(i.get("value"))
 print(fee_str)
+print(fee_int)
-pwd = "111111"
-id = orderId
-totalAmount = totalMoney
-customerPhone=mobile
-productPrice="1.00000"
-dep=feeDepId
-productArea = "重庆,重庆市,万州区"
-chargeTotalAmount = totalMoney
-chargeTotalAmountYuan = "9"
-chargeTotalAmountYuan= chargeTotalAmountYuan
-freezeMoneySymbol =chargeTotalAmountYuan
-comparisonFreezeAmount = chargeTotalAmountYuan
-modified = created
-firmCode = "9"
-marketFlag=firmCode
-collectionPrice=discountAmount
-itemReceivableAmount=receivable
-receivableAmount=receivable
-tareWeightDate=tareWeightDate
-aa = do_doPay(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)
-
-print(res.text)
 \ No newline at end of file
+# pwd = "111111"
+# id = orderId
+# totalAmount = totalMoney
+# customerPhone=mobile
+# productPrice="1.00000"
+# dep=feeDepId
+# productArea = "重庆,重庆市,万州区"
+# chargeTotalAmount = totalMoney
+# chargeTotalAmountYuan = int(chargeTotalAmount)/100
+# freezeMoneySymbol =
+# comparisonFreezeAmount =
+# modified = created
+# firmCode = "9"
+# marketFlag=firmCode
+# collectionPrice=discountAmount
+# itemReceivableAmount=receivable
+# receivableAmount=receivable
+# tareWeightDate=tareWeightDate
+# aa = do_doPay(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)
+#
+# print(aa.text)
 \ No newline at end of file
@@ -217,6 +217,8 @@ def create_jmsf(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transa
     productId = categoryByCondition.json()["data"][0]["id"]
     productName = categoryByCondition.json()["data"][0]["name"]
     productCode = categoryByCondition.json()["data"][0]["keycode"]
+    print(productName)
+    print(productId)
     # 获取接车员信息
     listByExample = get_listByExample(host=host)
@@ -9,11 +9,13 @@
 """
+import urllib.parse
+
 def jsonToUrlcode(data_json={}):
     """json格式数据转换未urlcode格式数据"""
     data_uc = ""
     for k, v in data_json.items():
-        data_uc = data_uc + str(k) + "=" + str(v) + "&"
+        data_uc = data_uc + str(k) + "=" + urllib.parse.quote(str(v)) + "&"
     print(data_uc)
     return data_uc
-[2021-08-04 17:04:36] [INFO] : ======================================================================================
-[2021-08-04 17:04: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': '202108040900002'}
-{}
-
-[2021-08-04 17:04:37] [INFO] : ======================================================================================
-[2021-08-04 17:04:37] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3710.action
+[2021-08-05 18:25:26] [INFO] : ======================================================================================
+[2021-08-05 18:25:26] [INFO] : http://test.jmsf.diligrp.com:8385/FeedbackCustomerController/add.action
+b'id=40&name=\xe5\x86\x9c\xe4\xba\xa4&mobile=18828281176&cardNumber=888810054630&    relationCardTemp=210720133001&relationalCard[0].cardNumber=210720131533'
 None
-{}
-
-[2021-08-04 17:04:38] [INFO] : ======================================================================================
-[2021-08-04 17:04:38] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
-None
-{}
-
-[2021-08-04 17:04:39] [INFO] : ======================================================================================
-[2021-08-04 17:04:39] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
-None
-{}
-
-[2021-08-04 17:04:39] [INFO] : ======================================================================================
-[2021-08-04 17:04:39] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
-{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3710, 'goodsId': '3724', 'number': '202108040900002', 'modified': '2021-08-04 17:04:39', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00002', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '665', 'grossWeight': '353', 'tareWeight': '333', 'weight': '353', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'calcDepId': '53', 'regionName': '', 'regionId': '0', 'productName': '蔬菜', 'productId': '14152', 'productArea': '万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-04 10:11:31', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '蔬菜', 'categoryId': '14152', 'driverTel': '', 'grossWeightDate': '2021-08-04 10:11:31', 'tareWeightDate': '2021-08-04 10:11:31', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '', 'inGreeterId': '0', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': '', 'newWeight': '20'}
-{}
-
-[2021-08-04 17:04:40] [INFO] : ======================================================================================
-[2021-08-04 17:04:40] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
-protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3710&goodsId=3724&number=202108040900002&modified=2021-08-04 10:11:31&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=600&customerId=389&fundAccount=105847&ic=888810032426&customerName=长歌买家省内啊啊啊嘿&customerPhone=18011501258&payway=刷卡&plate=川B00002&autocomplete-cartype=003(板车)&carTypeName=板车&carTypeCode=003&carTypeId=53&carTypeWeight=333&storeTareWeight=&proveType=665&grossWeight=353&tareWeight=333&weight=353&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=水果部&calcDepId=53&dep=53&regionName=A1区&regionId=72&productName=蔬菜&productId=14152&productArea=重庆,重庆市,万州区&parentId=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=600&chargeTotalAmountYuan={chargeTotalAmountYuan}&freezeMoneySymbol=9&comparisonFreezeAmount=9&created=2021-08-04 10:11:31&remark=&goodsTagIds=1900&marketFlag=9&totalMoney=600&receivable=1300&collectionPrice=500&discountAmount=500&handReceivableAmount=10000&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=蔬菜&categoryId=53&driverTel=&grossWeightDate=2021-08-04 10:11:31&tareWeightDate=2021-08-04 10:11:31&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.00&billItems={"discount":500,"id":103,"name":"交易管理费","receivable":1000,"require":1}&billItemDicCheckIds=105&billItemsDic={"discount":0,"id":105,"name":"优惠收费","receivable":500,"require":0}&billItemCheckIds=106&106=3.00&billItems={"discount":0,"id":106,"name":"检测费","receivable":300,"require":1}
-{}
-
+{'headers': {'Host': 'test.jmsf.diligrp.com:8385', 'Connection': 'keep-alive', 'Content-Length': '148', 'Accept': 'application/json,text/javascript,*/*;q=0.01', 'Origin': 'http://test.jmsf.diligrp.com:8385', 'X-Requested-With': 'XMLHttpRequest', 'User-Agent': 'Mozilla/5.0(WindowsNT6.2;WOW64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/84.0.4147.105Safari/537.36', 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', 'Accept-Language': 'zh-CN,zh;q=0.9', 'Referer': 'http://test.jmsf.diligrp.com:8385/FeedbackCustomerController/list', 'Accept-Encoding': 'gzip,deflate', 'Cookie': 'UAP_refreshToken=0e205e78-a656-4a85-a2ba-7226ce898ae5;         UAP_firmId=9;         UAP_accessToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiJXRUIiLCJuYmYiOjE2Mjc4NzAyMzUsImRhdGEiOiJ7XCJjZWxscGhvbmVcIjpcIjE1NTI2MzY0NDU2XCIsXCJjcmVhdGVkXCI6MTYwODc5NTk0OTAwMCxcImRlcGFydG1lbnRJZFwiOjU2LFwiZW1haWxcIjpcInNoZW55YW5nQGRpbGlncnAuY29tXCIsXCJmaXJtQ29kZVwiOlwic3lcIixcImZpcm1JZFwiOjksXCJmaXJtTmFtZVwiOlwi5rKI6Ziz5Zyw5Yip5Yac5om55biC5Zy65a6i5oi355S15a2Q57uT566X5Lit5b-DXCIsXCJpZFwiOjI1MSxcImxhc3RMb2dpblRpbWVcIjoxNjI3ODY1NTc3OTg5LFwibWV0YWRhdGFcIjp7fSxcIm1vZGlmaWVkXCI6MTYyNjE2MzAwNDAwMCxcInBhc3N3b3JkXCI6XCIxODk2NUVCNzJDOTJBNTQ5RERcIixcInJlYWxOYW1lXCI6XCLmsojpmLNcIixcInNlcmlhbE51bWJlclwiOlwiMDAwXCIsXCJzdGF0ZVwiOjEsXCJzeXN0ZW1UeXBlXCI6MSxcInVzZXJOYW1lXCI6XCI0NDQ0NDRcIn0iLCJpc3MiOiJVQVBfQVVUSDAiLCJleHAiOjE2Mjc4NzIwMzUsImlhdCI6MTYyNzg3MDIzNSwianRpIjoiNDc3MDU5N2YtMGRjZi00OGIwLTg5YjQtNmVhODFiZjVhNTJjIn0.nso2DlyjXlOnwFp5D-N9jvyEKHJJ76K-BIzTdT-1UQAbqKD_9m4ZKXESxh-9333GWtYHORsnbav6MXI6h1Si4Ee_6rxB1DrkqxXoohavvAPutNr5byXjIUejLfFv_YTyCuXCkjiSCUlribURiqG_jKccr5BfIVUigSLkB9ff3f4'}}
@@ -9,5 +9,10 @@
 """
 import json
+import urllib
 import urllib.parse
+a = {"a":"b","c":"阿三大苏打"}
+print(urllib.parse.urlencode(a))
+b = "a=b&c=d"
+# print(urllib.unquote)
@@ -122,7 +122,7 @@ class test_demo(unittest.TestCase):
     def test_cre(self):
         """调用方法1"""
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="挂车",plate="川B00001",keyword="雪莲果",
+        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",
                                   userName="ty_test",transactionName="沈阳2号",newWeight=20,
                                   depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜")
         print(cre_res.json())
-# -*- coding: utf-8 -*-
-
-# @Time    : 2021/7/27 16:43
-# @Author  : Ljq
-# @File    : __init__.py.py
-# @Software: PyCharm
-
-"""
-
-"""
-# -*- coding: utf-8 -*-
-
-# @Time    : 2021/7/27 17:33
-# @Author  : Ljq
-# @File    : test_demo_class.py
-# @Software: PyCharm
-
-"""
-测试get_carTypeClass
-"""
-
-import json
-import unittest
-from commons.scripts.readConf import rC
-from commons.MySession import my
-from commons.api import addJmsfDemo as aJ
-gCTC = aJ.get_carTypeClass(host=rC.returnOptionsItems("host","gatewayHost"))
-
-
-class test_demo(unittest.TestCase):
-    def setUp(self) -> None:
-        pass
-
-    def tearDown(self) -> None:
-        pass
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        pass
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        pass
-
-    def test_check_class(self):
-        res = my.useHeadersRequests(method=gCTC.method,url=gCTC.url,headers=gCTC.headers,data=json.dumps(gCTC.data))
-        print(res.text)
-
-if __name__ == "__main__":
-    unittest.main()
 \ No newline at end of file
-# -*- coding: utf-8 -*-
-
-# @Time    : 2021/7/27 17:44
-# @Author  : Ljq
-# @File    : test_demo_classB.py
-# @Software: PyCharm
-
-"""
-测试get_carTypeClassB类
-"""
-
-import json
-import unittest
-from commons.scripts.readConf import rC
-from commons.MySession import my
-from commons.api import addJmsfDemo as aJ
-gCTC = aJ.get_carTypeClassB()
-
-
-class test_demo(unittest.TestCase):
-    def setUp(self) -> None:
-        pass
-
-    def tearDown(self) -> None:
-        pass
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        pass
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        pass
-
-    def test_check_class(self):
-        res = my.useHeadersRequests(method=gCTC.method,url=gCTC.url,headers=gCTC.headers,data=json.dumps(gCTC.data))
-        print(res.text)
-
-if __name__ == "__main__":
-    unittest.main()
 \ No newline at end of file
-# -*- coding: utf-8 -*-
-
-# @Time    : 2021/7/27 16:43
-# @Author  : Ljq
-# @File    : test_demo.py
-# @Software: PyCharm
-
-"""
-测试get_carType方法
-"""
-
-import json
-import unittest
-from commons.scripts.readConf import rC
-from commons.api import addJmsfDemo as aJ
-
-class test_demo(unittest.TestCase):
-    def setUp(self) -> None:
-        pass
-
-    def tearDown(self) -> None:
-        pass
-
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
-        print("self.gatewayHost", cls.gatewayHost)
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        pass
-
-    def test_check_def(self):
-        res = aJ.get_carType(host=self.gatewayHost)
-        print(res.text)
-
-if __name__ == "__main__":
-    unittest.main()
 \ No newline at end of file