结算管理-批号管理测试用例新增

liujiqiang
1 parent 28f2a535
Showing 3 changed files with 184 additions and 14 deletions
commons/api/hg/CheckIn/CheckIn.py
report/test.log
testcase/hg/test_batch/test_batch.py
@@ -154,6 +154,6 @@ def create_registerRecord(session=None,host=None,ic=&quot;888800010591&quot;,goodsName=&quot;è‘
     return resSave
-res = create_registerRecord(session=sessionHg,ic="888800010592",host=host,goodsName="è‹¹æžœ",allLevelKeyword="é‡‘ç‰›åŒº",
-                            nameLike="è¥¿åŒº",tradePassword="111111",weight="50")
-print(res.text)
 \ No newline at end of file
+# res = create_registerRecord(session=sessionHg,ic="888800010592",host=host,goodsName="è‹¹æžœ",allLevelKeyword="é‡‘ç‰›åŒº",
+#                             nameLike="è¥¿åŒº",tradePassword="111111",weight="50")
+# print(res.text)
 \ No newline at end of file
-[2021-09-09 15:07:28] [INFO] : ======================================================================================
-[2021-09-09 15:07:28] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-[2021-09-09 15:07:28] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': '111222', 'password': 'BWgL3Yc1wRb8kJicevOQcaMeCcxB7tFmjcWGQcD8wcX+B06hhtyuk5QMe/N3kKsZGyuKQ1InTE95jy9ZBVnzGxoLcwoVxZzlEsI8anoFst66N7giAyyU2IomupuB2siRt7bDu6o04+Snj/HTpztEecCLRvaVCh6yndLZC/8rNeU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-
-[2021-09-09 15:07:28] [INFO] : ======================================================================================
-[2021-09-09 15:07:28] [INFO] : http://test.uap.diligrp.com/login/login.action
-[2021-09-09 15:07:28] [INFO] : http://10.28.12.150:80/login/login.action
+[2021-09-10 10:56:27] [INFO] : ======================================================================================
+[2021-09-10 10:56:27] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+[2021-09-10 10:56:27] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': '111222', 'password': 'nr5/VixilW97NAW/OSKzjYCOmiALEs0DO5zOF4U4cofwjUUJxwgnZZUHeo0txa0Zp57PhbMVJD463Bn4nI0tBtKqqmjTi2c0EAQVWclAVP7XpQyY6qNT3vTRgAlwph34jYDSkxGeZQu5trWNiFVD0L9NI73rz39Tw9eBNonLH0U='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+
+[2021-09-10 10:56:27] [INFO] : ======================================================================================
+[2021-09-10 10:56:27] [INFO] : http://test.uap.diligrp.com/login/login.action
+[2021-09-10 10:56:27] [INFO] : http://10.28.12.150:80/login/login.action
 {'data': b'userName=111222&password=111111', 'json': None, 'headers': {'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='}, 'allow_redirects': False}
-[2021-09-09 15:07:28] [INFO] : ======================================================================================
-[2021-09-09 15:07:28] [INFO] : http://test.card.diligrp.com:8386/contract/save.action
-{"notes": "123\u5907\u6ce8", "customerId": 141963, "consignorCustomerName": "\u676d\u679c\u5ba2\u6237\u957f\u6b4c\u4e00", "cardNo": "888800010592", "consignorCustomerIDCode": "110101202108265741", "consignorCustomerMobile": "18080018009", "consignorCustomerCode": "00131684", "consignorAccountId": 107667, "startTime": "2021-09-09", "endTime": "2021-09-13", "consignors": [{"consigneeName": "\u5f20\u4e09", "consigneeIdCode": "513922198704216819", "consigneeIdMobile": "asda", "signatureImagePath": "5f68851207864520924e41b7f73c208c"}], "consigneeNames": "\u5510\u5ddd", "node": "signatureImagePathConsignor", "signatureImagePath": "bbdcbcca70a74adfb10b7fb86de5d04c"}
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
+{"marketId": 15, "businessType": "501"}
 {}
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
+None
+{'params': {'cardNo': '888800010591'}}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 15, "keyword": "\u8461\u8404", "state": 1}
+{}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
+{"allLevelKeyword": "\u4e07\u5dde"}
+{}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
+{"marketId": 15, "nameLike": "\u897f\u533a"}
+{}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+{"businessType": "501", "chargeItem": 518, "marketId": 15}
+{}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+{"businessType": "501", "chargeItem": 520, "marketId": 15}
+{}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
+{"accountId": 107796, "cardNo": "888800010591", "customerId": 142000, "customerCode": "00131702", "customerName": "\u53f2\u4e1c\u6676", "fixedphoneNumber": null, "mobilephoneNumber": "18080008020", "identityCardAddress": "", "identityCardNo": "110101202109024587", "identityCardType": "ID", "registerDetailDtoList": [{"id": 0, "areaId": 272, "areaName": "\u897f\u533a", "quantity": 0, "productId": 754107, "registerRecordId": 0, "remark": null, "weight": 100, "weightType": 0, "created": null, "createdById": 0, "createdByName": null, "createdByDepartmentId": 0, "createdByDepartmentName": null, "registerCertificateList": null, "product": null, "registerCertificateDtoList": null, "productDto": {"id": 0, "originId": 500101, "originName": "\u4e07\u5dde\u533a", "pieceWeight": 0, "categoryId": 754107, "categoryCode": 754107, "categoryName": "\u8461\u8404", "created": null}}], "registerFeeDtoList": [{"id": 0, "actualFee": 200, "receivableFee": 1300, "discountFee": 1100, "registerRecordId": 0, "payStatus": 0, "chargeItemName": "\u5176\u4ed6\u6536\u8d39", "chargeType": 1, "chargeItemId": 518, "registerFeeType": 999, "created": null, "createdById": 0, "createdByName": null, "settleDate": null, "isBehalf": 0, "registerLoadingFeeExtDto": null}], "tradePassword": "111111"}
+{}
+
+[2021-09-10 10:56:28] [INFO] : ======================================================================================
+[2021-09-10 10:56:28] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/settle/changeBatchCodeState
+{"batchCode": "2109000240", "state": 2}
+{}
+
+[2021-09-10 10:56:29] [INFO] : ======================================================================================
+[2021-09-10 10:56:29] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/settle/batchCodeQuery
+None
+{'params': {'batchCode': '2109000240', '_t': '1631094801343'}}
+
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/10 10:17
+# @Author  : Ljq
+# @File    : test_batch.py
+# @Software: PyCharm
+
+"""
+杭果市场-结算管理-批号管理
+"""
+
+from commons.MySession import sessionHg as session
+from commons.api.hg.CheckIn import CheckIn
+from commons.api.hg.settlement import batch
+from commons.scripts.readConf import rC
+import unittest,random
+
+class test_batch(unittest.TestCase):
+    """杭果市场-结算管理-批号管理"""
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
+        cls.ic = rC.returnOptionsItems("testInfo", "hg_cardNumRe_01")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_searchState_1(self):
+        """
+        批号管理--查询--输入【在售】状态的完整批号，查询出该批号下的相关数据
+        """
+        # 创建初始数据
+        resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic)
+        self.batchCode = resBatchCode.json()["data"]["batchCode"]
+        # 执行查询
+        print("test_searchState_1 --> self.batchCode:",self.batchCode)
+        resSearchState = batch.batchCodeQuery(session=session,host=self.gatewayHost,batchCode=self.batchCode)
+        print(resSearchState.json())
+        assert resSearchState.json()["code"] == "200","在售状态的登记单查询失败"
+        assert resSearchState.json()["state"] == 1,"在售状态的登记单查询失败"
+        assert resSearchState.json()["data"]["state"] == 1, "在售状态的登记单查询失败"
+        assert resSearchState.json()["data"]["batchCode"] == self.batchCode, "在售状态的登记单查询失败"
+
+    def test_searchState_2(self):
+        """
+        批号管理--查询--输入【关闭】状态的完整批号，查询出该批号下的相关数据
+        """
+        # 创建初始数据
+        resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic)
+        self.batchCode = resBatchCode.json()["data"]["batchCode"]
+        print("test_searchState_1 --> self.batchCode:", self.batchCode)
+        # 将批号关闭
+        resChange = batch.changeBatchCodeState(session=session,host=self.gatewayHost,batchCode=self.batchCode)
+        assert resChange.json()["message"] == "success","批号关闭成功"
+        # 执行查询
+        resSearchState = batch.batchCodeQuery(session=session,host=self.gatewayHost,batchCode=self.batchCode)
+        print(resSearchState.json())
+        assert resSearchState.json()["code"] == "200","在售状态的登记单查询失败"
+        assert resSearchState.json()["state"] == 2,"在售状态的登记单查询失败"
+        assert resSearchState.json()["data"]["state"] == 2, "在售状态的登记单查询失败"
+        assert resSearchState.json()["data"]["batchCode"] == self.batchCode, "在售状态的登记单查询失败"
+
+    def test_batchDetails(self):
+        """
+        批号管理--列表--【列表】中数据显示正确
+        """
+        # 创建初始数据
+        goodsName="西瓜"
+        weight = random.randint(50,100)
+        print("weight",weight)
+        resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic,goodsName=goodsName,
+                                                     weight=weight)
+        self.batchCode = resBatchCode.json()["data"]["batchCode"]
+        print("test_searchState_1 --> self.batchCode:", self.batchCode)
+        # 执行查询
+        resSearchState = batch.batchCodeQuery(session=session,host=self.gatewayHost,batchCode=self.batchCode)
+        print(resSearchState.json())
+        assert resSearchState.json()["code"] == "200","查询状态码返回错误"
+        assert resSearchState.json()["data"]["batchCode"] == self.batchCode, "查询获得订单与实际订单不一致"
+        assert resSearchState.json()["data"]["registerDetail"][0]["categoryName"] == goodsName, "批号的商品信息与创建时不一致"
+        assert resSearchState.json()["data"]["registerDetail"][0]["weight"] == weight, "批号的重量信息与创建时不一致"
+
+    def test_changeState_1(self):
+        """
+        批号管理--恢复交款--“关闭”状态的批号，可【恢复交款】成功
+        """
+        # 创建初始数据
+        resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic)
+        self.batchCode = resBatchCode.json()["data"]["batchCode"]
+        print("test_searchState_1 --> self.batchCode:", self.batchCode)
+        # 将批号关闭
+        resChange = batch.changeBatchCodeState(session=session,host=self.gatewayHost,batchCode=self.batchCode,state=2)
+        assert resChange.json()["message"] == "success","批号关闭成功"
+        resChange = batch.changeBatchCodeState(session=session,host=self.gatewayHost,batchCode=self.batchCode,state=1)
+        assert resChange.json()["message"] == "success","批号关闭成功"
+        # 执行查询
+        resSearchState = batch.batchCodeQuery(session=session,host=self.gatewayHost,batchCode=self.batchCode)
+        print(resSearchState.json())
+        assert resSearchState.json()["data"]["state"] == 1, "在售状态的登记单查询失败"
+        assert resSearchState.json()["data"]["batchCode"] == self.batchCode, "在售状态的登记单查询失败"
+
+    def test_changeState_2(self):
+        """
+        批号管理--恢复交款--“在售”状态的批号，可【停止交款】成功
+        """
+        # 创建初始数据
+        resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic)
+        self.batchCode = resBatchCode.json()["data"]["batchCode"]
+        print("test_searchState_1 --> self.batchCode:", self.batchCode)
+        # 将批号关闭
+        resChange = batch.changeBatchCodeState(session=session,host=self.gatewayHost,batchCode=self.batchCode,state=2)
+        assert resChange.json()["message"] == "success","批号关闭成功"
+        # 执行查询
+        resSearchState = batch.batchCodeQuery(session=session,host=self.gatewayHost,batchCode=self.batchCode)
+        print(resSearchState.json())
+        assert resSearchState.json()["data"]["state"] == 2, "在售状态的登记单查询失败"
+        assert resSearchState.json()["data"]["batchCode"] == self.batchCode, "在售状态的登记单查询失败"