Merge branch 'master' of git3.nong12.com:autotest/jmsf-re

wenleiming
2 parents cf904d3d e5edbd8a
Showing 73 changed files with 1339 additions and 3 deletions
commons/basic/listCarType.py
config/global_data.conf
main.py
testcase/CZFW/__init__.py → testcase/heb/CZFW/__init__.py
testcase/CZFW/test_weightBizBill_doRefund.py → testcase/heb/CZFW/test_weightBizBill_doRefund.py
testcase/CZFW/test_weightBizBill_listPage.py → testcase/heb/CZFW/test_weightBizBill_listPage.py
testcase/feedbackCustomerController/__init__.py → testcase/heb/FeedbackCustomerController/__init__.py
testcase/feedbackCustomerController/test_fc_add.py → testcase/heb/FeedbackCustomerController/test_fc_add.py
testcase/feedbackCustomerController/test_fc_edit.py → testcase/heb/FeedbackCustomerController/test_fc_edit.py
testcase/feedbackCustomerController/test_fc_view.py → testcase/heb/FeedbackCustomerController/test_fc_view.py
testcase/feedbackCustomerController/test_feedback_customer_disable.py → testcase/heb/FeedbackCustomerController/test_feedback_customer_disable.py
testcase/feedbackCustomerController/test_feedback_customer_enable.py → testcase/heb/FeedbackCustomerController/test_feedback_customer_enable.py
testcase/feedbackCustomerController/test_feedback_customer_query.py → testcase/heb/FeedbackCustomerController/test_feedback_customer_query.py
testcase/feedbackOrderController/__init__.py → testcase/heb/FeedbackOrderController/__init__.py
testcase/feedbackOrderController/test_feedback_order_settlement.py → testcase/heb/FeedbackOrderController/test_feedback_order_settlement.py
testcase/feedbackOrderController/test_feedback_order_settlement_query.py → testcase/heb/FeedbackOrderController/test_feedback_order_settlement_query.py
testcase/entranceFeeBill_detail/__init__.py → testcase/heb/__init__.py
testcase/entranceFeeBill_proves/__init__.py → testcase/heb/entranceFeeBill_detail/__init__.py
testcase/entranceFeeBill_detail/test_entranceFeeBill_details.py → testcase/heb/entranceFeeBill_detail/test_entranceFeeBill_details.py
testcase/weightBizBill/__init__.py → testcase/heb/entranceFeeBill_proves/__init__.py
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import my,sy1,sy2
+from commons.MySession import my,sy1
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -3,7 +3,7 @@
 [account]
 #取值字段根据市场拼音首字母缩写组合而成,尾号数字按照01-99叠加
 #账户和密码通过&符号隔开
-sy_user01=sy_chen&a123456
+sy_user01=sy_chen&123456
 sy_user02=sygangda&111111
 heb_user01=哈尔滨田太子&a123456
 heb_user02=sy_wenze&111111
@@ -74,6 +74,6 @@ if __name__ == &quot;__main__&quot;:
     #检测登录接口
     my.check_login("sy_user01")
     #创建测试套,运行测试用例,生成报告
-    report=Run_Testcase(Create_Testcase_suite())
+    report=Run_Testcase(Create_Testcase_suite("sy"))
     #发送邮件
     Send_email(report)
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import urllib3
+from commons import common as com
+from commons import ConfigDB as db
+from commons.MySession import my,sy1
+from commons.api.weightBizBill_doRefund import weightBizBill_doRefund
+from commons.api.weighingServiceSave import weighingServiceSave
+from commons.basic.listCarType import listCarType
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+do=weightBizBill_doRefund()
+ad=weighingServiceSave(sy1)
+ca=listCarType(sy1)
+
+
+class test_weightBizBill_doRefund(unittest.TestCase):
+    "称重服务-称重服务单列表"
+
+
+    def setUp(self):
+        "数据准备：新增一条称重单"
+        #刷新增防重码
+        ad.refresh_commit_token()
+        #新增称重单
+        body=ad.body.copy()
+        car=ca.car_list()["data"]
+        body["carTypeId"]=car[0]["id"]
+        body["carTypeName"]=car[0]["carTypeName"]
+        body["carTypeCode"]=car[0]["code"]
+        self.re=sy1.post(url=ad.url,headers=ad.header,json=body)
+
+    @unittest.case_mark(my.mark())  
+    def test_weightBizBill_doRefund_01(self):
+        "称重服务单列表-退款：成功退款一个现金交费的称重单"
+        body=do.body.replace("206",str(self.re.json()["data"]["id"]))
+        re=sy1.post(url=do.url,headers=do.header,data=body.encode('utf-8'))
+        print(re.json())
+        #获取退款后称重单的状态，3为已退款
+        bill_status=db.mysql_selectOne(
+            "SELECT status FROM `weight_biz_bill` WHERE id={};".format(self.re.json()["data"]["id"]))[0]
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'result':'操作成功!'" in str(re.json()).replace(" ",""))
+        self.assertEqual(bill_status ,3)
+
+if __name__ == "__main__":
+
+    unittest.main(verbosity=2)
+
+    # com.run_one(test_weightBizBill_listPage("test_weightBizBill_listPage_01"))
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import urllib3
+import time
+from commons import common as com
+from commons.MySession import my,sy1
+from commons.api.weightBizBill_listPage import weightBizBill_listPage
+from commons.api.weighingServiceSave import weighingServiceSave
+from commons.basic.listCarType import listCarType
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+bi=weightBizBill_listPage()
+ad=weighingServiceSave(sy1)
+ca=listCarType(sy1)
+
+
+class test_weightBizBill_listPage(unittest.TestCase):
+    "称重服务-称重服务单列表"
+
+    def setUp(self):
+        "数据准备：新增一条称重单"
+        #获取当前时间
+        self.time=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        #刷新增防重码
+        ad.refresh_commit_token()
+        #新增数据
+        body=ad.body.copy()
+        car=ca.car_list()["data"]
+        body["carTypeId"]=car[0]["id"]
+        body["carTypeName"]=car[0]["carTypeName"]
+        body["carTypeCode"]=car[0]["code"]
+        self.re=sy1.post(url=ad.url,headers=ad.header,json=body)
+
+
+    @unittest.case_mark(my.mark())  
+    def test_weightBizBill_listPage_01(self):
+        "称重服务单列表-查询：查询条件为“单据编号”，其余查询条件输入合法值，查询一条指定数据"
+        body=bi.body.replace("202108030900001",self.re.json()["data"]["number"]).replace(
+            "carTypeId=53","carTypeId={}".format(ca.car_list()["data"][0]["id"])).replace(
+            "depId=139","depId={}".format(sy1.user["sy_user01"]["departmentId"]))
+        re=sy1.post(url=bi.url,headers=bi.header,data=body)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'total':1" in str(re.json()).replace(" ",""))
+        self.assertTrue(self.re.json()["data"]["number"] in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_weightBizBill_listPage_02(self):
+        "称重服务单列表-查询：查询条件为“车号”，其余查询条件输入合法值，查询一条指定数据"
+        body=bi.body.replace("attr=number","attr=plate").replace(
+            "202108030900001","{}".format(ad.body["plate"])).replace(
+            "2020-08-03 00:00:00","{}".format(self.time)).replace(
+            "carTypeId=53", "carTypeId={}".format(ca.car_list()["data"][0]["id"])).replace(
+            "depId=139", "depId={}".format(sy1.user["sy_user01"]["departmentId"]))
+        re=sy1.post(url=bi.url,headers=bi.header,data=body.encode('utf-8'))
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue(ad.body["plate"] in str(re.json()).replace(" ",""))
+
+
+if __name__ == "__main__":
+
+    unittest.main(verbosity=2)
+
+    # com.run_one(test_weightBizBill_listPage("test_weightBizBill_listPage_01"))
+# -*- coding: utf-8 -*-
 \ No newline at end of file
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.fc_add import fc_add
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+from commons.Faker import random_data
+import commons.ConfigDB as db
+fc=fc_add()
+ra = random_data()
+
+"""
+进门收费——返点管理——返还人管理——新增返还人
+"""
+
+class test_fc_add(unittest.TestCase):
+    "返还人管理——新增返还人"
+    @classmethod
+    def setUpClass(cls):
+        pass
+    def setUp(self):
+        self.cardnb = db.mysql_selectOne('''SELECT card_no FROM `dili_account`.`account_user_card` WHERE state = 1 
+        AND firm_id = '''+str(sy1.user["sy_user01"]["firmId"])+''' ORDER BY id LIMIT 1''')[0]
+    def test_fc_add_01(self):
+        "新增返还人"
+        body = fc.body.replace("18828281176",ra.phone_number()).\
+            replace("你好",ra.name()).\
+            replace("888810054630",str(self.cardnb))
+        # body = fc.body.replace("18828281176", ra.phone_number()). \
+        #     replace("你好", ra.name()). \
+        #     replace("888810054630", str(self.cardnb)). \
+        #     replace("relationCardTemp=888810054630", "relationCardTemp=888810054630"). \
+        #     replace("relationalCard[0].cardNumber=888810054630", "relationalCard[0].cardNumber=888810054630")
+        # print(body)
+        re = sy1.post(url=fc.url, headers=fc.header, data=body.encode('utf-8'))
+        # print(re.headers)
+        print(re.json())
+        self.assertTrue("操作成功" in str(re.json()))
+        return re
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.fc_edit import fc_edit
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+from commons.Faker import random_data
+from commons.api.fc_add import fc_add
+ra = random_data()
+fca = fc_add()
+import commons.ConfigDB as db
+
+"""
+进门收费——返点管理——返还人管理——修改返还人
+"""
+
+fc=fc_edit()
+class test_fc_edit(unittest.TestCase):
+    "返还人管理——修改返还人"
+    @classmethod
+    def setUpClass(cls):
+        pass
+    def setUp(self):
+        # body = fc.body.replace("18828281176", ra.phone_number()). \
+        #     replace("你好", ra.name()). \
+        #     replace("888810054630", "888810054630")
+        #
+        # # body = fca.body.replace("888810054630", "888810054630"). \
+        # #     replace("你好", ra.name()). \
+        # #     replace("relationCardTemp=888810054630", "relationCardTemp=888810054630"). \
+        # #     replace("relationalCard[0].cardNumber=888810054630", "relationalCard[0].cardNumber=888810054630")
+        # # print(body)
+        # re = sy1.post(url = fc.url, headers = fc.header, data = body.encode('utf-8'), proxies = my.proxies)
+        self.mesg = db.mysql_selectOne('''SELECT id,name,mobile,card_number
+FROM `dili_jmsf`.`feedback_customer`  WHERE market_id = '''+str(sy1.user["sy_user01"]["firmId"])+''' ORDER BY `id` DESC LIMIT 1''')
+        # print(self.mesg)
+    def test_fc_edit_01(self):
+        "修改返还人"
+        body = fc.body.replace("id=40","id="+str(self.mesg[0])).\
+            replace("农交",str(self.mesg[1])).\
+            replace("18828281176",str(self.mesg[2])).\
+            replace("888810054630",str(self.mesg[3]))
+        # body = fc.body.replace("id=40", "id=" + str(self.mesg[0])). \
+        #     replace("农交", str(self.mesg[1])). \
+        #     replace("18828281176", str(self.mesg[2])). \
+        #     replace("888810054630", str(self.mesg[3])). \
+        #     replace("relationalCard[0].cardNumber=210720131533", "relationalCard[0].cardNumber=210720125142")
+        # print(body)
+        re = sy1.post(url=fc.url, headers=fc.header, data=body.encode('utf-8'))
+        # print(re.headers)
+        # print(re.json())
+        self.assertTrue("操作成功" in str(re.json()))
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+import urllib3
+import commons.ConfigDB as db
+from commons.MySession import my,sy1
+from commons.api.fc_view import fc_view
+from commons.api.fc_add import fc_add
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+ad = fc_add()
+vi = fc_view()
+
+"""
+进门收费——返点管理——返还人管理——查看返还人
+"""
+
+class test_fc_view(unittest.TestCase):
+    "返还人管理——查看返还人"
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def setUp(self):
+        # 获取数据：从MYSQL获取新增返还人的id号
+        self.code = db.mysql_selectOne('''SELECT * FROM `dili_jmsf`.`feedback_customer` WHERE 
+        market_id =  '''+str(sy1.user["sy_user01"]["firmId"])+''' ORDER BY `id` DESC LIMIT 1''')[0]
+
+
+    # @unittest.case_mark(my.mark())
+    def test_fc_view_01(self):
+        "查看返还人"
+        # 请求url中的需要替换为新增返还人的id
+        url = vi.url.replace("40", str(self.code))
+        # print("数据处理后的url", url)
+        # 进行GET请求
+        re = sy1.get(url=url, headers=vi.header)
+        # 打印请求结果(可删除该代码,一般只在调试时使用)
+        # print(re.text)
+        # 断言响应数据中是否存在期望字符串
+        self.assertTrue('关联交费卡号' in str(re.text))
+
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+    if __name__ == '__main__':
+        unittest.main()
 \ No newline at end of file
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedback_customer_disable import feedback_customer_disable
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+fcd = feedback_customer_disable()
+import commons.ConfigDB as db
+
+"""
+进门收费——返点管理——返还人管理——禁用返还人
+"""
+
+class test_feedback_customer_disable(unittest.TestCase):
+    "返还人管理——返还人禁用"
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def setUp(self):
+        self.ids = db.mysql_selectOne('''SELECT id FROM `dili_jmsf`.`feedback_customer` 
+        WHERE `status` = '1' and market_id = '''+str(sy1.user["sy_user01"]["firmId"])+'''
+         ORDER BY `id` DESC LIMIT 1''')[0]
+        # print("查询出返还人id", self.id)
+
+    def test_feedback_customer_disable_01(self):
+        "返还人禁用"
+        url = fcd.url.replace("44", str(self.ids))
+        re = sy1.post(url=url, headers=fcd.header)
+        # print(re.headers)
+        # print(re.json())
+        self.assertTrue("操作成功" in str(re.json()))
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedback_customer_enable import feedback_customer_enable
+from commons.api.feedback_customer_disable import feedback_customer_disable
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+fce = feedback_customer_enable()
+fcd = feedback_customer_disable
+import commons.ConfigDB as db
+
+"""
+进门收费——返点管理——返还人管理——启用返还人
+"""
+
+class test_feedback_customer_enable(unittest.TestCase):
+    "返还人管理——返还人启用"
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def setUp(self):
+        self.ids = db.mysql_selectOne('''
+        SELECT id FROM `dili_jmsf`.`feedback_customer` WHERE `status` = '2' and 
+        market_id='''+str(sy1.user["sy_user01"]["firmId"])+''' ORDER BY `id` DESC LIMIT 1''')[0]
+        print(self.ids)
+    def test_feedback_customer_enable_01(self):
+        "返还人启用"
+        url = fce.url.replace("49",str(self.ids))
+        re = sy1.post(url = url, headers = fce.header)
+        # print(fce.url)
+        # print(re.headers)
+        # print(re.json())
+        self.assertTrue("操作成功" in str(re.json()))
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedback_customer_query import feedback_customer_query
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+import datetime
+import commons.ConfigDB as db
+fcq = feedback_customer_query()
+
+"""
+进门收费——返点管理——返还人管理——返还人列表查询
+"""
+
+class test_feedback_customer_query(unittest.TestCase):
+    "返还人管理——返还人列表查询"
+    @classmethod
+    def setUpClass(cls):
+        pass
+    def setUp(self):
+        self.name1 = db.mysql_selectOne('''SELECT name FROM `dili_jmsf`.`feedback_customer`  
+        WHERE market_id = ''' + str(sy1.user["sy_user01"]["firmId"]) + ''' ORDER BY `id` DESC LIMIT 1''')[0]
+    def test_feedback_customer_query_01(self):
+        "返还人列表查询"
+        print(fcq.url)
+        body = fcq.body\
+            .replace("潘婷婷", str(self.name1))\
+            .replace("2021-08-11 00:00:00",(datetime.datetime.now() - datetime.timedelta(days = 30)).strftime("%Y-%m-%d %H:%M:%S")).\
+            replace("2021-08-11 23:59:59",datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+        # print(body)
+        re = sy1.post(url = fcq.url, data = body.replace("\n","").encode('utf-8'),headers = fcq.header)
+        # print(re.headers)
+        # print(re.text)
+        # print("士大夫十",str(self.name1))
+        self.assertTrue(str(self.name1) in str(re.text))
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+# -*- coding: utf-8 -*-
+"""
+@Time ： 2021/8/2 16:17
+@Auth ： wlm
+@File ：__init__.py.py
+@IDE ：PyCharm
+"""
+import json
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedback_order_settlement import feedback_order_settlement
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+from commons.api.feedback_order_settlement_query import feedback_order_settlement_query
+fosq = feedback_order_settlement_query()
+import datetime
+fos = feedback_order_settlement()
+
+"""
+进门收费——返点管理——结账管理——选择需要返点的订单进行结账
+"""
+
+class test_feedback_order_settlement(unittest.TestCase):
+    "结账管理——选择需要返点的订单进行结账"
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def setUp(self):
+        body = fosq.body.replace("feedbackCustomerId=25", "feedbackCustomerId=16").replace("2021-07-22 00:00:00", "\
+            2021-07-03 00:00:00").replace("2021-08-03 23:59:59", str(datetime.datetime.now()))
+        re = sy1.post(url = fosq.url, data = body, headers = fosq.header)
+
+        self.Amount = re.json()["rows"][0]["unsettledAmount"]
+        self.ids = re.json()["rows"][0]["id"]
+        self.billIds = re.json()["rows"][0]["billId"]
+        #查询出结账金额、结算单id和与之相关联的进门单id
+        url = "http://test.jmsf.diligrp.com:8385/FeedbackOrderController/settleAccount.action"
+        header = {
+             "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"
+        }
+        body = "customerId=16"
+        re2 = sy1.post(url = url,headers = header,data = body)
+        self.idd = re2.json()["id"]
+        self.name = re2.json()["name"]
+        self.cardNumber = re2.json()["cardNumber"]
+        #查询出结账单的id、name、cardnumber
+
+    def test_feedback_order_settlement_01(self):
+        "选择需要返点的订单进行结账."
+        body = fos.body.replace("id=25","id="+str(self.idd)).\
+            replace("888810057654",str(self.cardNumber)).\
+            replace("settleAmount=2","settleAmount="+str(self.Amount)).\
+            replace("ids=12034","ids="+str(self.ids)).\
+            replace("feedbackCustomerId=25","feedbackCustomerId="+str(self.idd)).\
+            replace("feedbackCustomerName=验证员工推送到CRM","feedbackCustomerName="+str(self.name)).\
+            replace("billIds=3621","billIds="+str(self.billIds)).\
+            replace("settledAmounts=2","settledAmounts="+str(self.Amount))
+        # print(body)
+        re = sy1.post(url = fos.url, headers = fos.header, data = body.encode('utf-8'))
+        # print(re.headers)
+
+        # print(re.json())
+        self.assertTrue("操作成功" in str(re.json()))
+        return re
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
 \ No newline at end of file
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedback_order_settlement_query import feedback_order_settlement_query
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+fosq = feedback_order_settlement_query()
+import datetime
+
+"""
+进门收费——返点管理——结账管理——根据返还人和缴费时间进行查询
+"""
+
+class test_feedback_order_settlement_query(unittest.TestCase):
+    "结账管理列表查询——根据返还人和缴费时间进行查询"
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    def test_feedback_order_settlement_query_01(self):
+        "根据返还人和缴费时间进行查询"
+        print(fosq.url)
+        body = fosq.body.replace("feedbackCustomerId=25", "feedbackCustomerId=16").\
+            replace("2021-07-22 00:00:00", (datetime.datetime.now() - datetime.timedelta(days = 30)).strftime("%Y-%m-%d %H:%M:%S")).\
+            replace("2021-08-03 23:59:59", datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+        # print(body)
+        re = sy1.post(url = fosq.url, data = body,headers = fosq.header)
+        # print(re.headers)
+        # print(re.json())
+        self.assertTrue("rows" in str(re.json()))
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import urllib3
+from commons import ConfigDB as db
+from commons import common as com
+from commons.MySession import my,sy1
+from commons.api.entranceFeeBill_details import entranceFeeBill_details
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+en=entranceFeeBill_details()
+
+
+class test_entranceFeeBill_details(unittest.TestCase):
+    "进门收费管理-收费单标记"
+
+    @classmethod
+    def setUpClass(cls):
+        cls.data=db.mysql_selectOne(en.sql)
+
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_01(self):
+        "收费单标记-查询：查询条件为“收费单号”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[9]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8]))
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'total':1" in str(re.json()).replace(" ",""))
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_02(self):
+        "收费单标记-查询：查询条件为“车牌号”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[10]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8])).\
+            replace("attr=number", "attr=likePlate")
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_03(self):
+        "收费单标记-查询：查询条件为“商品”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[11]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8])).\
+            replace("attr=number", "attr=goods")
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_04(self):
+        "收费单标记-查询：查询条件为“收费员”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[12]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8])).\
+            replace("attr=number", "attr=pay")
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_05(self):
+        "收费单标记-查询：查询条件为“客户姓名”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[13]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8])).\
+            replace("attr=number", "attr=cname")
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_06(self):
+        "收费单标记-查询：查询条件为“卡号”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[15]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8])).\
+            replace("attr=number", "attr=ic")
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_details_07(self):
+        "收费单标记-查询：查询条件为“手机号”，其余查询条件输入合法值，查询一条指定数据"
+        url= en.url.replace("202108120900001", self.data[14]).\
+            replace("carTypeId=53", "carTypeId={}".format(self.data[0])).\
+            replace("categoryId=14436", "categoryId={}".format(self.data[1])).\
+            replace("dep=58", "dep={}".format(self.data[2])).\
+            replace("regionId=72", "regionId={}".format(self.data[3])).\
+            replace("status=4", "status={}".format(self.data[4])).\
+            replace("type=1", "type={}".format(self.data[5])).\
+            replace("backSkinStatus=-1", "backSkinStatus={}".format(self.data[6])).\
+            replace("companyId=9", "companyId={}".format(self.data[8])).\
+            replace("attr=number", "attr=phone")
+        re=sy1.get(url=url,headers=en.header)
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[9]) in str(re.json()).replace(" ",""))
+
+
+if __name__ == "__main__":
+
+    # unittest.main(verbosity=2)
+    com.run_one(test_entranceFeeBill_details("test_entranceFeeBill_details_01"))
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import urllib3
+from commons import ConfigDB as db
+from commons import common as com
+from commons.MySession import my,sy1
+from commons.api.entranceFeeBill_provesPage import entranceFeeBill_provesPage
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+en=entranceFeeBill_provesPage()
+
+
+class test_entranceFeeBill_provesPage(unittest.TestCase):
+    "进门收费管理-证明类型明细"
+
+    @classmethod
+    def setUpClass(cls):
+        cls.data=db.mysql_selectOne(en.sql)
+        print(cls.data)
+
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_provesPage_01(self):
+        "证明类型明细-查询：查询条件为“收费单号”，其余查询条件输入合法值，查询一条指定数据"
+        body= ((en.body.replace("202108110900139", self.data[1]).
+                replace("14436", str(self.data[9])).
+                replace("雪莲果", self.data[11]).replace("14158", str(self.data[10])).
+                replace("103", str(self.data[0]))).replace("1621",str(self.data[8]))).replace(
+            "companyId=9","companyId={}".format(str(self.data[6])))
+        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'total':1" in str(re.json()).replace(" ",""))
+        self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_provesPage_02(self):
+        "证明类型明细-查询：查询条件为“车号”，其余查询条件输入合法值，查询一条指定数据"
+        body= ((en.body.replace("number", "likePlate").
+                replace("202108110900139",self.data[2]).
+                replace("14436", str(self.data[9])).
+                replace("雪莲果", self.data[11]).
+                replace("14158", str(self.data[10])).
+                replace("103", str(self.data[0]))).
+                replace("1621",str(self.data[8]))).\
+                replace("companyId=9","companyId={}".format(str(self.data[6])))
+        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_provesPage_03(self):
+        "证明类型明细-查询：查询条件为“客户姓名”，其余查询条件输入合法值，查询一条指定数据"
+        body= ((en.body.replace("number", "cname").
+                replace("202108110900139",self.data[3]).
+                replace("14436", str(self.data[9])).
+                replace("雪莲果", self.data[11]).
+                replace("14158", str(self.data[10])).
+                replace("103", str(self.data[0]))).
+                replace("1621",str(self.data[8]))).\
+                replace("companyId=9","companyId={}".format(str(self.data[6])))
+        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_provesPage_04(self):
+        "证明类型明细-查询：查询条件为“客户卡号”，其余查询条件输入合法值，查询一条指定数据"
+        body= ((en.body.replace("number", "ic").
+                replace("202108110900139",self.data[5]).
+                replace("14436", str(self.data[9])).
+                replace("雪莲果", self.data[11]).
+                replace("14158", str(self.data[10])).
+                replace("103", str(self.data[0]))).
+                replace("1621",str(self.data[8]))).\
+                replace("companyId=9","companyId={}".format(str(self.data[6])))
+        re=sy1.post(url=en.url,headers=en.header,data=body.encode("utf-8"))
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ",""))
+
+    @unittest.case_mark(my.mark())
+    def test_entranceFeeBill_provesPage_05(self):
+        "证明类型明细-查询：查询条件为“手机号”，其余查询条件输入合法值，查询一条指定数据"
+        body = ((en.body.replace("number", "phone").
+                 replace("202108110900139", self.data[4]).
+                 replace("14436", str(self.data[9])).
+                 replace("雪莲果", self.data[11]).
+                 replace("14158", str(self.data[10])).
+                 replace("103", str(self.data[0]))).
+                replace("1621", str(self.data[8]))). \
+            replace("companyId=9", "companyId={}".format(str(self.data[6])))
+        re = sy1.post(url=en.url, headers=en.header, data=body.encode("utf-8"))
+        print(re.json())
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("'number':'{}'".format(self.data[1]) in str(re.json()).replace(" ", ""))
+
+if __name__ == "__main__":
+
+    unittest.main(verbosity=2)
+    # com.run_one(test_entranceFeeBill_provesPage("test_entranceFeeBill_provesPage_04"))
+# -*- coding: utf-8 -*-
+"""
+@Time ： 2021/8/5 16:38
+@Auth ： wlm
+@File ：__init__.py.py
+@IDE ：PyCharm
+"""
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedbackAccounrecordController_list import feedbackAccounrecordController_list
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+import commons.ConfigDB as db
+farcl = feedbackAccounrecordController_list()
+
+"""
+进门收费——返点管理——交易明细——根据交易时间和交易流水号查询
+"""
+
+class test_feedbackAccounrecordController_list(unittest.TestCase):
+    "交易明细——根据交易时间和交易流水号查询"
+    @classmethod
+    def setUpClass(cls):
+        print(sy1.user["sy_user01"]["firmId"])
+        pass
+    def setUp(self):
+        self.body = db.mysql_selectOne(
+            '''SELECT dili_jmsf.feedback_account_record.created,dili_jmsf.feedback_order.record_number 
+FROM `dili_jmsf`.`feedback_order` LEFT JOIN `dili_jmsf`.`feedback_account_record` ON dili_jmsf.feedback_order.id = dili_jmsf.feedback_account_record.order_ids 
+WHERE market_id = '''+str(sy1.user["sy_user01"]["firmId"])+''' ORDER BY dili_jmsf.feedback_account_record.order_ids DESC  LIMIT 1''')
+        print("查询出查询时间和交易流水号:", self.body[0],self.body[1])
+
+    def test_feedbackAccounrecordController_list_01(self):
+        "根据交易时间和交易流水号查询"
+        body = farcl.body.replace("2021-08-05 00:00:00", str(self.body[0])).\
+            replace("2021-08-05 23:59:59", str(self.body[0])).\
+            replace("1075782308694007808", self.body[1])
+
+        re = sy1.post(url = farcl.url, data = body,headers = farcl.header)
+        print(re.headers)
+        print(re.json())
+        self.assertTrue(self.body[1] in str(re.json()))
+        return re
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+# -*- coding: utf-8 -*-
+"""
+@Time ： 2021/8/5 16:39
+@Auth ： wlm
+@File ：__init__.py.py
+@IDE ：PyCharm
+"""
+import unittest
+import urllib3
+from commons.MySession import sy1
+from commons.api.feedbackOrderController_querySumAmount import querySumAmount
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+import datetime
+qsa = querySumAmount()
+
+"""
+进门收费——返点管理——已结账明细——已结账笔数已结账金额查询
+"""
+
+class test_feedbackOrderController_querySumAmount(unittest.TestCase):
+    "已结账明细——查询已结账笔数和已结账金额"
+    @classmethod
+    def setUpClass(cls):
+        pass
+    def setUp(self):
+        pass
+
+    def test_feedbackOrderController_querySumAmount_01(self):
+        "查询已结账笔数和已结账金额"
+        body = qsa.body.replace("2021-07-05 00:00:00", (datetime.datetime.now() - datetime.timedelta(days = 30)).strftime("%Y-%m-%d %H:%M:%S")).\
+            replace("2021-08-05 09:46:25", datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+
+        re = sy1.post(url=qsa.url, data=body, headers=qsa.header)
+        self.assertEqual(re.status_code, 200)
+        # print(re.json())
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+import unittest
+import urllib3
+from commons.MySession import my,sy1
+from commons.api.feedbackOrderController_settlementlist import feedbackOrderController_settlementlist
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+import commons.ConfigDB as db
+import datetime
+focsl = feedbackOrderController_settlementlist()
+
+"""
+进门收费——返点管理——已结账明细——返还笔数结账时间金额查询
+"""
+
+class test_feedbackOrderController_settlementlist(unittest.TestCase):
+    "已结账明细——根据返还人和结算时间进行查询"
+    @classmethod
+    def setUpClass(cls):
+        pass
+    def setUp(self):
+        pass
+
+    def test_feedbackOrderController_settlementlist_01(self):
+        "根据返还人和结算时间进行查询"
+        body = focsl.body.replace("2021-08-04 00:00:00", (datetime.datetime.now() - datetime.timedelta(days = 30)).strftime("%Y-%m-%d %H:%M:%S")).\
+            replace("2021-08-05 23:59:59", datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")).\
+            replace("feedbackCustomerId=25", "feedbackCustomerId=26")
+        # print(body)
+        re = sy1.post(url=focsl.url, data=body, headers=focsl.header)
+        self.assertEqual(re.status_code, 200)
+        # print(re.json())
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/12 17:34
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/12 17:34
+# @Author  : Ljq
+# @File    : test_HP.py
+# @Software: PyCharm
+
+"""
+回皮功能接口测试
+"""
+
+import json
+import unittest
+from commons.scripts.readConf import rC
+from commons.api import zcApi as zcA
+from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
+from commons.api import hpApi
+import time,random
+
+class test_HPCreate(unittest.TestCase):
+    """整车-车辆回皮"""
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
+        cls.ic = rC.returnOptionsItems("testInfo", "cardNumRe")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        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)
+        print(cre_res.json())
+        number = cre_res.json()["data"]["number"]
+        aa = eFBL.do_freezeOrder(host=self.jmsfHost,attrValue=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
+        assert res.json()["code"]=="200","回皮失败"
+        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)
+        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,plate=plate)
+        print(res.json())
+        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
+        customerName= eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
+        print(customerName)
+        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,customerName=customerName)
+        print(res.json())
+        assert res.json()["code"]=="200","车号查询失败"
+        assert res.json()["data"][-1]["number"]==number,"车号查询失败"
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/11 16:34
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/8/11 16:35
+# @Author  : Ljq
+# @File    : test_SJ.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+import json
+import unittest
+from commons.scripts.readConf import rC
+from commons.api import zcApi as zcA
+from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
+from commons.api import sjApi
+import time,random
+
+class test_ZCCreate(unittest.TestCase):
+    """整车-创建整车进门单"""
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_createSJ(self):
+        """整车-创建散件进门单"""
+        # 依赖数据
+        plate = f"川A{random.randint(10000, 99999)}"
+        trailerNumber = plate
+        productState = "1"
+        itemWeight = "10"
+        qty = "22"
+
+
+        # 获取车型
+        carType = zcA.get_carType(host=self.gatewayHost)
+        print(carType.text)
+        print(carType.json()["data"][0])
+        carTypeCode = carType.json()["data"][0]["code"]
+        carTypeId = carType.json()["data"][0]["id"]
+        carTypeName = carType.json()["data"][0]["carTypeName"]
+
+        # 获取商品
+        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        print(categoryByCondition.json())
+        cateId = categoryByCondition.json()["data"][0]["id"]
+        productId = categoryByCondition.json()["data"][0]["id"]
+        productName = categoryByCondition.json()["data"][0]["name"]
+
+        # 获取接车员
+        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        print(listByExample.json())
+        inGreeterId = listByExample.json()["data"][0]["id"]
+        inGreeterName = listByExample.json()["data"][0]["realName"]
+
+        # 获取交易类型
+        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        print(transactionType.json())
+        tradeType = transactionType.json()["rows"][0]["code"]
+        tradeTypeId = transactionType.json()["rows"][0]["id"]
+        tradeTypeName = transactionType.json()["rows"][0]["name"]
+
+        # 获取货物标签
+        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        print(goodsTag.json())
+        goodsTagId = goodsTag.json()["data"][0]["id"]
+
+        # 产地信息获取
+        address = zcA.get_address(host=self.gatewayHost)
+        print(address.json())
+        originId = address.json()["data"][0]["id"]
+        origin = address.json()["data"][0]["name"]
+        originCode = address.json()["data"][0]["cityCode"]
+
+        # 查询部门信息
+        depRes = zcA.get_dep(host=self.gatewayHost)
+        print(depRes.json())
+        feeDepId = depRes.json()["data"][0]["id"]
+        feeDepName = depRes.json()["data"][0]["name"]
+
+        # 获取证明类型
+        proveType = zcA.get_proveType(host=self.gatewayHost)
+        print(proveType.json())
+        proveTypeCode = proveType.json()["data"][0]["id"]
+        proveTypeName = proveType.json()["data"][0]["name"]
+
+        # 获取防重token
+        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        print(duplicateTokenRes.json())
+        duplicateToken = duplicateTokenRes.json()["data"]
+
+        # 重量信息准备
+        weight = int(itemWeight) * int(qty)
+
+        # 创建进门单
+        cre_res = sjApi.create_sparePartsWeighSave(host=self.gatewayHost, duplicateToken=duplicateToken,
+                                             carTypeCode=carTypeCode, carTypeId=carTypeId,
+                                             carTypeName=carTypeName, plate=plate, weight=weight,
+                                             productId=productId, productName=productName, proveTypeCode=proveTypeCode,
+                                             proveTypeName=proveTypeName, trailerNumber=trailerNumber,
+                                             depName=feeDepName,
+                                             cateId=cateId, originId=originId, origin=origin, originCode=originCode,
+                                             tradeType=tradeType, tradeTypeName=tradeTypeName,
+                                             productState=productState,
+                                             tradeTypeId=tradeTypeId, goodsTagId=goodsTagId, inGreeterId=inGreeterId,
+                                             inGreeterName=inGreeterName, dep=feeDepId)
+        print(cre_res.json())
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/28 11:15
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/28 16:59
+# @Author  : Ljq
+# @File    : demo.py
+# @Software: PyCharm
+
+"""
+
+"""
+import json
+import random
+
+# a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId"]
+# b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","calcDepId","dep","regionName","regionId","productName","productId","productArea","parentId","levelType","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
+
+"""
+# a系统
+a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveTypeName","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","backSkinTwo","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","bskinWithGoods","goodsRemark","inGreeterName","inGreeterId","outGreeterName","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
+# b自己
+b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems"]
+
+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
+
+# with open("demo_a.html",encoding="utf-8") as com:
+#     data = com.read()
+
+# orderDetailsSoup = BeautifulSoup(data, "html.parser")
+# selectList = orderDetailsSoup.findAll("select")
+# print(selectList)
+# selectDict = {}
+# for i in selectList:
+#     for a in i.findAll("option"):
+#         if a.get("selected") == "selected":
+#             selectDict[i.get("name")]=[a.get("value"),a.text]
+#             # print(i.text)
+# print(selectDict)
+
+# def do_ass(nA,tj,nB,msg):
+#     res =
+#     str = f'assert {res},"123123""'
+#     exec(str)
+
+# do_ass([1],"==",'[1]',"测试失败")
+assert True
+
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/28 11:15
+# @Author  : Ljq
+# @File    : test_ZC.py
+# @Software: PyCharm
+
+"""
+整车进门测试用例
+"""
+
+import json
+import unittest
+from commons.scripts.readConf import rC
+from commons.api import zcApi as zcA
+from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
+import time,random
+
+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")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    @unittest.skip
+    def test_get_carType(self):
+        """整车-整车创建:获取车型接口调用测试"""
+        # 依赖数据
+        plate = "川A12323"
+        productState = "1"
+        trailerNumber = plate
+
+        # 获取车型
+        carType = zcA.get_carType(host=self.gatewayHost)
+        print(carType.text)
+        print(carType.json()["data"][0])
+        carTypeCode = carType.json()["data"][0]["code"]
+        carTypeId = carType.json()["data"][0]["id"]
+        carTypeName = carType.json()["data"][0]["carTypeName"]
+        carTypeWeight = carType.json()["data"][0]["weight"]
+
+        # 获取商品
+        categoryByCondition = zcA.get_listCategoryByCondition(host=self.gatewayHost)
+        print(categoryByCondition.json())
+        cateId = categoryByCondition.json()["data"][0]["id"]
+        productId = categoryByCondition.json()["data"][0]["id"]
+        productName = categoryByCondition.json()["data"][0]["name"]
+        productCode = categoryByCondition.json()["data"][0]["keycode"]
+
+        # 获取接车员
+        listByExample = zcA.get_listByExample(host=self.gatewayHost)
+        print(listByExample.json())
+        inGreeterId = listByExample.json()["data"][0]["id"]
+        inGreeterName = listByExample.json()["data"][0]["realName"]
+
+        # 获取交易类型
+        transactionType = zcA.query_transactionType(host=self.gatewayHost)
+        print(transactionType.json())
+        tradeType = transactionType.json()["rows"][0]["code"]
+        tradeTypeId = transactionType.json()["rows"][0]["id"]
+        tradeTypeName = transactionType.json()["rows"][0]["name"]
+
+        # 获取货物标签
+        goodsTag = zcA.get_goodsTag(host=self.gatewayHost)
+        print(goodsTag.json())
+        goodsTagId = goodsTag.json()["data"][0]["id"]
+
+        # 产地信息获取
+        address = zcA.get_address(host=self.gatewayHost)
+        print(address.json())
+        originId = address.json()["data"][0]["id"]
+        origin = address.json()["data"][0]["name"]
+        originCode = address.json()["data"][0]["cityCode"]
+
+        # 查询部门信息
+        depRes = zcA.get_dep(host=self.gatewayHost)
+        print(depRes.json())
+        feeDepId = depRes.json()["data"][0]["id"]
+        feeDepName = depRes.json()["data"][0]["name"]
+
+        # 获取证明类型
+        proveType = zcA.get_proveType(host=self.gatewayHost)
+        print(proveType.json())
+        proveTypeCode = proveType.json()["data"][0]["id"]
+        proveTypeName = proveType.json()["data"][0]["name"]
+
+        # 获取防重token
+        duplicateTokenRes = zcA.get_duplicateToken(host=self.gatewayHost)
+        print(duplicateTokenRes.json())
+        duplicateToken = duplicateTokenRes.json()["data"]
+
+        # 重量信息准备
+        grossWeight = random.randint(carTypeWeight,carTypeWeight+100)
+        tareWeight = carTypeWeight
+        weighmanRecord = {"grossWeight":None, "grossWeightDate": "", "newWeight": None,"tareWeight":None, "tareWeightDate": None, "weighImgs": []}
+        weighmanRecord["grossWeight"] = grossWeight
+        weighmanRecord["tareWeight"] = carTypeWeight
+        weighmanRecord["newWeight"] = grossWeight-carTypeWeight
+        weighmanRecord["grossWeightDate"]= time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+        # 创建进门单
+        cre_res = zcA.create_wholeCarWeighSave(host=self.gatewayHost,duplicateToken=duplicateToken,carTypeCode=carTypeCode,carTypeId=carTypeId,
+                                               carTypeName=carTypeName,carTypeWeight=carTypeWeight,plate=plate,
+                                               productId=productId,productName=productName,proveTypeCode=proveTypeCode,
+                                               proveTypeName=proveTypeName,trailerNumber=trailerNumber,depName=feeDepName,
+                                               cateId=cateId,originId=originId,origin=origin,originCode=originCode,
+                                               tradeType=tradeType,tradeTypeName=tradeTypeName,productState=productState,
+                                               tradeTypeId=tradeTypeId,goodsTagId=goodsTagId,inGreeterId=inGreeterId,
+                                               inGreeterName=inGreeterName,dep=feeDepId,weighmanRecord=weighmanRecord)
+        print(cre_res.json())
+
+    @unittest.skip
+    def test_cre(self):
+        """调用方法1"""
+        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())
+        number = cre_res.json()["data"]["number"]
+        print(number)
+        # aa = eFBL.do_freezeOrder(attrValue=number)
+        aa = eFBL.do_payOrder(attrValue=number)
+        # cre_res = zcA.create_jmsf(host=self.gatewayHost)
+        # print(cre_res.json())
+        # cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00002",newWeight=20)
+        # print(cre_res.json())
+
+
+
+
+
+
+# if __name__ == "__main__":
+#     unittest.main()
+#
 \ No newline at end of file