Merge remote-tracking branch 'origin/master'

wenleiming
2 parents d6b9ccb2 042ff4c5
Showing 3 changed files with 81 additions and 26 deletions
commons/api/hg/loan_generalCustomer/generalCustomerLoan_enforce.py
commons/api/hg/loan_generalCustomer/generalCustomerLoan_list.py
testcase/hg/loan_generalCustomer/test_generalCustomerLoan.py
+# -*- coding: utf-8 -*-
+"""
+@Time ： 2021/8/31 14:43
+@Auth ： wlm
+@File ：createAndTrade.py
+@IDE ：PyCharm
+"""
+"""
+普通客户模式——执行借款
+"""
+from commons import common as com
+from commons.MySession import hg
+
+class generalCustomerLoan_enforce():
+
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/generalCustomerLoan/enforce/66?_t="+str(com.time_stamp())
+        self.header = {
+                    "Connection" :"keep-alive",
+                    "Accept" :"application/json, text/plain, */*",
+                    "UAP_accessToken" :".-.---",
+                    "UAP_refreshToken" :".-.---",
+                    "Accept-Language" :"zh-CN,zh;q=0.9",
+                    "Accept-Encoding" :"gzip, deflate"
+                    }
+        self.sql='SELECT id FROM  customer_loan WHERE batch="2109000088";'
+
+
+
+# tt = generalCustomerLoan_enforce()
+# re = hg.get(url = tt.url,headers = tt.header,proxies=hg.myproxies)
+# print(re.json())
+
@@ -31,8 +31,8 @@ class generalCustomerLoan_list():
                     "enforcerState": "1",
                     "customerId": 141995,
                     "batch": "2109000098",
-                    "settleDateStart": "2021-09-08",
-                    "settleDateEnd": "2021-09-08"
+                    "settleDateStart": "2020-09-08",
+                    "settleDateEnd": "2025-09-08"
                 }
 # tt = generalCustomerLoan_list()
@@ -7,11 +7,13 @@ from commons.MySession import my,hg
 from commons.api.hg.loan_generalCustomer.generalCustomerLoan_save import generalCustomerLoan_save
 from commons.api.hg.loan_generalCustomer.generalCustomerLoan_delete import generalCustomerLoan_delete
 from commons.api.hg.loan_generalCustomer.generalCustomerLoan_list import generalCustomerLoan_list
+from commons.api.hg.loan_generalCustomer.generalCustomerLoan_enforce import generalCustomerLoan_enforce
 from commons.basic.registerRecord_save import registerRecord_save
 from commons.basic.createAndTrade import createAndTrade
 g=generalCustomerLoan_save()
 l=generalCustomerLoan_list()
 d=generalCustomerLoan_delete()
+e=generalCustomerLoan_enforce()
 r=registerRecord_save()
 c=createAndTrade()
@@ -21,27 +23,33 @@ class test_generalCustomerLoan(unittest.TestCase):
     @classmethod
     def setUpClass(cls) :
-        #新增一个进门批号单
-        re=hg.post(url=r.url,headers=r.header,json=r.body1)
-        #获取批号
-        cls.batch=re.json()["data"]["batchCode"]
-        #普通客户使用进门批号生成交易单
-        body=c.body1.copy()
-        body["orderItemList"][0]["batchCode"]=cls.batch
-        re1=hg.post(url=c.url,headers=c.header,json=body)
+        #存储进门的批次号
+        cls.batch=[]
+        #生成两单进门批号
+        for i in range(2):
+            #新增一个进门批号单
+            re=hg.post(url=r.url,headers=r.header,json=r.body1)
+            #获取批号
+            cls.batch.append(re.json()["data"]["batchCode"])
+            #普通客户使用进门批号生成交易单
+            body=c.body1.copy()
+            body["orderItemList"][0]["batchCode"]=cls.batch
+            re1=hg.post(url=c.url,headers=c.header,json=body)
     @unittest.case_mark(my.mark())
     def test_generalCustomerLoan_01_save(self):
         "普通借款-新增预支款：根据批次号新增预支款"
-        #替换批次号
-        body=g.body.copy()
-        body["batch"]=self.batch
-        #请求
-        re=hg.post(url=g.url,headers=g.header,json=body)
-        print(re.json(),"普通预付款批次号",self.batch)
-        self.assertEqual(re.status_code, 200)
-        self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
+        #生成两个普通借款单
+        for i in range(2):
+            #替换批次号
+            body=g.body.copy()
+            body["batch"]=self.batch[i]
+            #请求
+            re=hg.post(url=g.url,headers=g.header,json=body)
+            print(re.json(),"普通借款批次号",self.batch[i])
+            self.assertEqual(re.status_code, 200)
+            self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
     @unittest.skipDepend(depend="test_generalCustomerLoan_01_save")
@@ -50,16 +58,16 @@ class test_generalCustomerLoan(unittest.TestCase):
         "普通借款-列表查询：执行状态，客户，批号和结算日期都输入合法值，查询指定借款数据"
         #修改查询的值
         body=l.body.copy()
-        body["batch"] = self.batch
-        body["settleDateStart"]=com.dates()
-        body["settleDateEnd"] = com.dates()
+        body["batch"] = self.batch[0]
+        # body["settleDateStart"]=com.dates()
+        # body["settleDateEnd"] = com.dates()
         #请求
         re=hg.post(url=l.url,headers=l.header,json=body)
         print(re.json())
         #断言
         self.assertEqual(re.status_code, 200)
         self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
-        self.assertTrue(self.batch in str(re.json()).replace(" ",""))
+        self.assertTrue(self.batch[0] in str(re.json()).replace(" ",""))
     @unittest.skipDepend(depend="test_generalCustomerLoan_01_save")
@@ -67,21 +75,35 @@ class test_generalCustomerLoan(unittest.TestCase):
     def test_generalCustomerLoan_03_delete(self):
         "普通借款-撤销：撤销一个未执行的借款单"
         #查询批次号对应id
-        batch_id=db.mysql_selectOne(d.sql.replace("2109000088",self.batch))[0]
+        batch_id=db.mysql_selectOne(d.sql.replace("2109000088",self.batch[0]))[0]
         #替换url的批次id
         url=d.url.replace("66",str(batch_id))
         #请求
         re=hg.get(url=url,headers=d.header)
-        print(re.json(),"普通预付款批次号id",batch_id)
+        print(re.json(),"删除的普通借款批次号号和id",self.batch[0],batch_id)
         #断言
         self.assertEqual(re.status_code, 200)
         self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
+    @unittest.skipDepend(depend="test_generalCustomerLoan_01_save")
+    @unittest.case_mark(my.mark())
+    def test_generalCustomerLoan_04_enforce(self):
+        "普通借款-执行：执行一个未执行的借款单"
+        #查询批次号对应id
+        batch_id=db.mysql_selectOne(d.sql.replace("2109000088",self.batch[1]))[0]
+        #替换url的批次id
+        url=e.url.replace("66",str(batch_id))
+        #请求
+        re=hg.get(url=url,headers=e.header)
+        print(re.json(),"执行的普通借款批次号号和id",self.batch[1],batch_id)
+        #断言
+        self.assertEqual(re.status_code, 200)
+        self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
 if __name__ == "__main__":
-    # unittest.main(verbosity=2)
-    com.run_one(test_generalCustomerLoan("test_generalCustomerLoan_01_save"))
+    unittest.main(verbosity=2)
+    # com.run_one(test_generalCustomerLoan("test_generalCustomerLoan_01_save"))