Merge remote-tracking branch 'origin/master'

lixi
2 parents 14abc8aa d7d91a04
Showing 3 changed files with 157 additions and 2 deletions
commons/api/hg/transaction/l_createAndTrade.py
testcase/hg/tradingOrder/test_createAndTrade.py
testcase/hg/tradingOrder/test_l_createAndTrade.py
+# -*- coding: utf-8 -*-
+"""
+@Time ： 2021/9/9 18:24
+@Auth ： wlm
+@File ：l_createAndTrade.py
+@IDE ：PyCharm
+"""
+"""
+普通客户模式——新增交易单
+"""
+
+from commons import common as com
+from commons.MySession import hg
+class l_createAndTrade():
+
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/tradingOrder/createAndTrade"
+        self.header = {
+                "UAP_accessToken":"demo",
+                "UAP_refreshToken":"demo",
+                "Content-Type":"application/json;charset=utf-8",
+                "Host":"test.gateway.diligrp.com:8285"
+        }
+        self.body = {
+    "sellerId":141969,
+    "sellerName":"严安彬卖",
+    "sellerAccountId":107677,
+    "sellerCardNo":"888810061102",
+    "buyerId":141968,
+    "buyerName":"袁豪正买",
+    "buyerAccountId":107676,
+    "buyerCardNo":"888810061104",
+    "posCode":"333444",
+    "tradePassword":"111111",
+    "orderItemList":[
+        {
+            "number":0,
+            "batchCode":"2109000223",
+            "productId":167,
+            "productCode":"754107",
+            "productName":"葡萄",
+            "categoryId":754107,
+            "weightType":1,
+            "quantity":10,
+            "pieceWeight":10,
+            "grossWeight":0,
+            "tareWeight":0,
+            "weight":100,
+            "price":1000,
+            "PriceStr":"10",
+            "amount":10000,
+            "amountStr":100,
+            "originId":40000000,
+            "originName":"阿尔及利亚",
+            "feeItemList":[
+                {
+                    "type":1,
+                    "chargeItemId":521,
+                    "chargeItemName":"买家手续费",
+                    "amount":1122
+                },
+                {
+                    "type":2,
+                    "chargeItemId":522,
+                    "chargeItemName":"卖家手续费",
+                    "amount":610
+                },
+                {
+                    "type":2,
+                    "chargeItemId":527,
+                    "chargeItemName":"卖家仓储服务费",
+                    "amount":522
+                }
+            ]
+        }
+    ]
+}
+
+
+lcat = l_createAndTrade()
+print(lcat.body)
+re = hg.post(url = lcat.url,json = lcat.body,headers = lcat.header,proxies=hg.myproxies)
+print(re.json())
+print(re.headers)
 \ No newline at end of file
@@ -55,7 +55,7 @@ ORDER BY
         body2["categoryId"] = 44
         body2["categoryCode"] = 754107
         body2["categoryName"] = "葡萄"
-        re = hg.post(url = r.url, headers = r.header, json = body2,proxies = hg.proxies)
+        re = hg.post(url = r.url, headers = r.header, json = body2)
         "获取批号"
         print("获取批号结果：",re.json())
         cls.batch = re.json()["data"]["batchCode"]
@@ -67,7 +67,7 @@ ORDER BY
         body = creat.body.copy()
         body["orderItemList"][0]["batchCode"] = self.batch
         print("创建订单body",body)
-        re1 = hg.post(url = creat.url, headers = creat.header, json = body,proxies = hg.proxies)
+        re1 = hg.post(url = creat.url, headers = creat.header, json = body)
         print(re1.json())
         self.assertEqual(re1.status_code, 200)
         self.assertTrue("'操作成功'" in str(re1.json()).replace(" ", ""))
+import unittest
+import urllib3
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+from commons.MySession import hg,my
+from commons import ConfigDB as db
+from commons.api.hg.transaction.l_createAndTrade import l_createAndTrade
+from commons.basic.registerRecord_save import registerRecord_save
+lcat = l_createAndTrade()
+r = registerRecord_save()
+
+"""
+创建普通客户订单
+"""
+
+class test_l_createAndTrade(unittest.TestCase):
+    "创建普通客户订单"
+    @classmethod
+    def setUpClass(cls):
+        # 新增一个进门批号单
+        cls.aaa = db.mysql_selectOne('''
+                        SELECT
+	aua.account_id AS "账号id",
+	auc.card_no AS "园区卡号",
+	aua.customer_id AS "客户id",
+	aua.customer_code AS "客户code",
+	aua.customer_name AS "客户姓名",
+	aua.customer_certificate_number AS "客户身份证号码",
+	aua.hold_contacts_phone AS "持卡人电话"
+FROM
+	( `dili_account`.`account_user_account` AS aua LEFT JOIN `dili_account`.`account_user_card` AS auc ON aua.account_id = auc.account_id )
+	LEFT JOIN `dili-customer`.`special_permissions` AS sp ON aua.customer_id = sp.customer_id 
+WHERE
+	sp.customer_id = 141962 AND sp.market_id =15
+ORDER BY
+	aua.account_id DESC 
+	LIMIT 1
+	''')
+        body2 = r.body1.copy()
+        body2["accountId"] = str(cls.aaa[0])
+        body2["cardNo"] = str(cls.aaa[1])
+        body2["customerId"] = str(cls.aaa[2])
+        body2["customerCode"] = str(cls.aaa[3])
+        body2["customerName"] = str(cls.aaa[4])
+        body2["identityCardNo"] = str(cls.aaa[5])
+        body2["mobilephoneNumber"] = str(cls.aaa[6])
+        body2["categoryId"] = 44
+        body2["categoryCode"] = 754107
+        body2["categoryName"] = "葡萄"
+        re = hg.post(url = r.url, headers = r.header, json = body2)
+        "获取批号"
+        print("获取批号结果：",re.json())
+        cls.batch = re.json()["data"]["batchCode"]
+        return cls.batch
+
+    @unittest.case_mark(my.mark())
+    def test_l_createAndTrade_01(self):
+        "普通客户创建订单"
+        body = lcat.body.copy()
+        body["orderItemList"][0]["batchCode"] = self.batch
+        print("创建订单body",body)
+        re1 = hg.post(url = lcat.url, headers = lcat.header, json = body)
+        print(re1.json())
+        self.assertEqual(re1.status_code, 200)
+        self.assertTrue("'操作成功'" in str(re1.json()).replace(" ", ""))
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()