Merge remote-tracking branch 'origin/master'

# Conflicts: # report/test.log

Merge remote-tracking branch 'origin/master'
# Conflicts: # report/test.log
lixi
2 parents 7cf60aee 4ae78d06
Showing 4 changed files with 139 additions and 21 deletions
commons/api/hg/CheckIn/demo.py
config/marketConfig/conf_test.conf
report/test.log
testcase/hg/test_batchSettlement/test_batchSettlement.py
@@ -9,22 +9,73 @@
  
 """
  
-ys = {"a":"1","b":{"c":"3"},"dd":[{"e":"5"}]}
-gc = {"a":"a","c":"c","e":"e"}
-
-def replaceJsonData(json={},data={}):
-    for i in json.keys():
-        if i in data.keys() and type(json[i]) != dict and type(json[i]) != list:
-            json[i]=data[i]
-        elif type(json[i]) == dict:
-            json[i] = replaceJsonData(json=json[i],data=data)
-        elif type(json[i]) == list:
-            for list_child_index in range(len(json[i])):
-                if type(json[i][list_child_index]) == dict:
-                    json[i][list_child_index] = replaceJsonData(json=json[i][list_child_index], data=data)
-    return json
-
-
-# print(ys["d"])
-# a = replaceJsonData(json=ys,data=gc)
-# print(a)
 \ No newline at end of file
+import requests
+import xml.dom.minidom
+
+url = "http://10.28.1.155:6789"
+
+payload = """<?xml version="1.0" encoding="GBK"?>
+<stream>
+    <action>DLBALQRY</action>
+    <userName>11100165758310248856</userName>
+    <list name="userDataList">
+        <row>
+            <accountNo>8113101013600080147</accountNo>
+        </row>
+    </list>
+</stream>"""
+
+searchLoad = """<?xml version="1.0" encoding="GBK"?>
+<stream>
+    <action>DLCIDSTT</action>
+    <userName>11100165758310248856</userName>
+    <clientID>1195178300421038080</clientID>
+    <type></type>
+    <controlFlag>1</controlFlag>
+</stream>"""
+
+do_pay = """<?xml version="1.0" encoding="GBK"?>
+<stream>
+    <action>DLINTTRN</action>
+    <userName>11100165758310248856</userName>
+    <list name="userDataList">
+        <row>
+            <clientID>1195236505817833472</clientID>
+            <preFlg>0</preFlg>
+            <preDate></preDate>
+            <preTime></preTime>
+            <payType>2</payType>
+            <payFlg>1</payFlg>
+            <payAccountNo>8113101013600080147</payAccountNo>
+            <recAccountNo>6217690700023561</recAccountNo>
+            <recAccountName>慈伪化</recAccountName>
+            <recOpenBankName>中信银行北京安贞支行</recOpenBankName>
+            <recOpenBankCode>302100011309</recOpenBankCode>
+            <tranAmount>2.20</tranAmount>
+            <abstract>Online bank withdraw</abstract>
+            <memo>Online bank withdraw</memo>
+            <chkNum>20210914</chkNum>
+        </row>
+    </list>
+</stream>"""
+
+headers = {
+  'Content-Type': 'application/xml'
+}
+
+# # 余额
+# print(payload)
+# response = requests.request("POST", url, headers=headers, data=payload)
+
+# 订单状态
+print(searchLoad)
+response = requests.request("POST", url, headers=headers, data=searchLoad)
+
+# # 缴费
+# print(do_pay)
+# response = requests.request("POST", url, headers=headers, data=do_pay.encode("gbk"))
+
+a = response.content.decode("gbk")
+xml = xml.dom.minidom.parseString(a)
+print("------------------------------------------------")
+print(xml.toprettyxml())
@@ -11,6 +11,7 @@ sy_cardNumRe_01=888810033081
 #hd
 hd_cardNumRe_01=210823173732
 #hg
+; hg_cardNumRe_01=888800010626
 hg_cardNumRe_01=888800010591
 hg_cardNumRe_02=888800010592
 hg_posCode_01=123
+[2021-09-15 10:33:33] [INFO] : ======================================================================================
+[2021-09-15 10:33:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+[2021-09-15 10:33:33] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': '111222', 'password': 'DQXEjlThXAkerQ5AdTWgzBb+S7lpE99qU2rcDnKgA4TPFIMi5uBo7qCC9W+F+/+LbFOIYcdDPrNR5qfdDDb5B7cZaVfqDT4HnJcGk0O2iI44pPAEVicie2h3neKfDfgwmAaSiynHplT/C2AHNWqeY47/Q49d0VEWtgqwdCRy9bQ='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.uap.diligrp.com/login/login.action
+[2021-09-15 10:33:34] [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-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
+{"marketId": 15, "businessType": "501"}
+{}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
+None
+{'params': {'cardNo': '888800010591'}}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 15, "keyword": "\u8461\u8404", "state": 1}
+{}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
+{"allLevelKeyword": "\u4e07\u5dde"}
+{}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
+{"marketId": 15, "nameLike": "\u897f\u533a"}
+{}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+{"businessType": "501", "chargeItem": 518, "marketId": 15}
+{}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+{"businessType": "501", "chargeItem": 520, "marketId": 15}
+{}
+
+[2021-09-15 10:33:34] [INFO] : ======================================================================================
+[2021-09-15 10:33:34] [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"}
+{}
+
@@ -38,7 +38,7 @@ class test_batch(unittest.TestCase):
     def tearDownClass(cls) -> None:
         pass
  
-    def test_searchState_1(self):
+    def test_searchBatchState_2(self):
         """
         批号管理--查询--验证查询已关闭的批号自动加载批号信息
         """
@@ -55,4 +55,20 @@ class test_batch(unittest.TestCase):
         # 结算单查询
         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
+        assert "tradingOrder" in res.text,"验证查询已关闭的批号自动加载批号信息"
+
+    def test_searchBatchState_1(self):
+        """
+        批号管理--查询--验证查询已关闭的批号自动加载批号信息
+        """
+        # 创建初始数据
+        posCode = self.posCode
+        state = "2"
+        resBatchCode = CheckIn.create_registerRecord(session=session, host=self.gatewayHost,ic=self.ic)
+        print(resBatchCode.json())
+        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)
+        # print(resCAT.json())
 \ No newline at end of file