Merge remote-tracking branch 'origin/master' into master

# Conflicts: # testcase/sy/test_ZC/demo_b.py

Merge remote-tracking branch 'origin/master' into master
# Conflicts: # testcase/sy/test_ZC/demo_b.py
liujiqiang
2 parents 45e5d14d 00763ae1
Showing 60 changed files with 657 additions and 187 deletions
commons/MySession.py
commons/api/entranceFeeBillList/operationDoAmend.py
commons/api/entranceFeeBillList/operationDoFreeze.py
commons/api/entranceFeeBillList/operationDoInvalid.py
commons/api/entranceFeeBillList/operationDoUndo.py
commons/api/entranceFeeBillList/operationDoUpdate.py
commons/api/entranceFeeBillList/operationUnfreeze.py
commons/api/entranceFeeBill_details.py
commons/api/entranceFeeBill_provesPage.py
commons/api/hg/__init__.py
commons/api/hg/jmsf/__init__.py
commons/api/hg/jmsf/registerRecord_save.py
commons/api/hpApi.py
commons/api/sjApi.py
commons/api/weightBizBill_doRefund.py
commons/api/weightBizBill_listPage.py
config/global_data.conf
main.py
testcase/heb/CZFW/test_weightBizBill_doRefund.py
testcase/heb/CZFW/test_weightBizBill_listPage.py
 #!/usr/bin/python
 # -*- coding: UTF-8 -*-
 import requests
+import re
 from commons import common as com
 from commons.Logging import log
 from commons.clientSession import cliSession
@@ -36,9 +37,10 @@ class mysession(requests.Session):
     body = "userName=sg_wenze&password=111111"
     body_client= {"userName":"sg_wenze","password":"111111"}
-    def __init__(self):
+    def __init__(self,host=None):
         "如下代码，可以通过配置文件来控制测试环境和灰度环境，http和https"
         super().__init__()
+        self.user={}
         self.url = mysession.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = mysession.header
         self.body = mysession.body
@@ -55,36 +57,50 @@ class mysession(requests.Session):
         self.allow_redirects = False
         self.firmid={"group":"1","hd":"2","cd":"3","qqhe":"4","mdj":"5","gy":"6","cc":"7","sg":"8","sy":"9"}
         self.market={"sy":"沈阳","heb":"哈尔滨","sg":"寿光","gy":"贵阳","cc":"长春","hs":"杭水","hg":"杭果"}
-        self.user={}
+        self.host= None if host==None else eval(com.get_global_config("global_data", "host_ip", host))
+
     def cliLogin(self,user="sy_userName_01"):
         self.webHeaders, self.clientHeaders, self.userInfo = cliSession().loginUser(user=user)
         return self
-    def get_session(self, account, **kwargs):
-        "如下代码，可以通过配置文件来控制登录的账户session"
-        self.body = self.body.replace("sg_wenze",
-                                      com.get_global_config("global_data", "account", account).split("&")[0])
-        self.body = self.body.replace("111111",
-                                      com.get_global_config("global_data", "account", account).split("&")[1])
-        self.se = requests.session()
-        co = requests.cookies.RequestsCookieJar()
-        #加入UAP_firmId属性
-        firm=account.split("_")[0]
-        co.set("UAP_firmId", self.firmid[firm])
-        self.se.cookies.update(co)
-        # 进行登录请求
-        re = self.se.post(url=self.url, headers=self.header, data=self.body, proxies=self.proxies, **kwargs)
-        self.UAP_accessToken=self.se.cookies["UAP_accessToken"]
-        self.UAP_refreshToken=self.se.cookies["UAP_refreshToken"]
-        return self.se
+    # def get_session(self, account, **kwargs):
+    #     "如下代码，可以通过配置文件来控制登录的账户session"
+    #     self.body = self.body.replace("sg_wenze",
+    #                                   com.get_global_config("global_data", "account", account).split("&")[0])
+    #     self.body = self.body.replace("111111",
+    #                                   com.get_global_config("global_data", "account", account).split("&")[1])
+    #     self.se = requests.session()
+    #     co = requests.cookies.RequestsCookieJar()
+    #     #加入UAP_firmId属性
+    #     firm=account.split("_")[0]
+    #     co.set("UAP_firmId", self.firmid[firm])
+    #     self.se.cookies.update(co)
+    #     # 进行登录请求
+    #     re = self.se.post(url=self.url, headers=self.header, data=self.body, proxies=self.proxies, **kwargs)
+    #     self.UAP_accessToken=self.se.cookies["UAP_accessToken"]
+    #     self.UAP_refreshToken=self.se.cookies["UAP_refreshToken"]
+    #     return self.se
+    #
+    # def get_login_info(self, account, **kwargs):
+    #     "用于获取用户信息"
+    #     self.body_client.update({"userName":com.get_global_config("global_data", "account", account).split("&")[0]})
+    #     self.body_client.update({"password":pwdCry(com.get_global_config("global_data", "account", account).split("&")[1])})
+    #     tmp = requests.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
+    #     return tmp
-    def get_login_info(self, account, **kwargs):
-        "用于获取用户信息"
-        self.body_client.update({"userName":com.get_global_config("global_data", "account", account).split("&")[0]})
-        self.body_client.update({"password":pwdCry(com.get_global_config("global_data", "account", account).split("&")[1])})
-        tmp = requests.post(url=self.url_client, headers=self.header_client, json=self.body_client, proxies=self.proxies, **kwargs)
-        return tmp
+    def url_pro(self, url, host):
+        # url = url.replace(" ", "")
+        if host!=None:
+            if "http:" in url:
+                d1=re.match(r"http://(.+?)/", url).group(1)
+                d2 = d1.split(":")[0]
+                url = re.sub(r"http://(.+?)/", r"http://" + host[d2] + "/", url)
+            elif "https:" in url:
+                d1=re.match(r"https://(.+?)/", url).group(1)
+                d2 = d1.split(":")[0]
+                url = re.sub(r"https://(.+?)/", r"https://" + host[d2] + "/", url)
+        return url,d1
     def get_session_client(self, account, **kwargs):
         "get_session和get_session_client的方法只能用一个"
@@ -151,6 +167,18 @@ class mysession(requests.Session):
         """
         # 记录日志
         log.info("{0:=^86}".format(''))
+        log.info(url)
+        #处理url
+        url,host=self.url_pro(url,self.host)
+        #处理header
+        if "UAP_accessToken" in kwargs["headers"].keys():
+            kwargs["headers"]["UAP_accessToken"] = self.re.json()["data"]["accessToken"]
+        elif "UAP_refreshToken" in kwargs["headers"].keys():
+            kwargs["headers"]["UAP_refreshToken"] = self.re.json()["data"]["refreshToken"]
+        elif "UAP_firmId" in kwargs["headers"].keys():
+            kwargs["headers"]["UAP_firmId"] = self.re.json()["data"]["user"]["firmId"]
+        elif "Host" in kwargs["headers"].keys():
+            kwargs["headers"]["Host"]=host
         log.info("{}\n{}\n".format(url, kwargs))
         # 进行请求
         re = super().request(method , url, **kwargs,timeout=self.timeout)
@@ -262,15 +290,15 @@ class mysession(requests.Session):
 my = mysession()
 my.set_mark()
-
 # 沈阳客户端session
 sessionSy = mysession().cliLogin("sy_userName_01")
 # 哈尔滨客户端session
 sessionHeb = mysession().cliLogin("hd_userName_01")
-# print(sessionSy.userInfo)
-# print(sessionHeb.userInfo)
-
-sy1=mysession().get_session_client("sy_user01")
-heb=mysession().get_session_client("heb_user01")
-# sg=mysession().get_session_client("sg_user01")
-
+#获取对应市场session
+sy1=mysession("host1").get_session_client("sy_user01")
+heb=mysession("host1").get_session_client("heb_user01")
+hg=mysession("host2").get_session_client("hg_user01")
+# 检测登录接口
+sy1.check_login("sy_user01")
+# 检测登录接口
+hg.check_login("hg_user01")
 \ No newline at end of file
@@ -9,7 +9,7 @@
 """
-import json,time,random,re
+import json,time, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
@@ -9,7 +9,7 @@
 """
-import json,time,random,re
+import json,time, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
@@ -9,10 +9,9 @@
 """
-import json,time,random,re
+import json,time, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
@@ -9,10 +9,9 @@
 """
-import json,time,random,re
+import json, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
@@ -9,7 +9,7 @@
 """
-import json,time,random,re
+import json,time, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
 # from commons.MySession import my
@@ -9,10 +9,9 @@
 进门单操作
 """
-import json,time,random,re
+import json,time, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 from bs4 import BeautifulSoup
 import urllib.parse
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import sy1,heb
+from commons.MySession import sy1
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -16,6 +16,7 @@ class entranceFeeBill_details():
           "User-Agent": "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36",
           "Content-Type": "application/json",
           "Accept-Language": "zh-CN,zh;q=0.9",
+          "Host": "test.jmsf.diligrp.com:8385",
           "Accept-Encoding": "gzip, deflate"}
     url_tail = """?rows=10&page=1
         &metadata[charge_total_amount]={"provider":"moneyProvider","index":10,"field":"charge_total_amount"}
@@ -38,8 +39,8 @@ class entranceFeeBill_details():
         &backSkinStatus=-1
         &tag=20
         &companyId=9
-        &startTime=2020-08-11 00:00:00&endTime=2025-08-13 00:00:00
-        &startPayTime=2020-08-11 00:00:00&endPayTime=2025-08-13 00:00:00
+        &startTime=2020-08-01 00:00:00&endTime=2025-08-30 00:00:00
+        &startPayTime=2020-08-01 00:00:00&endPayTime=2025-08-30 00:00:00
         &attr=number&attrValue=202108120900001"""
     def __init__(self):
@@ -76,5 +77,5 @@ class entranceFeeBill_details():
         return self.sql
 # tt=entranceFeeBill_details()
-# re=sy1.get(url=tt.url,headers=tt.header)
+# re=sy1.get(url=tt.url,headers=tt.header,proxies=sy1.myproxies)
 # print(str(re.json()).replace(" ",""))
 \ No newline at end of file
@@ -17,6 +17,7 @@ class entranceFeeBill_provesPage():
           "User-Agent": "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36",
           "Content-Type": "application/x-www-form-urlencoded",
           "Accept-Language": "zh-CN,zh;q=0.9",
+          "Host": "test.jmsf.diligrp.com:8385",
           "Accept-Encoding": "gzip, deflate"}
     body = """rows=10&page=1&sort=et.created&order=desc
     &metadata[actualPrice]={"provider":"moneyProvider","index":10,"field":"actualPrice"}
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import urllib3
+from commons import common as com
+from commons.MySession import hg
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+
+class registerRecord_save():
+    "录入批次号"
+
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save"
+        self.header = {
+                    "UAP_accessToken" :"demo",
+                    "UAP_refreshToken" :"demo",
+                    "UAP_firmId" :"15",
+                    "Content-Type" :"application/json",
+                    "Host" :"test.gateway.diligrp.com:8285"}
+        self.body = {
+                    "accountId": 107792,
+                    "cardNo": "888810026785",
+                    "customerId": 141992,
+                    "customerCode": "00131694",
+                    "customerName": "特朗普vip",
+                    "fixedphoneNumber": None,
+                    "mobilephoneNumber": "16111111112",
+                    "identityCardAddress": "",
+                    "identityCardNo": "110101198001012390",
+                    "identityCardType": "ID",
+                    "registerDetailDtoList": [{
+                        "id": 0,
+                        "areaId": 274,
+                        "areaName": "东区01",
+                        "quantity": 10,
+                        "productId": 374690,
+                        "registerRecordId": 0,
+                        "remark": None,
+                        "weight": 10,
+                        "weightType": 0,
+                        "created": None,
+                        "createdById": 0,
+                        "createdByName": None,
+                        "createdByDepartmentId": 0,
+                        "createdByDepartmentName": None,
+                        "registerCertificateList": None,
+                        "product": None,
+                        "registerCertificateDtoList": None,
+                        "productDto": {
+                            "id": 0,
+                            "originId": 510100,
+                            "originName": "成都市",
+                            "pieceWeight": 1,
+                            "categoryId": 374690,
+                            "categoryCode": "374690",
+                            "categoryName": "苹果",
+                            "created": None
+                        }
+                    }],
+                    "registerFeeDtoList": [],
+                    "tradePassword": "" }
+
+
+  
+
+tt=registerRecord_save()
+re=hg.post(url=tt.url,headers=tt.header,json=tt.body,proxies=hg.myproxies)
+print(str(re.json()))
 \ No newline at end of file
@@ -11,9 +11,7 @@
 import json,time,random
 from commons.scripts import dealContentType as dct
-from commons.MySession import my
 from commons.api import zcApi
-from commons.api import entranceFeeBillList as eFBL
 host = "http://test.gateway.diligrp.com:8285"
@@ -55,7 +53,7 @@ def do_backSkinWeighSave(session=None,host=&quot;&quot;,number=None,userName=None):
     tareWeightDate=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     # 获取接车员信息
-    listByExample = zcApi.get_listByExample(session=session,host=host)
+    listByExample = zcApi.get_listByExample(session=session, host=host)
     print(listByExample.json())
     if userName == None:
         listByExampleIndex = 0
@@ -9,11 +9,9 @@
 散件
 """
-import json,time,random
+import json
 from commons.scripts import dealContentType as dct
-from commons.MySession import my
 from commons.api import zcApi
-from commons.api import entranceFeeBillList as eFBL
 from commons.basic import getLookupList as gLL
@@ -106,7 +104,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 获取车型
     if "车型" in templateAttr_list:
-        carType = zcApi.get_carType(session=session,host=host)
+        carType = zcApi.get_carType(session=session, host=host)
         print(carType.text)
         if carTypeName == None:
             carTypeIndex = 0
@@ -126,7 +124,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 获取商品
     if "商品" in templateAttr_list or "商品(末级)" in templateAttr_list:
-        categoryByCondition = zcApi.get_listCategoryByCondition(session=session,host=host, keyword=keyword)
+        categoryByCondition = zcApi.get_listCategoryByCondition(session=session, host=host, keyword=keyword)
         cateId = categoryByCondition.json()["data"][0]["id"]
         productId = categoryByCondition.json()["data"][0]["id"]
         productName = categoryByCondition.json()["data"][0]["name"]
@@ -152,7 +150,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
         # print(firmCode)
         # print(departmentId)
         # print("==========1============")
-        listByExample =  zcApi.get_listByExample(session=session,host=host,firmCode=firmCode,departmentId=departmentId)
+        listByExample =  zcApi.get_listByExample(session=session, host=host, firmCode=firmCode, departmentId=departmentId)
         print("listByExample",listByExample.json())
         if userName == None:
             listByExampleIndex = 0
@@ -181,7 +179,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 获取交易类型
     if "交易类型" in templateAttr_list:
-        transactionType = zcApi.query_transactionType(session=session,host=host)
+        transactionType = zcApi.query_transactionType(session=session, host=host)
         print(transactionType.json())
         print("交易类型")
         if transactionName == None:
@@ -199,7 +197,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 获取货物标签
     if "货物标签" in templateAttr_list:
-        goodsTag = zcApi.get_goodsTag(session=session,host=host)
+        goodsTag = zcApi.get_goodsTag(session=session, host=host)
         print(goodsTag.json())
         if goodsTagName == None:
             transactionTypeIndex = 0
@@ -212,7 +210,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 产地信息获取
     if "产地" in templateAttr_list:
-        address = zcApi.get_address(session=session,host=host)
+        address = zcApi.get_address(session=session, host=host)
         print(address.json())
         originId = address.json()["data"][0]["id"]
         origin = address.json()["data"][0]["name"]
@@ -225,7 +223,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 查询部门信息
     # 查询部门信息
     if "接车部门" in templateAttr_list or "收费部门" in templateAttr_list:
-        depRes = zcApi.get_dep(session=session,host=host)
+        depRes = zcApi.get_dep(session=session, host=host)
         print(depRes.json())
         if depName == None:
             depResIndex = 0
@@ -240,7 +238,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     # 获取证明类型
     if "证明类型" in templateAttr_list:
-        proveType = zcApi.get_proveType(session=session,host=host)
+        proveType = zcApi.get_proveType(session=session, host=host)
         print(proveType.json())
         # print("proveName",proveName)
         if proveName == None:
@@ -257,7 +255,7 @@ def create_sj(session=None,host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=
     print("proveTypeName", proveTypeName)
     # 获取防重token
-    duplicateTokenRes = zcApi.get_duplicateToken(session=session,host=host)
+    duplicateTokenRes = zcApi.get_duplicateToken(session=session, host=host)
     print(duplicateTokenRes.json())
     duplicateToken = duplicateTokenRes.json()["data"]
@@ -16,6 +16,7 @@ class weightBizBill_doRefund():
           "User-Agent": "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36",
           "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
           "Accept-Language": "zh-CN,zh;q=0.9",
+          "Host": "test.jmsf.diligrp.com:8385",
           "Accept-Encoding": "gzip, deflate"}
     body = "id=206&reason=退款原因_test_123"
@@ -16,6 +16,7 @@ class weightBizBill_listPage():
           "User-Agent": "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36",
           "Content-Type": "application/x-www-form-urlencoded",
           "Accept-Language": "zh-CN,zh;q=0.9",
+          "Host": "test.jmsf.diligrp.com:8385",
           "Accept-Encoding": "gzip, deflate"}
     body = '''rows=10&page=1&sort=id&order=desc&metadata[fee]={"provider":"moneyProvider","index":10,"field":
         "fee"}&metadata[created]={"provider":"datetimeProvider","index":20,"field":
@@ -14,6 +14,7 @@ sy_user02=sygangda&amp;111111
 heb_user01=哈尔滨田太子&a123456
 heb_user02=sy_wenze&111111
 sg_user01=sg_wenze&111111
+hg_user01=111222&111111
 [userId]
 #冗余配置字段,可不配置
@@ -24,7 +25,7 @@ user03=256
 [email]
 #为空时[]不发邮件,若要发邮件，参考demo
 to_list=["tianlichang@diligrp.com","liaokaihua@diligrp.com"]
-cc_list=["lixi@diligrp.com","liujiqiang@diligrp.com","wenleiming@diligrp.com"]
+cc_list=["yangfei@diligrp.com","lixi@diligrp.com","liujiqiang@diligrp.com","wenleiming@diligrp.com"]
 demo=["lixi@diligrp.com","liujiqiang@diligrp.com","wenleiming@diligrp.com","tg@diligrp.com"]
 [mark]
@@ -34,7 +35,7 @@ demo=[&quot;heb1&quot;,&quot;P3&quot;,&quot;v1.6&quot;,&quot;沈阳&quot;,None]
 [environment]
-#格式只能为一下几种
+#格式只能为一下几种,用于区分环境
 #http://test.
 #https://test.
 #http://
@@ -56,8 +57,54 @@ gateway=test.gateway.diligrp.com:8285
-
-
-
-
+[host_ip]
+#重构host
+host1={
+	"test.customer.diligrp.com": "10.35.100.45:8382",
+	"test.bd.diligrp.com": "10.35.100.45:8384",
+	"test.jmsf.diligrp.com": "10.35.100.44:8385",
+	"test.account.diligrp.com": "10.35.100.44:8186",
+	"test.card.diligrp.com": "10.35.100.44:8386",
+	"test.trading.diligrp.com": "10.35.100.47:8387",
+	"test.logger.diligrp.com": "10.35.100.47:8283",
+	"test.orders.diligrp.com": "10.35.100.47:8185",
+	"test.rule.diligrp.com": "10.35.100.54:8284",
+	"test.gateway.diligrp.com": "10.35.100.54:8285",
+	"test.message.diligrp.com": "10.35.100.54:8289",
+	"test.dfs.diligrp.com": "10.35.100.55:9527",
+	"test.report.diligrp.com": "10.35.100.56:8388",
+	"test.exporter.diligrp.com": "10.35.100.56:8288",
+	"test.appmanager.diligrp.com": "10.35.100.56:9000",
+	"test.uid.diligrp.com": "10.35.100.56:8282",
+	"test.nacos.diligrp.com": "10.35.100.37:8848",
+	"test.scheduler.diligrp.com": "10.35.100.47:8281",
+	"test.bpmc.diligrp.com": "10.35.100.54:8617",
+	"test.route.diligrp.com": "10.35.100.54:8286",
+	"test.uap.diligrp.com": "10.35.100.55:80",
+	"test.trace.diligrp.com": "10.35.100.55:8082",
+	"test.xorder.diligrp.com": "10.35.100.56:8090"}
+
+#杭果host
+host2={
+	"test.uap.diligrp.com": "10.28.12.150:80",
+	"test.bpmc.diligrp.com": "10.28.12.150:8617",
+	"test.as.diligrp.com": "10.28.12.150",
+	"test.logger.diligrp.com": "10.28.11.149:8283",
+	"test.scheduler.diligrp.com": "10.28.11.149",
+	"test.account.diligrp.com": "10.28.11.149:8186",
+	"test.rule.diligrp.com": "10.28.10.127:8284",
+	"test.bd.diligrp.com": "10.28.10.127",
+	"test.customer.diligrp.com": "10.28.10.127:8384",
+	"test.report.diligrp.com": "10.28.10.127:8388",
+	"test.jmsf.diligrp.com": "10.28.10.127:8385",
+	"test.uid.diligrp.com": "10.28.11.180:8282",
+	"test.message.diligrp.com": "10.28.11.190:8289",
+	"test.dfs.diligrp.com": "10.28.11.190:9527",
+	"test.gateway.diligrp.com": "10.28.10.159:8285",
+	"test.route.diligrp.com": "10.28.10.159:8286",
+	"test.card.diligrp.com": "10.28.10.159:8386",
+	"test.exporter.diligrp.com": "10.28.11.183",
+	"test.ia.diligrp.com": "10.28.11.183",
+	"test.settlement.diligrp.com": "10.28.11.183:8383",
+	"test.hg.diligrp.com": "10.28.12.239"}
@@ -76,9 +76,7 @@ def Send_email(filename):
 if __name__ == "__main__":
     #检测数据库
     db.mysql_conn_test()
-    #检测登录接口
-    my.check_login("sy_user01")
     #创建测试套,运行测试用例,生成报告
     report=Run_Testcase(Create_Testcase_suite())
     #发送邮件
 -    Send_email(report)
+    Send_email(report)
 \ No newline at end of file
@@ -2,7 +2,6 @@
 # -*- coding: UTF-8 -*-
 import unittest
 import urllib3
-from commons import common as com
 from commons import ConfigDB as db
 from commons.MySession import my,heb
 from commons.api.weightBizBill_doRefund import weightBizBill_doRefund
@@ -3,7 +3,6 @@
 import unittest
 import urllib3
 import time
-from commons import common as com
 from commons.MySession import my,heb
 from commons.api.weightBizBill_listPage import weightBizBill_listPage
 from commons.api.weighingServiceSave import weighingServiceSave
 import unittest
 import urllib3
-from commons.MySession import my,heb
+from commons.MySession import heb
 from commons.api.fc_add import fc_add
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 from commons.Faker import random_data
 import unittest
 import urllib3
-from commons.MySession import my,heb
+from commons.MySession import heb
 from commons.api.fc_edit import fc_edit
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 from commons.Faker import random_data
 import unittest
 import urllib3
 import commons.ConfigDB as db
-from commons.MySession import my,heb
+from commons.MySession import heb
 from commons.api.fc_view import fc_view
 from commons.api.fc_add import fc_add
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 import unittest
 import urllib3
-from commons.MySession import my,heb
+from commons.MySession import heb
 from commons.api.feedback_customer_disable import feedback_customer_disable
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 fcd = feedback_customer_disable()
+import unittest
+import urllib3
+from commons.MySession import heb
+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
+
+"""
+进门收费——返点管理——返还人管理——启用返还人
+"""
+@unittest.skip
+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(heb.user["heb_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 = heb.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 heb
+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()
+
+"""
+进门收费——返点管理——返还人管理——返还人列表查询
+"""
+@unittest.skip
+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(heb.user["heb_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 = heb.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()
+import unittest
+import urllib3
+from commons.MySession import heb
+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()
+
+"""
+进门收费——返点管理——结账管理——选择需要返点的订单进行结账
+"""
+@unittest.skip
+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 = heb.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 = heb.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 = heb.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 heb
+from commons.api.feedback_order_settlement_query import feedback_order_settlement_query
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+fosq = feedback_order_settlement_query()
+import commons.ConfigDB as db
+import datetime
+
+"""
+进门收费——返点管理——结账管理——根据返还人和缴费时间进行查询
+"""
+@unittest.skip
+class test_feedback_order_settlement_query(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(heb.user["heb_user01"]["firmId"]) + ''' 
+         ORDER BY `id` DESC LIMIT 1''')[0]
+    def test_feedback_order_settlement_query_01(self):
+        "根据返还人和缴费时间进行查询"
+        print(fosq.url)
+        body = fosq.body.replace("feedbackCustomerId=25", "feedbackCustomerId="+str(self.ids)).\
+            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 = heb.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()
@@ -3,7 +3,6 @@
 import unittest
 import urllib3
 from commons import ConfigDB as db
-from commons import common as com
 from commons.MySession import my,heb
 from commons.api.entranceFeeBill_details import entranceFeeBill_details
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -3,7 +3,6 @@
 import unittest
 import urllib3
 from commons import ConfigDB as db
-from commons import common as com
 from commons.MySession import my,heb
 from commons.api.entranceFeeBill_provesPage import entranceFeeBill_provesPage
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 import unittest
 import urllib3
-from commons.MySession import my,heb
+from commons.MySession import heb
 from commons.api.feedbackOrderController_settlementlist import feedbackOrderController_settlementlist
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 import commons.ConfigDB as db
@@ -9,14 +9,11 @@
 回皮功能接口测试
 """
-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.entranceFeeBillList import operationDoFreeze as oDF
-from commons.api import hpApi
-import time,random
+from commons.api import hpApi, zcApi as zcA
+from commons.api.entranceFeeBillList import operationDoFreeze as oDF, entranceFeeBillList as eFBL
+import random
 from commons.MySession import sessionHeb
 session = sessionHeb
@@ -48,7 +45,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session, host=self.gatewayHost, number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
@@ -60,7 +57,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,plate=plate)
+        res = hpApi.get_listBackSkinTrucks(session=session, host=self.gatewayHost, plate=plate)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -73,7 +70,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,number=number)
+        res = hpApi.get_listBackSkinTrucks(session=session, host=self.gatewayHost, number=number)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -89,7 +86,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,customerName=customerName)
+        res = hpApi.get_listBackSkinTrucks(session=session, 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
@@ -9,13 +9,10 @@
 """
-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
+from commons.api import sjApi, zcApi as zcA
+import random
 from commons.MySession import sessionHeb
 session = sessionHeb
@@ -108,15 +105,15 @@ class test_SJCreate(unittest.TestCase):
         weight = int(itemWeight) * int(qty)
         # 创建进门单
-        cre_res = sjApi.create_sparePartsWeighSave(session=session,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, inGreeterId=inGreeterId,
-                                             inGreeterName=inGreeterName, dep=feeDepId)
+        cre_res = sjApi.create_sparePartsWeighSave(session=session, 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, inGreeterId=inGreeterId,
+                                                   inGreeterName=inGreeterName, dep=feeDepId)
         print(cre_res.json())
 \ No newline at end of file
@@ -9,7 +9,6 @@
 整车进门测试用例
 """
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
@@ -9,7 +9,6 @@
 整车进门基础数据获取测试
 """
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
@@ -9,12 +9,9 @@
 整车进门但创建测试
 """
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
-from commons.MySession import sessionHeb
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
 import time,random
 from commons.MySession import sessionHeb
 session = sessionHeb
@@ -11,17 +11,11 @@
 import unittest
 from commons.scripts.readConf import rC
-from commons.api import zcApi as zcA
-from commons.api import sjApi
-from commons.api import hpApi
-from commons.api.entranceFeeBillList import operationUnfreeze as eOp
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-from commons.api.entranceFeeBillList import operationDoInvalid as oDI
-from commons.api.entranceFeeBillList import operationDoCorrect as oDC
-from commons.api.entranceFeeBillList import operationDoAmend as oDA
+from commons.api import sjApi, hpApi, zcApi as zcA
 from commons.api.entranceFeeBillList import operationDoUndo as oDU
-from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
-from commons.api.entranceFeeBillList import operationDoFreeze as oDF
+from commons.api.entranceFeeBillList import operationDoFreeze as oDF, operationDoCorrect as oDC, \
+    operationDoInvalid as oDI, entranceFeeBillList as eFBL, operationUnfreeze as eOp, operationDoUpdate as oDUp, \
+    operationDoAmend as oDA
 import random
 from commons.MySession import sessionHeb
@@ -79,7 +73,7 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：散件进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = sjApi.create_sj(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = sjApi.create_sj(session=session, host=self.gatewayHost, plate=plate, keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
@@ -96,7 +90,7 @@ class test_listPage(unittest.TestCase):
         res_pay = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
-        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session, host=self.gatewayHost, number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
         resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
@@ -9,15 +9,13 @@
 进门单列表查询
 """
-
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
 from commons import ConfigDB as CoDB
 from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-import time,random
+import random
 from commons.MySession import sessionHeb
 session = sessionHeb
@@ -9,7 +9,6 @@
 进门单列表其他他查询条件
 """
-import json
 import unittest
 from bs4 import BeautifulSoup
 from commons.scripts.readConf import rC
@@ -17,8 +16,7 @@ from commons.api import zcApi as zcA
 from commons.basic import getLookupList as gLL
 from commons.ConfigDB import mysql_selectAll as msa
 from commons.api.entranceFeeBillList import operationDoUndo as oDU
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
+from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL, operationDoUpdate as oDUp
 import time,random
 from commons.MySession import sessionHeb
 session = sessionHeb
@@ -2,7 +2,6 @@
 # -*- 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
@@ -3,7 +3,6 @@
 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
 import unittest
 import urllib3
-from commons.MySession import my,sy1
+from commons.MySession import sy1
 from commons.api.fc_add import fc_add
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 from commons.Faker import random_data
 import unittest
 import urllib3
-from commons.MySession import my,sy1
+from commons.MySession import sy1
 from commons.api.fc_edit import fc_edit
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 from commons.Faker import random_data
 import unittest
 import urllib3
 import commons.ConfigDB as db
-from commons.MySession import my,sy1
+from commons.MySession import sy1
 from commons.api.fc_view import fc_view
 from commons.api.fc_add import fc_add
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 import unittest
 import urllib3
-from commons.MySession import my,sy1
+from commons.MySession import sy1
 from commons.api.feedback_customer_disable import feedback_customer_disable
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 fcd = feedback_customer_disable()
+import unittest
+import urllib3
+from commons.MySession import 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 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()
+import unittest
+import urllib3
+from commons.MySession import 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 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 commons.ConfigDB as db
+import datetime
+
+"""
+进门收费——返点管理——结账管理——根据返还人和缴费时间进行查询
+"""
+
+class test_feedback_order_settlement_query(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(self.ids)
+    def test_feedback_order_settlement_query_01(self):
+        "根据返还人和缴费时间进行查询"
+        print(fosq.url)
+        body = fosq.body.replace("feedbackCustomerId=25", "feedbackCustomerId="+str(self.ids)).\
+            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()
@@ -3,7 +3,6 @@
 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)
@@ -147,5 +146,5 @@ class test_entranceFeeBill_details(unittest.TestCase):
 if __name__ == "__main__":
-    # unittest.main(verbosity=2)
-    com.run_one(test_entranceFeeBill_details("test_entranceFeeBill_details_01"))
+    unittest.main(verbosity=2)
+    # com.run_one(test_entranceFeeBill_details("test_entranceFeeBill_details_01"))
@@ -3,7 +3,6 @@
 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)
 import unittest
 import urllib3
-from commons.MySession import my,sy1
+from commons.MySession import sy1
 from commons.api.feedbackAccounrecordController_list import feedbackAccounrecordController_list
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 import commons.ConfigDB as db
@@ -9,14 +9,11 @@
 回皮功能接口测试
 """
-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.entranceFeeBillList import operationDoFreeze as oDF
-from commons.api import hpApi
-import time,random
+from commons.api import hpApi, zcApi as zcA
+from commons.api.entranceFeeBillList import operationDoFreeze as oDF, entranceFeeBillList as eFBL
+import random
 from commons.MySession import sessionSy
 session = sessionSy
@@ -48,7 +45,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session, host=self.gatewayHost, number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
@@ -60,7 +57,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,plate=plate)
+        res = hpApi.get_listBackSkinTrucks(session=session, host=self.gatewayHost, plate=plate)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -73,7 +70,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,number=number)
+        res = hpApi.get_listBackSkinTrucks(session=session, host=self.gatewayHost, number=number)
         print(res.json())
         assert res.json()["code"]=="200","车号查询失败"
         assert res.json()["data"][-1]["number"]==number,"车号查询失败"
@@ -89,7 +86,7 @@ class test_HPCreate(unittest.TestCase):
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         aa = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
-        res = hpApi.get_listBackSkinTrucks(session=session,host=self.gatewayHost,customerName=customerName)
+        res = hpApi.get_listBackSkinTrucks(session=session, 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
@@ -9,13 +9,10 @@
 """
-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
+from commons.api import sjApi, zcApi as zcA
+import random
 from commons.MySession import sessionSy
 session = sessionSy
@@ -109,15 +106,15 @@ class test_ZCCreate(unittest.TestCase):
         weight = int(itemWeight) * int(qty)
         # 创建进门单
-        cre_res = sjApi.create_sparePartsWeighSave(session=session,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)
+        cre_res = sjApi.create_sparePartsWeighSave(session=session, 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
@@ -9,7 +9,6 @@
 整车进门测试用例
 """
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
@@ -9,7 +9,6 @@
 整车进门基础数据获取测试
 """
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
@@ -9,11 +9,9 @@
 整车进门但创建测试
 """
-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
 from commons.MySession import sessionSy
 session = sessionSy
@@ -11,17 +11,11 @@
 import unittest
 from commons.scripts.readConf import rC
-from commons.api import zcApi as zcA
-from commons.api import sjApi
-from commons.api import hpApi
-from commons.api.entranceFeeBillList import operationUnfreeze as eOp
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-from commons.api.entranceFeeBillList import operationDoInvalid as oDI
-from commons.api.entranceFeeBillList import operationDoCorrect as oDC
-from commons.api.entranceFeeBillList import operationDoAmend as oDA
+from commons.api import sjApi, hpApi, zcApi as zcA
 from commons.api.entranceFeeBillList import operationDoUndo as oDU
-from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
-from commons.api.entranceFeeBillList import operationDoFreeze as oDF
+from commons.api.entranceFeeBillList import operationDoFreeze as oDF, operationDoCorrect as oDC, \
+    operationDoInvalid as oDI, entranceFeeBillList as eFBL, operationUnfreeze as eOp, operationDoUpdate as oDUp, \
+    operationDoAmend as oDA
 import random
 from commons.MySession import sessionSy
@@ -80,7 +74,7 @@ class test_listPage(unittest.TestCase):
         """进门单列表-操作：散件进门交费测试"""
         plate = f"川A{random.randint(10000,99999)}"
         goods = "雪莲果"
-        cre_res = sjApi.create_sj(session=session,host=self.gatewayHost,plate=plate,keyword=goods)
+        cre_res = sjApi.create_sj(session=session, host=self.gatewayHost, plate=plate, keyword=goods)
         print(cre_res.json())
         number = cre_res.json()["data"]["number"]
         res_pay = eFBL.do_payOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
@@ -97,7 +91,7 @@ class test_listPage(unittest.TestCase):
         res_pay = oDF.do_freezeOrder(session=session,host=self.jmsfHost,attrValue=number,ic=self.ic)
         assert res_pay.json()["code"]=="200","缴费失败"
         assert res_pay.json()["message"] == "OK", "缴费失败"
-        res,tareWeight = hpApi.do_backSkinWeighSave(session=session,host=self.gatewayHost,number=number)
+        res,tareWeight = hpApi.do_backSkinWeighSave(session=session, host=self.gatewayHost, number=number)
         assert res.json()["code"]=="200","回皮失败"
         assert "data" in res.text,"回皮失败"
         resListPage = eFBL.listPage(session=session,host=self.jmsfHost,attrValue=number)
@@ -9,15 +9,12 @@
 进门单列表查询
 """
-
-import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
 from commons import ConfigDB as CoDB
-from commons.MySession import my
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-import time,random
+import random
 from commons.MySession import sessionSy
 session = sessionSy
@@ -9,7 +9,6 @@
 进门单列表其他他查询条件
 """
-import json
 import unittest
 from bs4 import BeautifulSoup
 from commons.scripts.readConf import rC
@@ -17,8 +16,7 @@ from commons.api import zcApi as zcA
 from commons.basic import getLookupList as gLL
 from commons.ConfigDB import mysql_selectAll as msa
 from commons.api.entranceFeeBillList import operationDoUndo as oDU
-from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
-from commons.api.entranceFeeBillList import operationDoUpdate as oDUp
+from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL, operationDoUpdate as oDUp
 import time,random
 from commons.MySession import sessionSy
 session = sessionSy