封装了接口的代码，更方便其他同事使用

175930106 · liujiqiang
1 parent decaafb2
Showing 16 changed files with 174 additions and 527 deletions
src/commons/MyRequest.py
src/commons/__pycache__/MyRequest.cpython-36.pyc
src/commons/__pycache__/common.cpython-36.pyc
src/commons/common.py
src/config/api/arrivalUnderTakeOrder.conf
src/config/api/customerOrderSubmit.conf
src/config/api/departTransportOrder.conf
src/config/api/login.conf
src/config/api/saveOrUpdate.conf
src/config/api/submitOrder.conf
src/config/api/submitOrder.xlsx
src/config/api/undertaskOrderSubmit.conf
src/config/api/upStream.conf
src/config/api/updateTransportOrderLoaded.conf
src/report/test.log
src/testcase/test_tms_myrequest/test_upStream.py
@@ -46,21 +46,45 @@ class myrequest(object):
         log.info('响应body为{};'.format(res.json())) 
         return res
  
-    def put(self,url, data=None, **kwargs):
-        res = self.se.put(url, data=data, **kwargs)
-        return res
-    
-    def delete(self,url, **kwargs):
-        res = self.se.delete(url, **kwargs)
-        return res
-
-    def patch(self,url, data=None, **kwargs):
-        res = self.se.patch(url,data=data, **kwargs)
-        return res
-
-    def head(self, url, **kwargs):
-        res = self.se.patch(url,data=None, **kwargs)
-        return res
+    def post2(self,api,**kwargs):
+        self.api=api.split("_")[2]
+        self.api_num=(api.split("_")[2]+api.split("_")[1])
+        self.method=com.get_api_config(self.api,self.api_num,'method')
+        self.body_format=com.get_api_config(self.api,self.api_num,'body_format')
+        self.url=com.get_api_config(self.api,self.api_num, 'url')
+        self.data=None if self.body_format=="JSON" else com.get_api_config(self.api,self.api_num,'body')
+        self.json=None if self.body_format=="FORM" else json.loads(com.get_api_config(self.api,self.api_num,'body'))
+        self.headers=json.loads(com.get_api_config(self.api,self.api_num,'header')) 
+        log.info('{0:=^80}'.format('请求接口为{}'.format(api))) 
+        log.info('请求地址为{}; 请求方式为{}; 请求body格式为{};\n 请求body为{}{};'.format(
+                                                                                self.url,
+                                                                                self.method,
+                                                                                self.body_format,
+                                                                                self.data,
+                                                                                self.json)) 
+       
+        if self.method.upper()=="POST":
+            res = self.se.post(self.url, data=self.data, json=self.json,proxies=self.proxies,headers=self.headers,**kwargs)
+            log.info('响应body为{};'.format(res.json())) 
+            return res
+        elif self.method.upper()=="GET":
+            res = self.se.GET(self.url,proxies=self.proxies,**kwargs)
+            log.info('响应body为{};'.format(res.json())) 
+            return res
+        elif self.method.upper()=="PUT":
+            res = self.se.put(self.self.url, data=self.data, json=self.json,proxies=self.proxies,**kwargs)
+            log.info('响应body为{};'.format(res.json())) 
+            return res
+        elif self.method.upper()=="DELETE":
+            res = self.se.delete(self.self.url,proxies=self.proxies,**kwargs)
+            log.info('响应body为{};'.format(res.json())) 
+            return res
+        elif self.method.upper()=="HEAD":
+            res = self.se.head(self.url,proxies=self.proxies,**kwargs)
+            log.info('响应body为{};'.format(res.json())) 
+            return res
+        else :
+            raise Exception("Request method error")
  
     def close_session(self):
         self.se.close()
@@ -86,7 +110,21 @@ class myrequest(object):
 #             # print("405 METHOD NOT ALLOWED")
 #             Logger.error("METHOD NOT ALLOWED".format(method))
 #         return res
-    
+#     
 # test=myrequest()
+# # 获取session
 # re=test.getSession(True)
-# print(re.headers)
 \ No newline at end of file
+# print(re.headers)
+# # 请求
+# # re2=test.post(com.get_api_config('upStream', 'upStream01', 'url'), 
+# #               json=json.loads(d),
+# #               headers=json.loads(com.get_api_config('upStream', 'upStream01', 'header')))
+# # print(re2.json())
+#  
+# d=com.get_api_config('upStream', 'upStream01', 'body')
+# print(type(json.loads(d)))
+# print(d)
+# print(d.encode().decode('unicode-escape'))
+# 
+# re3=test.post2("test_01_upStream",body="json")
+# print(re3.json())
@@ -353,6 +353,10 @@ def post_request(api,caseNum,requestBody):
         raise Exception(u"Request Fail! Response Code is not 200,Pls Check Your Request Datas")
  
  
+
+
+# def my
+
 # a='https://gateway.fresh.nong12.com/getCityByPosition?lat=30.661286&lng=104.067624'
 # b={
 #     "Host": "gateway.fresh.nong12.com",
-# -*- coding: UTF-8 -*-
-
-[arrivalUnderTakeOrder01]
-url=http://oms.tms.nong12.com/transportOrder/arrivalUnderTakeOrder.action?code=UO20191202000003&arrivalNum=5&arrivalWeight=5.0&stevedore=卸货人&loadingPlaceId=10&arrivalTime=2019-12-02&attachments= 
-
-body=""
-
-expect_response={"code":"200","message":"OK","result":"OK","success":true}
-
-
-# -*- coding: UTF-8 -*-
-
-[customerOrderSubmit01]
-url=http://oms.tms.nong12.com/undertakeDemandCenter/customerOrderSubmit.action
-
-update_header01={"Content-Type":"application/json;charset=UTF-8","Referer":"http://oms.tms.nong12.com/undertakeDemandCenter/orderSplit.html"}
-
-
-body=[{"code":"CO20191126000037","splitMap":{"SC201905210001":5}},{"code":"CO20191126000037","splitMap":{"SC201905210001":5}}]
-
-expect_response={"code":"200","data":["UO20191202000001","UO20191202000002"],"message":"新增成功","result":"新增成功","success":true}
-
-
-# -*- coding: UTF-8 -*-
-
-[departTransportOrder01]
-url=http://oms.tms.nong12.com/transportOrder/departTransportOrder.action
-
-body={"id":"666"}
-
-expect_response={"code":"200","message":"OK","result":"OK","success":true}
-
-
 # -*- coding: UTF-8 -*-
  
 [login01]
-url=http://tms.nong12.com/login/login.action
+method=post
+url=http://test.uap.diligrp.com/login/login.action
  
-header={"Host":"tms.nong12.com",
-    "Connection":"keep-alive",
-    "Content-Length":"48",
-    "Cache-Control":"max-age=0",
-    "Origin":"http://tms.nong12.com",
-    "Upgrade-Insecure-Requests":"1",
-    "Content-Type":"application/json",
-    "User-Agent":"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3493.3 Safari/537.36",
-    "Accept":"text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
-    "Referer":"http://tms.nong12.com/login/login.action",
-    "Accept-Encoding":"gzip, deflate",
-    "Accept-Language":"zh-CN,zh-TW;q=0.9,zh;q=0.8",
-    "Cookie":"u=424; n=wenze; loginPath=http://tms.nong12.com/login/login.action; TMS_userId=69; TMS_username=wenze; TMS_SessionId="}
+header={
+    "Host": "test.uap.diligrp.com",
+    "Connection": "keep-alive",
+    "Content-Length": "33",
+    "Cache-Control": "max-age=0",
+    "Upgrade-Insecure-Requests": "1",
+    "Origin": "http://test.uap.diligrp.com",
+    "Content-Type": "application/x-www-form-urlencoded",
+    "User-Agent": "Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/90.0.4430.212Safari/537.36",
+    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+    "Referer": "http://test.uap.diligrp.com/login/index.html",
+    "Accept-Encoding": "gzip,deflate",
+    "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7",
+    "Cookie": "UAP_accessToken=;UAP_refreshToken=;UAP_loginPath="}
  
-body={"userName": "wenze", "password": "666666"}
+body=userName=sg_wenze&password=111111
  
  
  
-# -*- coding: UTF-8 -*-
-
-[saveOrUpdate01]
-url=http://oms.tms.nong12.com/customerOrder/saveOrUpdate.action
-
-update_header01={"X-Requested-With": "XMLHttpRequest","Content-Type":"application/x-www-form-urlencoded; charset=UTF-8","Origin":"http://tms.nong12.com","Referer":"http://oms.tms.nong12.com/customerOrder"}
-
-update_header02={"Accept": "application/json, text/javascript, */*; q=0.01","Host":"oms.tms.nong12.com","Connection":"keep-alive"}
-	
-body={
-    "customerCellphone": "18628307268",
-    "customerCode": "CUSO201907220001",
-    "customerName": "火影",
-    "transportWay": "test",
-    "demandSources": "webChatApp",
-    "amount": "",
-    "demandDescription": "经济",
-    "shippingCustomer": "火影",
-    "shippingContactName": "火影",
-    "shippingContactNumber": "18628307268",
-    "shipping_city": "拉萨",
-    "shippingCityId": "14",
-    "shippingAddress": "刚刚",
-    "requestedShipDate": "2019-08-15",
-    "shippingDesc": "",
-    "receiptCustomer": "水星",
-    "receiptContactName": "水星",
-    "receiptContactNumber": "13111555555",
-    "receipt_city": "成都",
-    "receiptCityId": "9",
-    "receiptAddress": "哦哦哦",
-    "tradeId": "",
-    "tradeCard": "",
-    "requestedReceiptDate": "2019-08-15",
-    "receiptDesc": "",
-    "productName1": "国光苹果",
-    "categoryId1": "312",
-    "specificationCode1": "SC201905210001",
-    "total1": "10",
-    "singleWeight1": "1.0",
-    "weight1": "10",
-    "transportCondition1": "ordinary",
-    "transportDesc1": "经济",
-    "goodsList[0][categoryId]": "312",
-    "goodsList[0][specificationCode]": "SC201905210001",
-    "goodsList[0][total]": "10",
-    "goodsList[0][singleWeight]": "1.0",
-    "goodsList[0][weight]": "10",
-    "goodsList[0][transportCondition]": "ordinary",
-    "goodsList[0][transportDesc]": "经济",
-    "goodsList[0][ruleId]": "82",
-    "firmCode": "CC201905200058",
-    "settlementMethod": "arrived",
-    "expense": "1000",
-    "expenseMap[r_82]": "1000"}
-
-expect_response={"code":"200","data":951,"message":"创建客户订单成功","result":"创建客户订单成功","success":true}
-
-# -*- coding: UTF-8 -*-
-
-[RequstURL]
-URL=http://10.28.12.154:8085/submitOrder
-
-[RequstHeader]
-header = {
-	"Host": "10.28.12.154:8085",
-	"Content-Type": "application/json",
-	"referer": "https://servicewechat.com/wxd1405e5c40ff05db/0/page-frame.html",
-	"apiusertoken": "dili-fresh-token",
-	"charset": "utf-8",
-	"Accept-Encoding": "gzip",
-	"User-Agent": "Mozilla/5.0 (Linux; Android 7.0; HUAWEI NXT-AL10 Build/HUAWEINXT-AL10; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/59.0.3071.125 Mobile Safari/537.36 MicroMessenger/6.7.3.1360(0x2607033D) NetType/WIFI Language/zh_CN Process/appbrand2"
-	}
-headers=none
-headers1={"id":"你好","name": "test"}
-headers2=["id":"你好","name": "test"]
-
-
-
-[RequstStructrue]
-structrue={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001","useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019011700000052",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-
-[basic_data_prepare]
-#商品
-instert_product=INSERT INTO product.product VALUES ('301', '16', '猕猴桃', 'PD2019021000000001', '猕猴桃', 'dili-fresh/groupbuy/7f9fc034c2ec41e18b7560fc42a25abd', '2019-01-29 08:00:00', '2020-12-12 00:00:00', '2019-02-02 10:00:00', '2019-12-11 20:00:00', '600', '<p>预售商品，次日取货。</p><p>预计到店时间：2月3日14点之后。</p><p>到货后群内通知。</p><p><img style=\"max-width:100%;\" src=\"http://img10.nong12.com/dili-fresh/groupbuy/c4aa09d06af948f09269cd0d367fa623\"><br></p><p><br></p>', '2019-01-29 15:48:19', '1', '2019-02-02 10:13:33', '39', '4', '0', '400', '0');
-#商品
-instert_product_tag=INSERT INTO product.product_tag VALUES ('500', '1', '300', null, null, '2019-02-10 10:13:34', '2019-02-10 10:13:33');
-instert_tag=INSERT INTO `tag` VALUES ('1', '年货爆款', '26', '2019-01-14 11:24:48', '26', '2019-03-05 14:13:46', '27');
-instert_product_stock1=INSERT INTO product.area_stock VALUES ('500', '300', '600', '1000', '0', '1000', '1', '510100', '2019-02-02 10:13:33', '999', null, '2019-01-29 15:48:19', null, '6', '0', '3.00', '1000');
-instert_product_stock2=INSERT INTO product.area_stock VALUES ('501', '300', '600', '1000', '0', '1000', '1', '210100', '2019-02-02 16:40:49', '999', null, '2019-01-29 15:48:19', null, '78', '0', '3.00', '1000');
-instert_shop=INSERT INTO `shop` VALUES ('116', '成都SAC新店0001', 'S001953', 'W000101', '00010953', '四川省成都市青羊区天府广场', null, '510100', null, '30.663420320381004', '104.07219216758062', null, '李老板', '15111888983', null, null, '天府广场', '3', null, '1', '1', '2019-02-11 14:12:01', null, null, null);
-instert_wallet=INSERT INTO `wallet` VALUES ('11845', '00010953', '0', '0', '0', '1', '0', '2019-02-11 12:08:50', '2019-02-11 12:08:50', null, null);
-
-[data_clean]
-delete_product=DELETE FROM product.product WHERE id = 300;
-delete_product_tag=DELETE FROM product.product_tag WHERE product_tag.product_id = 300;
-delete_product_stock=DELETE FROM product.area_stock WHERE area_stock.product_id = 300;
-
-
-[submitOrder01]
-notes="下单成功：优惠券为空,其他参数传入有效值"
-delete_order=DELETE FROM `customer_coupon` WHERE code = 10000;
-requestBody={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-expect_Response={"code":"200","data":{"nonceStr":"APm6DY1wlK7cGkVbOAqe","orderCode":"O2019021400000009","pacKage":"prepay_id=1550137322575","payEnable":2,"paySign":"470D0E4BD0A2F13F8772DF29A6B7B206","signType":"MD5","timeStamp":"1550137323166"},"result":"OK","success":1}
-
-
-[submitOrder02]
-notes="下单失败：商品为空时,优惠券为空,其他参数填入有效值"
-requestBody={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": []
-	}	
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}	
-
-[submitOrder03]
-notes="下单成功：使用有效优惠券,其他参数填入有效值"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010966', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2025-01-26 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019011700000052",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"200","data":{"nonceStr":"APm6DY1wlK7cGkVbOAqe","orderCode":"O2019021400000009","pacKage":"prepay_id=1550137322575","payEnable":2,"paySign":"470D0E4BD0A2F13F8772DF29A6B7B206","signType":"MD5","timeStamp":"1550137323166"},"result":"OK","success":1}
-
-
-
-[submitOrder04]
-notes="下单失败：支付用已经使用过的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '0', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2025-01-26 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}
-
-	
-[submitOrder05]
-notes="下单失败：支付用过期的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2019-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}	
-	
-[submitOrder06]
-notes="下单失败：支付用别人的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00001008', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2019-01-17 00:00:00', '2025-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}
-
-
-[submitOrder07]
-notes="下单失败：支付用未到期的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '0', '2025-01-17 00:00:00', '2025-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}
-	
-[submitOrder08]
-notes="下单失败：支付用未满减条件的优惠券"
-coupon_check=SELECT * FROM customer.customer_coupon WHERE id = 10000;
-coupon_insert=INSERT INTO `customer_coupon` VALUES ('10000', '1', '00010953', '004', '成勇测试01', 'auto', '2', '1', '1000', '1000', '2019-01-17 00:00:00', '2025-01-18 23:59:59', '10', '2019-01-17 15:14:15', null, '1');
-coupon_delete=DELETE FROM `customer_coupon` WHERE id = 10000;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}],
-	"customerCouponId": 10000
-	}
-expect_Response={"code":"5000","result":"优惠券不可用","success":false}	
-
-[submitOrder09]
-notes="下单失败：使用被关闭的自提点"
-shop_shutdown=UPDATE `fresh-uap`.shop SET state = 4 WHERE code = 'S001953' ;
-shop_open=UPDATE `fresh-uap`.shop SET state = 3 WHERE code = 'S001953' ;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-expect_Response={"code":"5000","result":"自提点异常","success":false}
-
-
-[submitOrder10]
-notes="下单失败：客户被禁用时下单"
-customer_disable=UPDATE customer.customer SET enabled_state = 0 WHERE `code` = 00010966 ;
-customer_enable=UPDATE customer.customer SET enabled_state = 1 WHERE `code` = 00010966 ;
-requestBody={
-	"payCredential": "1548323014928",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "510100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}	
-expect_Response={"code":"5000","result":"账户被禁用","success":false}
-
-[submitOrder11]
-notes="下单失败：购买其他地区的商品"
-requestBody={
-	"payCredential": "1548316340046",
-	"customerCode": "00010966",
-	"amount": 0,
-	"source": "wechatApplet",
-	"deliveryMethod": "homeDelivery",
-	"cityId": "510100",
-	"cityName": "成都市",
-	"shopCode": "S001953",
-	"shopName": "成都SAC新店0001",
-	"useFreeAmount": 0,
-	"items": [{
-		"areaId": "110100",
-		"productId": 301,
-		"productCode": "PD2019021100000001",
-		"productName": "猕猴桃",
-		"price": 0,
-		"quantity": 1
-	}]
-	}
-expect_Response={"code":"5000","result":"商品沈阳独立商品超过购买限制,限制购买总数为0","success":false}
 \ No newline at end of file
-# -*- coding: UTF-8 -*-
-
-[undertaskOrderSubmit01]
-url=http://oms.tms.nong12.com/undertakeOrder/undertaskOrderSubmit.action
-
-update_header01={"Content-Type":"application/json;charset=UTF-8","Referer":"http://oms.tms.nong12.com/undertakeOrder/preSubmit.html"}
-
-body={"ids":["0","1097","1098"],"vt":"0017","vehicleType":"0017","vehicleTypeText":"电动车","driver":"好司机"}
-
-expect_response={"code":"200","message":"OK","result":"OK","success":true}
-
-
-
+# -*- coding: UTF-8 -*-
+
+[upStream01]
+method=post
+url=http://test.trace.diligrp.com:8393/upStream/listPage.action
+body_format=JSON
+header={
+    "Host": "test.trace.diligrp.com",
+    "Connection": "keep-alive",
+    "Content-Length": "325",
+    "Accept": "application/json,text/javascript,*/*;q=0.01",
+    "X-Requested-With": "XMLHttpRequest",
+    "User-Agent": "Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/90.0.4430.212Safari/537.36",
+    "Content-Type": "application/json",
+    "Origin": "http://test.trace.diligrp.com:8393",
+    "Referer": "http://test.trace.diligrp.com:8393/upStream/index.html",
+    "Accept-Encoding": "gzip,deflate",
+    "Accept-Language": "zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7"}
+
+body={"rows":10,"page":1,"sort":"id","order":"desc","metadata":{"created":"{\"provider\":\"datetimeProvider\",\"index\":10,\"field\":\"created\"}","upORdown":"{\"provider\":\"userFlagProvider\",\"index\":20,\"field\":\"upORdown\"}","upstreamType":"{\"provider\":\"upStreamTypeProvider\",\"index\":30,\"field\":\"upstreamType\"}"}}
+
+
+expect_response={"code":"200","data":951,"message":"创建客户订单成功","result":"创建客户订单成功","success":true}
+
-# -*- coding: UTF-8 -*-
-
-[updateTransportOrderLoaded01]
-url=http://oms.tms.nong12.com/transportOrder/updateTransportOrderLoaded.action
-
-update_header01={"Content-Type":"application/x-www-form-urlencoded;charset=UTF-8","Referer":"http://oms.tms.nong12.com/transportOrder/add.html"}
-
-
-body={
-    "id": "638",
-    "driver": "好司机",
-    "licensePlate": "车辆信息666",
-    "undertTakeOrderUpdateDtoList[0].underTakeOrderId": "1101",
-    "undertTakeOrderUpdateDtoList[0].origin": "四川省,成都市,锦江区",
-    "undertTakeOrderUpdateDtoList[0].originId": "510104",
-    "undertTakeOrderUpdateDtoList[0].certificateUrl": "",
-    "undertTakeOrderUpdateDtoList[0].brand": "",
-    "undertTakeOrderUpdateDtoList[1].underTakeOrderId": "1102",
-    "undertTakeOrderUpdateDtoList[1].origin": "四川省,成都市,锦江区",
-    "undertTakeOrderUpdateDtoList[1].originId": "510104",
-    "undertTakeOrderUpdateDtoList[1].certificateUrl": "",
-    "undertTakeOrderUpdateDtoList[1].brand": "",
-    "feeMap[zhuanxiefei]": "0",
-    "feeMap[dakuang]": "0",
-    "loader": "装货王菲",
-    "loadingPlaceId": "31",
-    "attachments": "group1/M00/00/57/ChwMf13c4ZaAJwgDAACC74HdADg141.jpg"}
-
-expect_response={"code":"200","message":"OK","result":"OK","success":true}
-
-
-[2021-05-14 15:46:30] [INFO] : 发送的邮件地址[]:
-[2021-05-14 15:46:30] [INFO] : 运行的用例优先级[]:
-[2021-05-14 15:46:30] [INFO] : 运行的用例标记False:
-[2021-05-14 15:46:30] [INFO] : 测试用例加载结果<unittest.suite.TestSuite tests=[<test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_1_skipclass>, <test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_2_skipclass>, <test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_3_skipclass>, <test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_4_skipclass>, <test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_5_skipclass>, <test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_6_skipclass>, <test_skip_demo.test_skipclass.test_skipclass_demo1 testMethod=test_7_skipclass>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_1_systemskip>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_2_systemskip>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_3_systemskip>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_4_systemskip>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_5_systemskip>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_6_systemskip>, <test_skip_demo.test_Systemskip.test_systemskip_demo1 testMethod=test_7_systemskip>, <test_skip_demo.test_Userskip.test_Userskip_demo1 testMethod=test_1_userskip>, <test_skip_demo.test_Userskip.test_Userskip_demo1 testMethod=test_2_userskip>, <test_skip_demo.test_Userskip.test_Userskip_demo1 testMethod=test_3_userskip>, <test_skip_demo.test_Userskip.test_Userskip_demo1 testMethod=test_4_userskip>, <test_skip_demo.test_Userskip.test_Userskip_demo1 testMethod=test_5_userskip>, <test_skip_demo.test_Userskip.test_Userskip_demo1 testMethod=test_6>]>
-[2021-05-14 15:46:30] [INFO] : 测试报告路径E:\EclipseWorkspace\WorksapceDemo\Request-demo\src/report/2021-05-14 15_46_30_result.html:
-[2021-05-14 15:46:30] [INFO] : ********运行测试用例********
-[2021-05-14 15:46:30] [INFO] : 发送邮件
-[2021-05-14 15:46:35] [INFO] : 邮件发送完毕
-2021-05-14 15:46:30] [INFO] : 发送邮件
-[2021-05-14 15:46:35] [INFO] : 邮件发送完毕
+[2021-05-28 18:09:36] [INFO] : =============================请求接口为test_01_upStream==============================
+[2021-05-28 18:09:36] [INFO] : 请求地址为http://test.trace.diligrp.com:8393/upStream/listPage.action; 请求方式为post; 请求body格式为JSON;
+ 请求body为None{'rows': 10, 'page': 1, 'sort': 'id', 'order': 'desc', 'metadata': {'created': '{"provider":"datetimeProvider","index":10,"field":"created"}', 'upORdown': '{"provider":"userFlagProvider","index":20,"field":"upORdown"}', 'upstreamType': '{"provider":"upStreamTypeProvider","index":30,"field":"upstreamType"}'}};
+[2021-05-28 18:09:42] [INFO] : 响应body为{'rows': [{'upORdown': '上游', '$_upORdown': 10, 'created': '2021-05-26 15:04:27', 'businessLicenseUrl': '3b4af72d6872418a8898b1788bf3477f', '$_upstreamType': 20, 'marketId': 8, 'license': '666666', 'legalPerson': '法人代表', 'telphone': '13111111111', 'name': '一号测试上游企业', 'modified': 1622012667000, 'userNames': '测试一号', 'id': 340, 'sourceUserId': 516, 'upstreamType': '企业'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-05-24 17:35:48', 'idCard': '513001199105081258', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '18380475463', 'cardNoFrontUrl': '', 'name': '杨我', 'modified': 1621848948000, 'userNames': '地利人和', 'id': 339, 'sourceUserId': 131138, 'upstreamType': '个人'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-05-20 14:19:19', 'idCard': '513001199802081012', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '18380475463', 'cardNoFrontUrl': '', 'name': '爱情保卫战', 'modified': 1621491559000, 'userNames': '成都广场', 'id': 338, 'sourceUserId': 131155, 'upstreamType': '个人'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-05-18 10:39:22', 'idCard': '513001199802081258', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '18680475463', 'cardNoFrontUrl': '', 'name': '刘策', 'modified': 1621305562000, 'userNames': '啊撒米', 'id': 337, 'sourceUserId': 131135, 'upstreamType': '个人'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-05-10 09:42:51', 'idCard': '', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '13540782311', 'cardNoFrontUrl': '', 'name': '111', 'modified': 1620610971000, 'userNames': '雪额外大', 'id': 333, 'sourceUserId': 616, 'upstreamType': '个人'}, {'upORdown': '下游', '$_upORdown': 20, 'created': '2021-04-29 11:07:19', 'businessLicenseUrl': '', '$_upstreamType': 20, 'marketId': 8, 'operationLicenseUrl': '', 'license': '', 'legalPerson': '', 'telphone': '', 'name': '投入', 'modified': 1619665639000, 'userNames': '杨旭旭旭', 'id': 326, 'sourceUserId': 130500, 'manufacturingLicenseUrl': '', 'upstreamType': '企业'}, {'upORdown': '下游', '$_upORdown': 20, 'created': '2021-04-29 11:05:04', 'idCard': '513001199802081011', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '18380475463', 'cardNoFrontUrl': '', 'name': '12', 'modified': 1619665504000, 'userNames': '杰伦的', 'id': 325, 'sourceUserId': 515, 'upstreamType': '个人'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-04-29 10:38:20', 'businessLicenseUrl': '570da30d70f847edbceec3170c5bd065', '$_upstreamType': 20, 'marketId': 8, 'license': '111111', 'legalPerson': '法人', 'telphone': '13111111111', 'name': '企业名称', 'modified': 1619663900000, 'userNames': '多少啊', 'id': 324, 'sourceUserId': 606, 'upstreamType': '企业'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-04-26 15:12:36', 'idCard': '513001199608081580', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '18580454632', 'cardNoFrontUrl': '', 'name': '15', 'modified': 1619421156000, 'userNames': '杨旭旭旭', 'id': 320, 'sourceUserId': 130500, 'upstreamType': '个人'}, {'upORdown': '上游', '$_upORdown': 10, 'created': '2021-04-26 15:12:16', 'idCard': '513001199608081580', '$_upstreamType': 10, 'marketId': 8, 'cardNoBackUrl': '', 'telphone': '18380475460', 'cardNoFrontUrl': '', 'name': '两休息', 'modified': 1619421136000, 'userNames': '杨旭旭旭', 'id': 319, 'sourceUserId': 130500, 'upstreamType': '个人'}], 'total': 203};
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+import json
+import urllib3
+from commons import ConfigDB as db
+from commons import common as com
+from commons.MyRequest import myrequest 
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+my=myrequest()
+
+#列表查询
+class test_upStream(unittest.TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        #新增登记单
+        cls.se=my.getSession(True)
+    #由于可能有多种情况所以使用传统的setup
+    def setUp(self):
+#         #新增登记单
+#         my.registerBill_insert(True)
+        pass
+    @unittest.case_config(com.mark())
+    def test_01_upStream(self):
+        #查询上下游企业
+        re=my.post2("test_01_upStream")
+        print(re.json())
+
+    def test_02_upStream(self):
+        #新增理货区进场登记单,获取新增前最新的登记单id
+#         code=db.mysql_selectOne('SELECT code FROM `register_bill` WHERE id="{}";'.format(my.temp[0]))[0]
+#         #获取接口参数
+#         url=com.get_module_config('registerBill', 'listPage', 'listPage01', 'url')
+#         header=json.loads(com.get_module_config('registerBill', 'listPage', 'listPage01', 'header'))
+#         body=com.get_module_config('registerBill', 'listPage', 'listPage01', 'body')
+#         body=body.replace("d2020082700076",code)
+#         expect_response=json.loads(com.get_module_config('registerBill', 'listPage', 'listPage01', 'expect_response'))
+#         #进行接口请求,两种方式之一data
+#         r=my.post(url,data=(body.encode().decode('unicode-escape')),headers=header)
+#         print(r.json())
+#         #进行接口断言
+#         self.assertEqual(r.json()["rows"][0]["code"], code," request failed")
+#         self.assertEqual(com.compare_json(r.json(),expect_response),None,"json compare failed")
+        pass
+    
+    def tearDown(self):
+
+        print("tearDown")
+        
+    @classmethod
+    def tearDownClass(cls):
+        cls.se.close()
+
+if __name__ == "__main__":
+#unittest.main()方法会搜索该模块文件下所有以test开头的测试用例方法，并自动执行它们。
+#如果不加下面这个语句，那么在通过unittest的方法添加测试用例时，这个文件里面的用例不会被搜索到。
+
+    unittest.main(verbosity=2)
+
+# #    以下代码可以调试单个测试用例,用例中打印的语句不会展示到控制台,使用前需要注释上面的代码unittest.main(),如果不使用下面代码，
+# #    在有unittest.main()的情况下点击ctrl+f11,会直接运行当前页面所有用例，并且把用例用有打印的语句显示到控制台
+#     current_suite = unittest.TestSuite()
+#     current_suite.addTest(submitOrder("test_01"))
+#     #以列表形式添加多个测试用例
+# #     current_suite.addTests([submitOrder_With_Coupon("test_01"),submitOrder_With_Coupon("test_02")])
+#     # 执行测试
+#     runner = unittest.TextTestRunner()
+#     #runner.run(可以直接添加测试用例如submitOrder_With_Coupon("test_01"))
+#     runner.run(current_suite)
 \ No newline at end of file