结算管理相关模块添加

liujiqiang
1 parent a0762179
Showing 4 changed files with 69 additions and 49 deletions
commons/api/hg/CheckIn/CheckIn.py
commons/api/hg/settlement/batch.py
commons/api/hg/settlement/demo.py
report/test.log
@@ -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
@@ -50,3 +50,5 @@ def changeBatchCodeState(session=None,host=None,**kwargs):
 # res = changeBatchCodeState(session=sessionHg,host=host,batchCode="2109000202",state=1)
 # print(res.json())
+
+
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/9 14:41
+# @Author  : Ljq
+# @File    : demo.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
+
+def save_red(session=None,host=None,**kwargs):
+    """
+    登记单状态变更
+    :param batchCode:等级单号
+    :param state:变更状态，1继续，2停止
+    """
+    url = "http://test.card.diligrp.com:8386/contract/save.action"
+    headers = dct.jsonCode()
+    data = {
+	"notes": "123备注",
+	"customerId": 141963,
+	"consignorCustomerName": "杭果客户长歌一",
+	"cardNo": "888800010592",
+	"consignorCustomerIDCode": "110101202108265741",
+	"consignorCustomerMobile": "18080018009",
+	"consignorCustomerCode": "00131684",
+	"consignorAccountId": 107667,
+	"startTime": "2021-09-09",
+	"endTime": "2021-09-13",
+	"consignors": [{
+		"consigneeName": "张三",
+		"consigneeIdCode": "513922198704216819",
+		"consigneeIdMobile": "asda",
+		"signatureImagePath": "5f68851207864520924e41b7f73c208c"
+	}],
+	"consigneeNames": "唐川",
+	"node": "signatureImagePathConsignor",
+	"signatureImagePath": "bbdcbcca70a74adfb10b7fb86de5d04c"
+}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+res = save_red(session=sessionHg,host="")
+print(res.json())
 \ No newline at end of file
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-[2021-09-08 18:19:16] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': '111222', 'password': 'UQq2o0Q6W7XIaDqnez/Hyq3gDuBAZUuOnWAy97RA2s99LIQtVP4tTXJdRLOWCNfF3dS+elBLSKoAPfXygUuoPFrSODa6QYZQ3L4Aufl3fk4wn9ei3l2WczKg0rc030FbxfDUBzKL7QMfjRp2oCfpSH+/r6fVPM1UcZXWRhoxfnU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.uap.diligrp.com/login/login.action
-[2021-09-08 18:19:16] [INFO] : http://10.28.12.150:80/login/login.action
+[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
 {'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-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
-{"marketId": 15, "businessType": "501"}
-{}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
-None
-{'params': {'cardNo': '888800010592'}}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
-{"marketId": 15, "keyword": "\u82f9\u679c", "state": 1}
-{}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
-{"allLevelKeyword": "\u91d1\u725b\u533a"}
-{}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
-{"marketId": 15, "nameLike": "\u897f\u533a"}
-{}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
-{"businessType": "501", "chargeItem": 518, "marketId": 15}
-{}
-
-[2021-09-08 18:19:16] [INFO] : ======================================================================================
-[2021-09-08 18:19:16] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
-{"businessType": "501", "chargeItem": 520, "marketId": 15}
-{}
-
-[2021-09-08 18:19:17] [INFO] : ======================================================================================
-[2021-09-08 18:19:17] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
-{"accountId": 107667, "cardNo": "888800010592", "customerId": 141963, "customerCode": "00131684", "customerName": "\u676d\u679c\u5ba2\u6237\u957f\u6b4c\u4e00", "fixedphoneNumber": null, "mobilephoneNumber": "18080018009", "identityCardAddress": "", "identityCardNo": "110101202108265741", "identityCardType": "ID", "registerDetailDtoList": [{"id": 0, "areaId": 272, "areaName": "\u897f\u533a", "quantity": 0, "productId": 374690, "registerRecordId": 0, "remark": null, "weight": "50", "weightType": 0, "created": null, "createdById": 0, "createdByName": null, "createdByDepartmentId": 0, "createdByDepartmentName": null, "registerCertificateList": null, "product": null, "registerCertificateDtoList": null, "productDto": {"id": 0, "originId": 510106, "originName": "\u91d1\u725b\u533a", "pieceWeight": 0, "categoryId": 374690, "categoryCode": 374690, "categoryName": "\u82f9\u679c", "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-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"}
 {}