结算管理-批号交易过程新增

liujiqiang
1 parent dcf78fa2
Showing 5 changed files with 99 additions and 56 deletions
commons/api/hg/settlement/sellingGoods.py
config/marketConfig/conf_test.conf
report/test.log
testcase/hg/test_batchSettlement/__init__.py
testcase/hg/test_batchSettlement/test_batchSettlement.py
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/10 11:06
+# @Author  : Ljq
+# @File    : sellingGoods.py
+# @Software: PyCharm
+
+"""
+商品售卖
+"""
+
+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 queryRegister(session=None,host=None,**kwargs):
+    """
+    查询登记单
+    :param batchCode:登记单号
+    """
+    url = host+"/hg-trading/api/registerRecord/queryRegister"
+    headers = {}
+    data = {"recordQueryDto":{"batchCode":"2109000250"}}
+    data = rJD.replaceJsonData(json=data,data=kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+res = queryRegister(session=sessionHg,host=host,batchCode="2109000266")
+print(res.json())
 \ No newline at end of file
@@ -12,6 +12,7 @@ sy_cardNumRe_01=888810033081
 hd_cardNumRe_01=210823173732
 #hg
 hg_cardNumRe_01=888800010591
+hg_cardNumRe_02=888800010592
 [host]
-[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
+[2021-09-10 11:18:07] [INFO] : ======================================================================================
+[2021-09-10 11:18:07] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+[2021-09-10 11:18:07] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': '111222', 'password': 'HgXZPyFq/MmgAGgi+yghB+PkqkZ2mCl3P5pS61n4LvwFIGfClsQBjUfonZc6M+LdAdQozqg073HtWsZdabvM2IqNJ+DmxDQSfW/9kS2UovsVE739RaPT2aH/0MKgQ3EvpYdN5mYQ1vD2Dm+avuEXEMPzyfQjOaH6qb0i1Ro2DQA='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+
+[2021-09-10 11:18:07] [INFO] : ======================================================================================
+[2021-09-10 11:18:07] [INFO] : http://test.uap.diligrp.com/login/login.action
+[2021-09-10 11:18:07] [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-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 11:18:07] [INFO] : ======================================================================================
+[2021-09-10 11:18:07] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/queryRegister
+{"recordQueryDto": {"batchCode": "2109000266"}}
 {}
-[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 11:00
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/10 11:01
+# @Author  : Ljq
+# @File    : test_batchSettlement.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)
 \ No newline at end of file