Merge remote-tracking branch 'origin/master'

lixi
2 parents c7d223cd 96c7221f
Showing 13 changed files with 71 additions and 28 deletions
commons/api/entranceFeeBillList.py
commons/api/feedback_customer_query.py
commons/api/feedback_order_settlement_query.py
report/test.log
testcase/FeedbackCustomerController/test_fc_add.py
testcase/FeedbackCustomerController/test_fc_edit.py
testcase/FeedbackCustomerController/test_fc_view.py
testcase/FeedbackCustomerController/test_feedback_customer_disable.py
testcase/FeedbackCustomerController/test_feedback_customer_enable.py
testcase/FeedbackCustomerController/test_feedback_customer_query.py
testcase/FeedbackOrderController/test_feedback_order_settlement.py
testcase/FeedbackOrderController/test_feedback_order_settlement_query.py
testcase/feedbackOrderController_settlementlist/test_feedbackOrderController_settlementlist.py
@@ -249,7 +249,7 @@ def do_doPay(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
-a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900019")
+a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900028")
 print("listPage",a.json())
 orderId = a.json()["rows"][0]["id"]
 number = a.json()["rows"][0]["number"]
@@ -303,11 +303,13 @@ carTypeName= re.findall(&#39;name=&quot;carTypeName&quot; id=&quot;carTypeName&quot; value=&quot;(.*?)&quot; &#39;,res
 carTypeCode = re.findall('name="carTypeCode" id="carTypeCode" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeId = re.findall('name="carTypeId" id="carTypeId" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeWeight = "333"
-proveTypeCode = "1621"
-proveType = proveTypeCode
+# proveTypeCode = "1621"
+proveType = re.findall(' value="(.*?)" id="proveType" name="proveType"',resOrderDetails.text)[0]
+proveTypeCode = proveType
 # grossWeight="353"
 grossWeight = re.findall('name="grossWeight"  id="grossWeight" value="(.*?)"',resOrderDetails.text)[0]
-newWeight="20"
+# newWeight="20"
+newWeight = re.findall('name="weight" readonly value="(.*?)" id="weight"',resOrderDetails.text)[0]
 # tareWeight="333"
 tareWeight=re.findall('name="tareWeight" id="tareWeight" value="(.*?)"',resOrderDetails.text)[0]
 # depName="接车部"
@@ -327,8 +329,11 @@ weight = re.findall(&#39;name=&quot;weight&quot; readonly value=&quot;(.*?)&quot;&#39;,resOrderDetails.text)
 calcDepId=re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0]
 categoryName="水果"
 categoryId="14436"
-inGreeterName="通用测试"
-inGreeterId="274"
+# inGreeterName="通用测试"
+inGreeterName = re.findall('id="inGreeterName" value="(.*?)"',resOrderDetails.text)[0]
+# inGreeterId="274"
+inGreeterId = re.findall('name="inGreeterId" id="inGreeterId" value="(.*?)"',resOrderDetails.text)[0]
+
 autocompletecartype = f"{carTypeCode}({carTypeName})"
 print(autocompletecartype)
@@ -62,7 +62,7 @@ class feedback_customer_query():
         self.url = feedback_customer_query.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = feedback_customer_query.header
         self.body = feedback_customer_query.body
-        print(self.body)
+        # print(self.body)
 # feedback_customer_query = urllib.parse.urlencode(feedback_customer_query())
 # fcq = feedback_customer_query
@@ -38,7 +38,7 @@ class feedback_order_settlement_query():
         self.url = feedback_order_settlement_query.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
         self.header = feedback_order_settlement_query.header
         self.body = feedback_order_settlement_query.body
-        print(self.body)
+        # print(self.body)
 # fosq = feedback_order_settlement_query
 # print(fosq.body)
+[2021-08-06 15:48:12] [INFO] : ======================================================================================
+[2021-08-06 15:48:12] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sy_chen', 'password': 'VTOTPkEIxvmtuO8zWAmUxzEJRCclqyDB4PzmKnOTpX86q20urQX6IRUZPGHh4g5JDryMvrFYBWufCB9kTnOzHmN1rHx5CIpV8yR6bX0+lQAk2hFlPcZbsWoDgK31CsPr4epTirwTf3WX1lhpMh45oZCYWgaR9PctTb4vAbVJ4m0='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+
+[2021-08-06 15:48:13] [INFO] : ======================================================================================
+[2021-08-06 15:48:13] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sygangda', 'password': 'kflO1Y7sTjw7YW/y91OMEKKuxKDQCZHNpvL6CUTRMcYg5AJkoN+B1OJW6z5K2vHDeNiJC0+cEnZYcPYsBmFxWgVIiUjf/XAWhd2dsh1HcOQ/HK65PmUFPVOAWlMqFnmkPCgBpd8OYMYUHn6/gHqpyh+MUDi++TSDQcswcgKbY8E='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+
+[2021-08-06 15:48:13] [INFO] : ======================================================================================
+[2021-08-06 15:48:13] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
+{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108060900019'}
+{}
+
+[2021-08-06 15:48:13] [INFO] : ======================================================================================
+[2021-08-06 15:48:13] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3745.action
+None
+{}
+
+[2021-08-06 15:48:15] [INFO] : ======================================================================================
+[2021-08-06 15:48:15] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
+None
+{}
+
+[2021-08-06 15:48:20] [INFO] : ======================================================================================
+[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+None
+{}
+
+[2021-08-06 15:48:20] [INFO] : ======================================================================================
+[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
+{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3745, 'goodsId': '3759', 'number': '202108060900019', 'modified': '2021-08-06 15:48:20', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00001', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1621', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '接车部', 'calcDepId': '103', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-06 15:47:54', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-06 15:47:54', 'tareWeightDate': '2021-08-06 15:47:54', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
+{}
+
+[2021-08-06 15:48:21] [INFO] : ======================================================================================
+[2021-08-06 15:48:21] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
+protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3745&goodsId=3759&number=202108060900019&modified=2021-08-06%2015%3A47%3A54&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=800&customerId=389&fundAccount=105847&ic=888810032426&customerName=%E9%95%BF%E6%AD%8C%E4%B9%B0%E5%AE%B6%E7%9C%81%E5%86%85%E5%95%8A%E5%95%8A%E5%95%8A%E5%98%BF&customerPhone=18011501258&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DB00001&autocomplete-cartype=003%28%E6%9D%BF%E8%BD%A6%29&carTypeName=%E6%9D%BF%E8%BD%A6&carTypeCode=003&carTypeId=53&carTypeWeight=333&storeTareWeight=&proveType=1621&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%8E%A5%E8%BD%A6%E9%83%A8&calcDepId=103&dep=103&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=14158&productArea=%E9%87%8D%E5%BA%86%2C%E9%87%8D%E5%BA%86%E5%B8%82%2C%E4%B8%87%E5%B7%9E%E5%8C%BA&parentId=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-06%2015%3A47%3A54&remark=&goodsTagIds=1900&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-06%2015%3A47%3A54&tareWeightDate=2021-08-06%2015%3A47%3A54&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.00&billItems=%7B%22discount%22%3A500%2C%22id%22%3A103%2C%22name%22%3A%22%E4%BA%A4%E6%98%93%E7%AE%A1%E7%90%86%E8%B4%B9%22%2C%22receivable%22%3A1000%2C%22require%22%3A1%7D&billItemDicCheckIds=105&billItemsDic=%7B%22discount%22%3A0%2C%22id%22%3A105%2C%22name%22%3A%22%E4%BC%98%E6%83%A0%E6%94%B6%E8%B4%B9%22%2C%22receivable%22%3A500%2C%22require%22%3A0%7D&billItemCheckIds=106&106=3.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A106%2C%22name%22%3A%22%E6%A3%80%E6%B5%8B%E8%B4%B9%22%2C%22receivable%22%3A300%2C%22require%22%3A1%7D
+{}
+
@@ -18,10 +18,10 @@ class test_fc_add(unittest.TestCase):
         body = fc.body.replace("888810054630","888810054630").replace("你好",ra.name()).replace("relation\
         CardTemp=888810054630","relationCardTemp=888810054630").replace("relationalCard[0].cardNumber\
         =888810054630","relationalCard[0].cardNumber=888810054630")
-        print(body)
+        # print(body)
         re = sy1.post(url=fc.url, headers=fc.header, data=body.encode('utf-8'))
-        print(re.headers)
-        print(re.json())
+        # print(re.headers)
+        # print(re.json())
         self.assertTrue("操作成功" in str(re.json()))
         return re
@@ -17,10 +17,10 @@ class test_fc_edit(unittest.TestCase):
         body = fc.body.replace("relationalCard[0].cardNumber=210720131533",\
                                "relationalCard[0].cardNumber=210720125142")
-        print(body)
+        # print(body)
         re = sy1.post(url=fc.url, headers=fc.header, data=body.encode('utf-8'))
-        print(re.headers)
-        print(re.json())
+        # print(re.headers)
+        # print(re.json())
         self.assertTrue("操作成功" in str(re.json()))
     @classmethod
@@ -22,7 +22,7 @@ class test_fc_view(unittest.TestCase):
         my.post(url=ad.url, headers=ad.header, data=ad.body.encode('utf-8'))
         # 获取数据：从MYSQL获取新增返还人的id号
         self.code = db.mysql_selectOne("SELECT * FROM `dili_jmsf`.`feedback_customer` ORDER BY `id` DESC LIMIT 1")[0]
-        print("查询出返还人id", self.code)
+        # print("查询出返还人id", self.code)
     # @unittest.case_mark(my.mark())
     def test_fc_view_01(self):
@@ -33,7 +33,7 @@ class test_fc_view(unittest.TestCase):
         # 进行GET请求
         re = sy1.get(url=url, headers=vi.header)
         # 打印请求结果(可删除该代码,一般只在调试时使用)
-        print(re.text)
+        # print(re.text)
         # 断言响应数据中是否存在期望字符串
         self.assertTrue('关联交费卡号' in str(re.text))
@@ -19,8 +19,8 @@ class test_feedback_customer_disable(unittest.TestCase):
     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())
+        # print(re.headers)
+        # print(re.json())
         self.assertTrue("操作成功" in str(re.json()))
     @classmethod
@@ -21,9 +21,9 @@ class test_feedback_customer_enable(unittest.TestCase):
         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())
+        # print(fce.url)
+        # print(re.headers)
+        # print(re.json())
         self.assertTrue("操作成功" in str(re.json()))
     @classmethod
     def tearDownClass(cls):
@@ -17,8 +17,8 @@ class test_feedback_customer_query(unittest.TestCase):
         2021-08-02 00:00:00").replace("2021-08-03 23:59:59", "2021-08-08 23:59:59")
         re = sy1.post(url = fcq.url, data = body.encode('utf-8'),headers = fcq.header)
-        print(re.headers)
-        print(re.json())
+        # print(re.headers)
+        # print(re.json())
         self.assertTrue("孟莹" in str(re.json()))
     @classmethod
@@ -32,9 +32,9 @@ class test_feedback_order_settlement(unittest.TestCase):
             replace("settledAmounts=2","settledAmounts=2")
         re = sy1.post(url = fos.url, headers = fos.header, data = body.encode('utf-8'))
-        print(re.headers)
+        # print(re.headers)
-        print(re.json())
+        # print(re.json())
         self.assertTrue("操作成功" in str(re.json()))
         return re
@@ -17,8 +17,8 @@ class test_feedback_order_settlement_query(unittest.TestCase):
                 2021-07-03 00:00:00").replace("2021-08-03 23:59:59", "2021-08-03 23:59:59")
         re = sy1.post(url = fosq.url, data = body,headers = fosq.header)
-        print(re.headers)
-        print(re.json())
+        # print(re.headers)
+        # print(re.json())
         self.assertTrue("新爱心园婚介所的总公司" in str(re.json()))
     @classmethod
@@ -20,7 +20,7 @@ class test_feedbackOrderController_settlementlist(unittest.TestCase):
             .replace("feedbackCustomerId=25", "feedbackCustomerId=26")
         re = sy1.post(url=focsl.url, data=body, headers=focsl.header)
-        print(re.json())
+        # print(re.json())
     @classmethod
     def tearDownClass(cls):