更新文件

lixi
1 parent 7f4d4cfe
Showing 12 changed files with 395 additions and 11 deletions
commons/api/hg/BackCollection/__init__.py
commons/api/hg/BackCollection/customer_getByKeyword.py
commons/api/hg/BackCollection/tradingOrder_create.py
commons/api/hg/BackCollection/tradingOrder_getUnPaidByCode.py
commons/api/hg/BackCollection/tradingOrder_loadPrintData.py
commons/api/hg/BackCollection/tradingOrder_pay.py
commons/basic/createAndTrade.py
commons/basic/registerRecord_save.py
testcase/hg/BackCollection/__init__.py
testcase/hg/BackCollection/test_BackCollection.py
testcase/hg/BackCollection/test_customer_getByKeyword.py
testcase/hg/loan_generalCustomer/test_generalCustomerLoan.py
+# -*- coding: utf-8 -*-
+
+
+from commons.MySession import hg
+
+class customer_getByKeyword():
+    "后台收款-收款时选择指定客户"
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/customer-service/api/customer/getByKeyword?customerKeywords=拜登&characterType=buyer_character_type"
+        self.header = {
+                    "UAP_accessToken" :".-.--",
+                    "UAP_refreshToken" :".-.--",
+                    "UAP_firmId" :"15",
+                    "Content-Type": "application/json;charset=UTF-8"
+                     }
+
+
+
+# tt = customer_getByKeyword()
+# re = hg.post(url = tt.url,headers = tt.header,proxies=hg.myproxies)
+# print(re.json())
+# -*- coding: utf-8 -*-
+
+from commons.MySession import hg
+
+class tradingOrder_create():
+    "后台收款-创建交款单"
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/tradingOrder/create"
+        self.header = {
+                    "UAP_accessToken" :".-.--",
+                    "UAP_refreshToken" :".-.--",
+                    "Content-Type" :"application/json;charset=UTF-8"
+                     }
+        self.body = {
+                    "sellerId": 141995,
+                    "sellerName": "拜登",
+                    "sellerAccountId": 107791,
+                    "sellerCardNo": "888810043394",
+                    "buyerId": 0,
+                    "buyerName": None,
+                    "buyerAccountId": 0,
+                    "buyerCardNo": None,
+                    "posCode": "666",
+                    "tradePassword": None,
+                    "orderItemList": [{
+                        "number": 1,
+                        "batchCode": "2109000200",
+                        "productId": 125,
+                        "productCode": "374690",
+                        "productName": "苹果",
+                        "categoryId": 374690,
+                        "weightType": 1,
+                        "quantity": 1,
+                        "pieceWeight": 1,
+                        "grossWeight": 0,
+                        "tareWeight": 0,
+                        "weight": 1,
+                        "price": 100,
+                        "PriceStr": "1",
+                        "amount": 100,
+                        "amountStr": 1.0,
+                        "originId": 510100,
+                        "originName": "成都市",
+                        "feeItemList": [{
+                            "type": 1,
+                            "chargeItemId": 521,
+                            "chargeItemName": "买家手续费",
+                            "amount": 550.0
+                        }, {
+                            "type": 2,
+                            "chargeItemId": 522,
+                            "chargeItemName": "卖家手续费",
+                            "amount": 989.00
+                        }, {
+                            "type": 2,
+                            "chargeItemId": 527,
+                            "chargeItemName": "卖家仓储服务费",
+                            "amount": 367.00
+                        }]
+                    }]
+                }
+
+        #返回交款单的单号
+        self.sql="SELECT `code` FROM `trading_order_item` WHERE trading_order_id=373;"
+
+# tt = tradingOrder_create()
+# re = hg.post(url = tt.url,json = tt.body,headers = tt.header,proxies=hg.myproxies)
+# print(re.json())
+# -*- coding: utf-8 -*-
+
+
+from commons.MySession import hg
+
+class tradingOrder_getUnPaidByCode():
+    "后台收款-查询交款单"
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/tradingOrder/getUnPaidByCode/2109141500003"
+        self.header = {
+                    "UAP_accessToken" :".-.--",
+                    "UAP_refreshToken" :".-.--",
+                    "UAP_firmId" :"15"
+                     }
+
+
+
+# tt = tradingOrder_getUnPaidByCode()
+# re = hg.get(url = tt.url,headers = tt.header,proxies=hg.myproxies)
+# print(re.json())
+# -*- coding: utf-8 -*-
+
+from commons.MySession import hg
+
+class tradingOrder_loadPrintData():
+    "后台收款-交款单支付"
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/tradingOrder/loadPrintData?id=398&type=3&reprint=False"
+        self.header = {
+                    "UAP_accessToken" :".-.--"  ,
+                    "UAP_refreshToken" :".-.--",
+                    "UAP_firmId" :"15"
+                     }
+
+        #返回交款单的单号
+        self.sql="SELECT `code` FROM `trading_order_item` WHERE trading_order_id=373;"
+
+# tt = tradingOrder_loadPrintData()
+# re = hg.get(url = tt.url,headers = tt.header,proxies=hg.myproxies)
+# print(re.json())
+# -*- coding: utf-8 -*-
+
+from commons.MySession import hg
+
+class tradingOrder_pay():
+    "后台收款-交款单支付"
+    def __init__(self):
+        self.url = "http://test.gateway.diligrp.com:8285/hg-trading/api/tradingOrder/pay"
+        self.header = {
+                    "UAP_accessToken" :".-.--"  ,
+                    "UAP_refreshToken" :".-.--",
+                    "UAP_firmId" :"15",
+                    "Content-Type":"application/json;charset=UTF-8"
+                     }
+        # 现金支付
+        self.body = {
+                    "id": 393,
+                    "buyerId": 141995,
+                    "buyerName": "拜登",
+                    "channelDetailList": [{
+                        "collectionType": "现金",
+                        "tradeChannel": 2,
+                        "amountY": 6.5,
+                        "amount": 650.0,
+                        "remark": None
+                    }]
+                }
+        #非现金的组合支付
+        self.body1={
+                "id": 419,
+                "buyerId": 141995,
+                "buyerName": "拜登",
+                "channelDetailList": [{
+                    "collectionType": "支票",
+                    "tradeChannel": 40,
+                    "amountY": 3.0,
+                    "amount": 300.0,
+                    "remark": "12345678"
+                }, {
+                    "collectionType": "POS",
+                    "tradeChannel": 3,
+                    "amountY": 2.5,
+                    "amount": 250.0,
+                    "remark": "888810043394"
+                }, {
+                    "collectionType": "优惠",
+                    "tradeChannel": 0,
+                    "amountY": 1.0,
+                    "amount": 100.0,
+                    "remark": "杭果借款"
+                }]
+            }
+        #包含现金的组合支付
+        self.body2={
+                    "id": 417,
+                    "buyerId": 141995,
+                    "buyerName": "拜登",
+                    "channelDetailList": [{
+                        "collectionType": "现金",
+                        "tradeChannel": 2,
+                        "amountY": 1.0,
+                        "amount": 100.0,
+                        "remark": None
+                    }, {
+                        "collectionType": "支票",
+                        "tradeChannel": 40,
+                        "amountY": 2.0,
+                        "amount": 200.0,
+                        "remark": "12345678"
+                    }, {
+                        "collectionType": "POS",
+                        "tradeChannel": 3,
+                        "amountY": 3.0,
+                        "amount": 300.0,
+                        "remark": "888810043394"
+                    }, {
+                        "collectionType": "优惠",
+                        "tradeChannel": 0,
+                        "amountY": 0.5,
+                        "amount": 50.0,
+                        "remark": "杭果借款"
+                    }]
+                    }
+
+        #返回交款单的单号
+        self.sql="SELECT `code` FROM `trading_order_item` WHERE trading_order_id=373;"
+
+# tt = tradingOrder_pay()
+# re = hg.post(url = tt.url,json = tt.body,headers = tt.header,proxies=hg.myproxies)
+# print(re.json())
@@ -8,7 +8,7 @@
 """
 大客户模式——新增交易单
 """
-
+from commons.basic.registerRecord_save import registerRecord_save
 from commons.MySession import hg
  
 class createAndTrade():
@@ -23,8 +23,19 @@ class createAndTrade():
         self.body = {"sellerId":141992,"sellerName":"特朗普vip","sellerAccountId":107792,"sellerCardNo":"888810026785","buyerId":141995,"buyerName":"拜登","buyerAccountId":107791,"buyerCardNo":"888810043394","posCode":"666","tradePassword":"111111","orderItemList":[{"number":0,"batchCode":"2109000067","productId":125,"productCode":"374690","productName":"苹果","categoryId":374690,"weightType":1,"quantity":1,"pieceWeight":1,"grossWeight":0,"tareWeight":0,"weight":1,"price":2000,"PriceStr":"20","amount":2000,"amountStr":20.0,"originId":510100,"originName":"成都市","feeItemList":[{"type":1,"chargeItemId":521,"chargeItemName":"买家手续费","amount":550.0},{"type":2,"chargeItemId":522,"chargeItemName":"卖家手续费","amount":989.00}]}]}
         #普通客户body
         self.body1={"sellerId":141995,"sellerName":"拜登","sellerAccountId":107791,"sellerCardNo":"888810043394","buyerId":141992,"buyerName":"特朗普vip","buyerAccountId":107792,"buyerCardNo":"888810026785","posCode":"666","tradePassword":"111111","orderItemList":[{"number":0,"batchCode":"2109000073","productId":125,"productCode":"374690","productName":"苹果","categoryId":374690,"weightType":1,"quantity":1,"pieceWeight":1,"grossWeight":0,"tareWeight":0,"weight":1,"price":2000,"PriceStr":"20","amount":2000,"amountStr":20.0,"originId":510100,"originName":"成都市","feeItemList":[{"type":1,"chargeItemId":521,"chargeItemName":"买家手续费","amount":550.0},{"type":2,"chargeItemId":522,"chargeItemName":"卖家手续费","amount":989.00}]}]}
+        #大客户-有装卸费和其他费,pos机号已经改变
+        self.body2= {"sellerId":141992,"sellerName":"特朗普vip","sellerAccountId":107792,"sellerCardNo":"888810026785","buyerId":141995,"buyerName":"拜登","buyerAccountId":107791,"buyerCardNo":"888810043394","posCode":"111666","tradePassword":"111111","orderItemList":[{"number":0,"batchCode":"2109000522","productId":632,"productCode":"374690","productName":"苹果","categoryId":374690,"weightType":1,"quantity":50,"pieceWeight":1,"grossWeight":0,"tareWeight":0,"weight":50,"price":100,"PriceStr":"1","amount":5000,"amountStr":50.0,"originId":100000000,"originName":"安提瓜和巴布达","feeItemList":[{"type":1,"chargeItemId":521,"chargeItemName":"买家手续费","amount":1122.00},{"type":2,"chargeItemId":522,"chargeItemName":"卖家手续费","amount":356.00},{"type":2,"chargeItemId":527,"chargeItemName":"卖家仓储服务费","amount":522.00}]}]}
  
  
+# dd=registerRecord_save()
 # tt = createAndTrade()
-# re = hg.post(url = tt.url,json = tt.body,headers = tt.header,proxies=hg.myproxies)
-# print(re.json())
 \ No newline at end of file
+#
+# #进门
+# re1 = hg.post(url = dd.url,json = dd.body2,headers = dd.header,proxies=hg.myproxies)
+# print(re1.json())
+#
+# #创建交易单
+# tt.body2["orderItemList"][0]["batchCode"]=re1.json()["data"]["batchCode"]
+# re2 = hg.post(url = tt.url,json = tt.body2,headers = tt.header,proxies=hg.myproxies)
+# print(re2.json())
+
@@ -33,7 +33,7 @@ class registerRecord_save():
                         "id": 0,
                         "areaId": 274,
                         "areaName": "东区01",
-                        "quantity": 10,
+                        "quantity": 100,
                         "productId": 374690,
                         "registerRecordId": 0,
                         "remark": None,
@@ -104,9 +104,9 @@ class registerRecord_save():
                     "registerFeeDtoList": [],
                     "tradePassword": ""
                 }
-
-
+        #大客户有装卸10元和其他费2元
+        self.body2={"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":1000,"productId":374690,"registerRecordId":0,"remark":None,"weight":1000,"weightType":0,"created":None,"createdById":0,"createdByName":None,"createdByDepartmentId":0,"createdByDepartmentName":None,"registerCertificateList":None,"product":None,"registerCertificateDtoList":None,"productDto":{"id":0,"originId":100000000,"originName":"安提瓜和巴布达","pieceWeight":1,"categoryId":374690,"categoryCode":"374690","categoryName":"苹果","created":None}}],"registerFeeDtoList":[{"id":0,"actualFee":200.0,"receivableFee":1300.0,"discountFee":1100.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"其他收费","chargeType":1,"chargeItemId":518,"registerFeeType":999,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":None},{"id":0,"actualFee":1000.0,"receivableFee":1000.0,"discountFee":0.0,"registerRecordId":0,"payStatus":0,"chargeItemName":"装卸费","chargeType":0,"chargeItemId":531,"registerFeeType":1,"created":None,"createdById":0,"createdByName":None,"settleDate":None,"isBehalf":1,"registerLoadingFeeExtDto":{"loadingTeamId":54,"loadingTeam":"大江","loadingFee":850.0,"behalfLoadingFee":150.0}}],"tradePassword":""}
  
 # tt=registerRecord_save()
-# re=hg.post(url=tt.url,headers=tt.header,json=tt.body1,proxies=hg.myproxies)
+# re=hg.post(url=tt.url,headers=tt.header,json=tt.body2,proxies=hg.myproxies)
 # print(str(re.json()))
 \ No newline at end of file
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+from  commons import common as com
+from commons import ConfigDB as db
+from commons.MySession import my,hg
+from commons.api.hg.BackCollection.tradingOrder_create import tradingOrder_create
+from commons.api.hg.BackCollection.tradingOrder_getUnPaidByCode import tradingOrder_getUnPaidByCode
+from commons.api.hg.BackCollection.tradingOrder_pay import tradingOrder_pay
+from commons.api.hg.BackCollection.tradingOrder_loadPrintData import tradingOrder_loadPrintData
+from commons.basic.registerRecord_save import registerRecord_save
+tc=tradingOrder_create()
+tg=tradingOrder_getUnPaidByCode()
+tp=tradingOrder_pay()
+tl=tradingOrder_loadPrintData()
+rs=registerRecord_save()
+
+
+class test_BackCollection(unittest.TestCase):
+    "杭果市场-交易管理"
+
+    @classmethod
+    def setUpClass(cls) :
+        #新增一个进门批号单
+        re=hg.post(url=rs.url,headers=rs.header,json=rs.body1)
+        #获取进门批号
+        cls.batch=re.json()["data"]["batchCode"]
+        # print("setup class",re.json())
+
+    def setUp(self):
+        body=tc.body.copy()
+        body["orderItemList"][0]["batchCode"]=self.batch
+        #创建交款单
+        self.re=hg.post(url=tc.url,headers=tc.header,json=body)
+        #根据交款单的id查询交款单的code,self.re.json()["data"]为交款单的id
+        self.order_code=db.mysql_selectOne(tc.sql.replace("373",str(self.re.json()["data"])))[0]
+        # print("setup",self.order_code,self.re.json())
+
+    @unittest.case_mark(my.mark())
+    def test_BackCollection_01_getUnPaidByCode(self):
+        "后台收款-查询交款单：输入合法交款单号，查询指定交款单"
+        #替换批次号
+        url=tg.url.replace("2109141500003",self.order_code[0:-1])
+        #请求
+        re=hg.get(url=url,headers=tg.header)
+        print(re.json())
+        self.assertTrue(self.order_code in str(re.json()).replace(" ",""))
+
+
+    @unittest.skipDepend(depend="test_BackCollection_01_search")
+    @unittest.case_mark(my.mark())
+    def test_BackCollection_02_pay(self):
+        "后台收款-交款单支付：应收金额=实收金额，且仅现金收款"
+        #修改查询的值
+        body=tp.body.copy()
+        body["id"] = self.re.json()["data"]
+        #请求
+        re=hg.post(url=tp.url,headers=tp.header,json=body)
+        print(re.json())
+        #断言
+        self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
+
+
+    @unittest.skipDepend(depend="test_BackCollection_02_pay")
+    @unittest.case_mark(my.mark())
+    def test_BackCollection_03_loadPrintData(self):
+        "后台收款-打印接口：完成支付后返回打印信息"
+        #打印前先调用支付接口，支付成功后才能打印
+        body=tp.body.copy()
+        body["id"] = self.re.json()["data"]
+        hg.post(url=tp.url, headers=tp.header, json=body)
+        #支付完成后，测试打印信息接口。修改查询的id
+        url=tl.url.replace("398",str(self.re.json()["data"]))
+        re=hg.get(url=url,headers=tl.header)
+        print(re.json())
+        #断言
+        self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
+        self.assertTrue("交款成交单" in str(re.json()).replace(" ",""))
+        self.assertTrue(self.order_code[0:-1] in str(re.json()).replace(" ",""))
+
+
+    @unittest.skipDepend(depend="test_BackCollection_02_pay")
+    @unittest.case_mark(my.mark())
+    def test_BackCollection_04_pay(self):
+        "后台收款-交款单组合支付：优惠，pos卡，支票一起的组合支付"
+        #修改查询的值
+        body=tp.body1.copy()
+        body["id"] = self.re.json()["data"]
+        #请求
+        re=hg.post(url=tp.url,headers=tp.header,json=body)
+        print(re.json())
+        #断言
+        self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
+
+    @unittest.skipDepend(depend="test_BackCollection_02_pay")
+    @unittest.case_mark(my.mark())
+    def test_BackCollection_05_pay(self):
+        "后台收款-交款单组合支付：现金，优惠，pos卡，支票一起的组合支付"
+        #修改查询的值
+        body=tp.body2.copy()
+        body["id"] = self.re.json()["data"]
+        #请求
+        re=hg.post(url=tp.url,headers=tp.header,json=body)
+        print(re.json())
+        #断言
+        self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
+
+
+
+
+if __name__ == "__main__":
+
+    unittest.main(verbosity=2)
+    # com.run_one(test_generalCustomerLoan("test_generalCustomerLoan_01_save"))
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import unittest
+from  commons import common as com
+from commons.MySession import my,hg
+from commons.api.hg.BackCollection.customer_getByKeyword import customer_getByKeyword
+c=customer_getByKeyword()
+from func_timeout import func_set_timeout
+import time
+import func_timeout
+
+class test_customer_getByKeyword(unittest.TestCase):
+    "杭果市场-交易管理-后台收款"
+
+
+    # @unittest.case_mark(my.mark())
+    # def test_customer_getByKeyword_01(self):
+    #     "交易管理-后台收款：在客户信息页面输入正确的客户名称并查询"
+    #     #请求
+    #     re=hg.post(url=c.url,headers=c.header)
+    #     print(re.json())
+    #     self.assertTrue("'success':True" in str(re.json()).replace(" ",""))
+    #     self.assertTrue("拜登" in str(re.json()).replace(" ",""))
+
+    @func_set_timeout(1)
+    def test1(self):
+        time.sleep(3)
+
+
+    @func_set_timeout(1)
+    def test2(self):
+        time.sleep(3)
+
+if __name__ == "__main__":
+
+    unittest.main(verbosity=2)
+    # com.run_one(test_generalCustomerLoan("test_generalCustomerLoan_01_save"))
@@ -35,7 +35,7 @@ class test_generalCustomerLoan(unittest.TestCase):
             body=c.body1.copy()
             body["orderItemList"][0]["batchCode"]=cls.batch
             re1=hg.post(url=c.url,headers=c.header,json=body)
-
+            print(re1.json())
  
     @unittest.case_mark(my.mark())
     def test_generalCustomerLoan_01_save(self):
@@ -101,9 +101,12 @@ class test_generalCustomerLoan(unittest.TestCase):
         self.assertEqual(re.status_code, 200)
         self.assertTrue("操作成功" in str(re.json()).replace(" ",""))
  
-
+    def test_demo_1(self):
+        "列表-执行：执行一个未执行的借款单"
+        # 查询批次号对应id
+        print(123)
  
 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_demo_1"))