批号结算-测试用例新增

liujiqiang
1 parent 47c77a67
Showing 5 changed files with 72 additions and 84 deletions
commons/MySession.py
commons/api/hg/settlement/batchSettlement.py
commons/api/hg/settlement/sellingGoods.py
report/test.log
testcase/hg/test_batchSettlement/test_batchSettlement.py
@@ -146,9 +146,9 @@ class mysession(requests.Session):
         :param data:接口数据
         ：kwargs：其他requests.request()支持参数可以直接传递
         """
-        print(url)
-        # print(headers)
-        print(data)
+        # print(url)
+        # # print(headers)
+        # print(data)
         log.info("{0:=^86}".format(''))
         log.info("{}\n{}\n{}\n".format(url, data, kwargs))
         if "gateway" in url:
@@ -8,3 +8,27 @@
 """
 批号结算页面
 """
+
+import json,time,random,re
+from commons.scripts import dealContentType as dct
+from commons.scripts import jsonToUrlCode
+from commons.scripts import replaceJsonData as rJD
+import urllib.parse
+from commons.MySession import sessionHg
+
+host = "http://test.gateway.diligrp.com:8285"
+
+def settle_query(session=None,host=None,batchCode=None):
+    """
+    登记单状态变更
+    :param batchCode:等级单号
+    :param _t:时间戳
+    """
+    url = host+"/hg-trading/api/settle/query"
+    headers = {}
+    data = {"batchCode":str(batchCode)}
+    res = session.useHeadersRequests(method="GET",url=url,params=data,headers=headers)
+    return res
+
+# res = settle_query(session=sessionHg,host=host,batchCode="2109000319")
+# print(res.text)
 \ No newline at end of file
@@ -146,6 +146,8 @@ def createAndTrade(session=None,host=None,**kwargs):
                              {"type": 2, "chargeItemId": 522, "chargeItemName": "卖家手续费", "amount": 610.0},
                              {"type": 2, "chargeItemId": 527, "chargeItemName": "卖家仓储服务费", "amount": 522.00}]}]}
     data = rJD.replaceJsonData(json=data,data=kwargs)
+    data["orderItemList"][0]["feeItemList"]=kwargs["feeItemList"]
+    print("data",data)
     res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
     return res
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-[2021-09-13 11:09:46] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': '111222', 'password': 'DRocye2VphU1vrI4H1ZDG5qpLaH+J4W433PIxukTeIDZeOmpK1CN+rXZwea+mhasHAxVtB1D8Vvgr23aMl8M/iQ4fyvpDREfekEkegwMlq4xK7WgvVkMHpRCWYkf1P6kv3NoyCuOMtq+dHDJM755kXXwfTzKouXrUUOU9Nq3IcI='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.uap.diligrp.com/login/login.action
-[2021-09-13 11:09:46] [INFO] : http://10.28.12.150:80/login/login.action
+[2021-09-14 11:09:05] [INFO] : ======================================================================================
+[2021-09-14 11:09:05] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+[2021-09-14 11:09:05] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': '111222', 'password': 'EmGtRPV6kawgKe9lnvhrzQftIM9vpxXcsnKUuZBj0L1fH+Lr270OPPUkT+YI69D87J9V/Vl/Z7XqpH9+qETijhO6mWjGDoxxqbhAAvc+fOxgPpdvSwQ7P0DE9JkOA5r4+mKbN7DhBa69i0RkO5MkOUouUbXYdoUY+3jfXaZT0jI='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+
+[2021-09-14 11:09:05] [INFO] : ======================================================================================
+[2021-09-14 11:09:05] [INFO] : http://test.uap.diligrp.com/login/login.action
+[2021-09-14 11:09:05] [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-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
+[2021-09-14 11:09:05] [INFO] : ======================================================================================
+[2021-09-14 11:09:05] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
 {"marketId": 15, "businessType": "501"}
 {}
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
+[2021-09-14 11:09:05] [INFO] : ======================================================================================
+[2021-09-14 11:09:05] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
 None
 {'params': {'cardNo': '888800010591'}}
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+[2021-09-14 11:09:05] [INFO] : ======================================================================================
+[2021-09-14 11:09:05] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
 {"marketId": 15, "keyword": "\u8461\u8404", "state": 1}
 {}
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
+[2021-09-14 11:09:06] [INFO] : ======================================================================================
+[2021-09-14 11:09:06] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
 {"allLevelKeyword": "\u4e07\u5dde"}
 {}
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
+[2021-09-14 11:09:06] [INFO] : ======================================================================================
+[2021-09-14 11:09:06] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
 {"marketId": 15, "nameLike": "\u897f\u533a"}
 {}
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+[2021-09-14 11:09:06] [INFO] : ======================================================================================
+[2021-09-14 11:09:06] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
 {"businessType": "501", "chargeItem": 518, "marketId": 15}
 {}
-[2021-09-13 11:09:46] [INFO] : ======================================================================================
-[2021-09-13 11:09:46] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+[2021-09-14 11:09:06] [INFO] : ======================================================================================
+[2021-09-14 11:09:06] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
 {"businessType": "501", "chargeItem": 520, "marketId": 15}
 {}
-[2021-09-13 11:09:47] [INFO] : ======================================================================================
-[2021-09-13 11:09:47] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
+[2021-09-14 11:09:06] [INFO] : ======================================================================================
+[2021-09-14 11:09:06] [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-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/queryRegister
-{"recordQueryDto": {"batchCode": "2109000298"}}
+[2021-09-14 11:09:08] [INFO] : ======================================================================================
+[2021-09-14 11:09:08] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/settle/changeBatchCodeState
+{"batchCode": "2109000335", "state": "2"}
 {}
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/wms-service/api/sheet/manage/getBySheetNoAndBizNo
+[2021-09-14 11:09:08] [INFO] : ======================================================================================
+[2021-09-14 11:09:08] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/settle/query
 None
-{'params': {'bizNo': '2109000298'}}
-
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
-{"id": 272, "marketId": 15, "departmentId": 177}
-{}
-
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/wms-service/api/sheet/manage/validateReduce
-{"bizNo": "2109000298", "firmId": 15, "kid": "36", "weight": "50"}
-{}
-
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/businessChargeItem/listByExample
-{"IsEnable": 1, "MarketId": 15, "BusinessType": "hg_trading_buyer", "marketId": 15}
-{}
-
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
-{"marketId": 15, "businessType": "hg_trading_buyer", "chargeItem": 521, "calcParams": {"amount": 150.0}, "conditionParams": {"payment": 150.0, "categoryId": 754107}, "amount": 10000, "payment": 10000, "categoryId": 754107}
-{}
-
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/businessChargeItem/listByExample
-{"IsEnable": 1, "MarketId": 15, "BusinessType": "hg_trading_seller", "marketId": 15}
-{}
-
-[2021-09-13 11:09:48] [INFO] : ======================================================================================
-[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
-{"marketId": 15, "businessType": "hg_trading_seller", "chargeItem": 522, "calcParams": {"amount": 150.0}, "conditionParams": {"payment": 150.0, "categoryId": 754107}, "amount": 10000, "payment": 10000, "categoryId": 754107}
-{}
-
-[2021-09-13 11:09:49] [INFO] : ======================================================================================
-[2021-09-13 11:09:49] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
-{"marketId": 15, "businessType": "hg_trading_seller", "chargeItem": 527, "calcParams": {"amount": 150.0}, "conditionParams": {"payment": 150.0, "categoryId": 754107}, "amount": 10000, "payment": 10000, "categoryId": 754107}
-{}
-
-[2021-09-13 11:09:49] [INFO] : ======================================================================================
-[2021-09-13 11:09:49] [INFO] : http://test.gateway.diligrp.com:8285/account-service/api/account/simpleInfo
-None
-{'params': {'cardNo': '888800010592'}}
-
-[2021-09-13 11:09:49] [INFO] : ======================================================================================
-[2021-09-13 11:09:49] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/tradingOrder/createAndTrade
-{"sellerId": 142000, "sellerName": "\u53f2\u4e1c\u6676", "sellerAccountId": 107796, "sellerCardNo": "888800010591", "buyerId": 141963, "buyerName": "\u676d\u679c\u5ba2\u6237\u957f\u6b4c\u4e00", "buyerAccountId": 107667, "buyerCardNo": "888800010592", "posCode": "123", "tradePassword": "111111", "orderItemList": [{"number": 0, "batchCode": "2109000298", "productId": "36", "productCode": "754107", "productName": "\u8461\u8404", "categoryId": 754107, "weightType": 2, "quantity": 1, "pieceWeight": null, "grossWeight": 0, "tareWeight": 0, "weight": "50", "price": 200, "PriceStr": "2", "amount": 10000, "amountStr": "100.0", "originId": 500101, "originName": "\u4e07\u5dde\u533a", "feeItemList": [{"type": 1, "chargeItemId": 521, "chargeItemName": "\u4e70\u5bb6\u624b\u7eed\u8d39", "amount": 10000}, {"type": 2, "chargeItemId": 522, "chargeItemName": "\u5356\u5bb6\u624b\u7eed\u8d39", "amount": 10000}, {"type": 2, "chargeItemId": 527, "chargeItemName": "\u5356\u5bb6\u4ed3\u50a8\u670d\u52a1\u8d39", "amount": 10000}]}]}
-{}
+{'params': {'batchCode': '2109000335'}}
@@ -9,10 +9,12 @@
 杭果市场-结算管理-批号管理
 """
-from commons.MySession import sessionHg as session
-from commons.api.hg.CheckIn import CheckIn
+
 from commons.api.hg.settlement import batch
+from commons.api.hg.settlement import batchSettlement
 from commons.api.hg.settlement import sellingGoods
+from commons.MySession import sessionHg as session
+from commons.api.hg.CheckIn import CheckIn
 from commons.scripts.readConf import rC
 import unittest,random
@@ -38,14 +40,19 @@ class test_batch(unittest.TestCase):
     def test_searchState_1(self):
         """
-        批号管理--查询--输入【在售】状态的完整批号，查询出该批号下的相关数据
+        批号管理--查询--验证查询已关闭的批号自动加载批号信息
         """
         # 创建初始数据
         posCode = self.posCode
+        state = "2"
         resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic)
         batchCode = resBatchCode.json()["data"]["batchCode"]
         print("test_searchState_1 --> self.batchCode:", batchCode)
-        resCAT = sellingGoods.doCreateAndTrade(session=session,host=self.gatewayHost,batchCode=batchCode,
-                                               ic=self.ic_buyer,posCode=posCode)
+        # 变更交易状态
+        resCAT = batch.changeBatchCodeState(session=session,host=self.gatewayHost,batchCode=batchCode,state=state)
         print(resCAT.json())
-        assert resCAT.json()["code"]=="200","登记单交易失败"
 \ No newline at end of file
+        assert resCAT.json()["code"]=="200","登记单状态变更失败"
+        # 结算单查询
+        res = batchSettlement.settle_query(session=session,host=self.gatewayHost,batchCode=batchCode)
+        print(res.text)
+        assert "tradingOrder" in res.text,"验证查询已关闭的批号自动加载批号信息"
 \ No newline at end of file