1.录入批次缴费功能相关接口方法添加

2.结算管理支持创建-进门等级-录入批次缴费流程，数据初始化创建支持 3.多层嵌套Json格式数据，与单层级Json数据替换 4.杭果支持数据添加

1.录入批次缴费功能相关接口方法添加
2.结算管理支持创建-进门等级-录入批次缴费流程，数据初始化创建支持 3.多层嵌套Json格式数据，与单层级Json数据替换 4.杭果支持数据添加
liujiqiang
1 parent 5a895d74
Showing 12 changed files with 297 additions and 11 deletions
commons/MySession.py
commons/api/hg/CheckIn/CheckIn.py
commons/api/hg/CheckIn/__init__.py
commons/api/hg/CheckIn/demo.py
commons/api/hg/CheckIn/进门单登记
commons/api/hg/settlement/__init__.py
commons/api/hg/settlement/结算管理
commons/basic/get_duplicateToken.py
commons/scripts/jsonToUrlcode.py → commons/scripts/jsonToUrlCode.py
commons/scripts/replaceJsonData.py
config/marketConfig/conf_test.conf
report/test.log
@@ -294,6 +294,8 @@ my.set_mark()
 # sessionSy = mysession().cliLogin("sy_userName_01")
 # 哈尔滨客户端session
 # sessionHeb = mysession().cliLogin("hd_userName_01")
+# 杭果客户端session
+sessionHg = mysession().cliLogin("hg_userName_01")
 #获取对应市场session
 # sy1=mysession("host1").get_session_client("sy_user01")
 # heb=mysession("host1").get_session_client("heb_user01")
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/8 14:17
+# @Author  : Ljq
+# @File    : CheckIn.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 get_simpleInfo(session=None,host=None,ic=None):
+    url = host+"/card-web/accountQuery/simpleInfo.action"
+    headers={}
+    data={"cardNo":ic}
+    res = session.useHeadersRequests(method="GET",url=url,params=data,headers=headers)
+    return res
+
+
+def get_tree(session=None,host=None,**kwargs):
+    "商品信息获取"
+    url = host+"/assets-service/api/cusCategory/getTree"
+    headers = dct.jsonCode()
+    data={"marketId":15,"keyword":"西瓜","state":1}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+
+def get_cityCode(session=None,host=None,allLevelKeyword="万州"):
+    """"""
+    url = host+"/assets-service/api/city/listByKeywordsWithCityCode"
+    headers = dct.jsonCode()
+    data={"allLevelKeyword":allLevelKeyword}
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+
+def get_searchArea(session=None,host=None,**kwargs):
+    """"""
+    url = host+"/assets-service/api/district/search"
+    headers = dct.jsonCode()
+    data={"marketId":15,"nameLike":"西区"}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+
+def get_chargeItem(session=None,host=None,**kwargs):
+    """获取费用项"""
+    url = host+"/hg-trading/api/businessChargeItem/listBusinessChargeItem"
+    headers = dct.jsonCode()
+    data={"marketId":15,"businessType":"501"}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+
+def get_queryFee(session=None,host=None,**kwargs):
+    """根据费用项获取费用"""
+    url = host+"/dili-rule/api/chargeRule/queryFee"
+    headers = dct.jsonCode()
+    data={"businessType":"501","chargeItem":520,"marketId":15}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+
+def save_registerRecord(session=None,host=None,**kwargs):
+    """生成登记单并缴费"""
+    url = host+"/hg-trading/api/registerRecord/save"
+    headers = dct.jsonCode()
+    data = {"accountId": 107796, "cardNo": "888800010591", "customerId": 142000, "customerCode": "00131702",
+            "customerName": "史东晶", "fixedphoneNumber": None, "mobilephoneNumber": "18080008020",
+            "identityCardAddress": "", "identityCardNo": "110101202109024587", "identityCardType": "ID",
+            "registerDetailDtoList": [
+                {"id": 0, "areaId": 272, "areaName": "西区", "quantity": 0, "productId": 754107, "registerRecordId": 0,
+                 "remark": None, "weight": 100, "weightType": 0, "created": None, "createdById": 0,
+                 "createdByName": None, "createdByDepartmentId": 0, "createdByDepartmentName": None,
+                 "registerCertificateList": None, "product": None, "registerCertificateDtoList": None,
+                 "productDto": {"id": 0, "originId": 500101, "originName": "万州区", "pieceWeight": 0,
+                                "categoryId": 754107, "categoryCode": "754107", "categoryName": "葡萄",
+                                "created": None}}],
+            "registerFeeDtoList": [
+            {"id": 0, "actualFee": 200.0, "receivableFee": 1300.0, "discountFee": 1100.0, "registerRecordId": 0,
+             "payStatus": 0, "chargeItemName": "其他收费", "chargeType": 1, "chargeItemId": 518, "registerFeeType": 999,
+             "created": None, "createdById": 0, "createdByName": None, "settleDate": None, "isBehalf": 0,
+             "registerLoadingFeeExtDto": None}], "tradePassword": "111111"}
+    data = rJD.replaceJsonData(json=data,data=kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+def create_registerRecord(session=None,host=None,ic="888800010591",goodsName="葡萄",nameLike="西区",
+                          allLevelKeyword="万州",tradePassword="111111",weight=100):
+    """创建进门登记单并缴费"""
+    # 获取费用信息
+    res = get_chargeItem(session=session,host=host)
+    chargeItemId = [i["id"] for i in res.json()["data"] if i["chargeItem"] == "其他收费"][0]
+    chargeItemIdChild = [i["id"] for i in res.json()["data"] if "parentId" in i.keys() and i["parentId"] == chargeItemId][0]
+
+    # 获取客户信息
+    resSimpleInfo = get_simpleInfo(session=session,host=host,ic=ic)
+    accountId = resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+    cardNo = resSimpleInfo.json()["data"]["accountInfo"]["cardNo"]
+    customerId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"]
+    customerCode = resSimpleInfo.json()["data"]["accountInfo"]["customerCode"]
+    customerName = resSimpleInfo.json()["data"]["accountInfo"]["customerName"]
+    mobilephoneNumber = resSimpleInfo.json()["data"]["accountInfo"]["customerContactsPhone"]
+    identityCardNo = resSimpleInfo.json()["data"]["accountInfo"]["customerCertificateNumber"]
+
+    # 获取商品信息
+    resTree = get_tree(session=session,host=host,keyword=goodsName)
+    productId = resTree.json()["data"][0]["id"]
+    categoryId = productId
+    categoryCode = productId
+    categoryName = resTree.json()["data"][0]["name"]
+
+    # 获取产地信息
+    resCity = get_cityCode(session=session,host=host,allLevelKeyword=allLevelKeyword)
+    originId = resCity.json()["data"][0]["id"]
+    originName = resCity.json()["data"][0]["name"]
+
+    # 获取区域信息
+    resArea = get_searchArea(session=session,host=host,nameLike=nameLike)
+    areaId = resArea.json()["data"][0]["id"]
+    areaName = resArea.json()["data"][0]["name"]
+
+    # 采用其他收费时获取应收金额,优惠金额，实际金额
+    receivableFee = int(get_queryFee(session=session,host=host,chargeItem=chargeItemId).json()["data"]["totalFee"])*100
+    discountFee = int(get_queryFee(session=session, host=host, chargeItem=chargeItemIdChild).json()["data"]["totalFee"])*100
+    actualFee = receivableFee - discountFee
+
+
+    # 创建进门登记单并缴费
+    resSave = save_registerRecord(session=session, host=host, weight=weight, tradePassword=tradePassword,
+                                  chargeItemId=chargeItemId, accountId=accountId, cardNo=cardNo, customerId=customerId,
+                                  customerCode=customerCode, customerName=customerName,
+                                  mobilephoneNumber=mobilephoneNumber, identityCardNo=identityCardNo,
+                                  productId=productId, categoryId=categoryId, categoryCode=categoryCode,
+                                  categoryName=categoryName, originId=originId, originName=originName, areaId=areaId,
+                                  areaName=areaName, receivableFee=receivableFee, discountFee=discountFee,
+                                  actualFee=actualFee)
+    return resSave
+
+
+res = create_registerRecord(session=sessionHg,ic="888800010592",host=host,goodsName="苹果",allLevelKeyword="金牛区",nameLike="北区")
+print(res.text)
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/8 14:17
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/8 16:23
+# @Author  : Ljq
+# @File    : demo.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+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
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/8 14:18
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/8 14:14
+# @Author  : Ljq
+# @File    : get_duplicateToken.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+def get_duplicateToken(session=None,host=""):
+    """进门防重接口"""
+    url = host + "/jmsf-web/appCommon/duplicateToken.action"
+    headers = dct.jsonCode()
+    res = session.useHeadersRequests(method="get", url=url, headers=headers)
+    return res
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/9/8 16:45
+# @Author  : Ljq
+# @File    : replaceJsonData.py
+# @Software: PyCharm
+
+"""
+使用无嵌套的json格式数据，对嵌套的json内部的值的进行替换
+"""
+
+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
 \ No newline at end of file
@@ -2,6 +2,7 @@
 [loginInfo]
 sy_userName_01=scgy,123123
 hd_userName_01=哈尔滨田太子,a123456
+hg_userName_01=hg_cgy,123123
 # 测试依赖信息
 [testInfo]
@@ -9,6 +10,8 @@ hd_userName_01=哈尔滨田太子,a123456
 sy_cardNumRe_01=888810033081
 #hd
 hd_cardNumRe_01=210823173732
+#hg
+hg_cardNumRe_01=888800010591
 [host]
-[2021-08-27 14:56:04] [INFO] : ======================================================================================
-[2021-08-27 14:56:04] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sy_chen', 'password': 'NxcpSj8I9WK3GY9MlAfHXIQLnAwYsREKkHVx1Z3sBqTdjgk3+/t0aIn/Xpn0DfUsOgwulzZ9XQ5HhEcu+jky7LdPPnNslkyWsXoXQOfWDa39mB2CRzHInV3gNxos3iyqiNCDXy5hTKM1oy7yhE8CfzlqPUcWRDnZ4iGGMhZNpE4='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-09-08 16:55:23] [INFO] : ======================================================================================
+[2021-09-08 16:55:23] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+[2021-09-08 16:55:23] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': '111222', 'password': 'L1yaUHlrR6pf9iqtn4GtuXNObG+GQbo/BPdxb2Cec/Fe3miBM9E32qjYnPdUtVBoIhGHBDBgEg2SxOJTSG5zUpGsUFHOwqwmaGESZoV2qYTwOL1vM6jAsYpJbcOxwRgtrUZ6gd+gJ1+NliPkTeT1C+SRFuggODlBNd8HzVxY/rs='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-27 14:56:04] [INFO] : ======================================================================================
-[2021-08-27 14:56:04] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': '哈尔滨田太子', 'password': 'X8+561DIatg517K/JNe3l4hqIjDSq+r7gTsW4xgP4d0ai6N6gjOD0tn1If8rr54HrYZ//XRY3jdL++cIz5z+HyP5eMD+igf6v+a2W4j8p/IRJsP9v6R3q4Rz35gUoOKalURfJdkQFyzZf7E3X3esOiPMR7n927vUdjIJVAYZU10='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-09-08 16:55:23] [INFO] : ======================================================================================
+[2021-09-08 16:55:23] [INFO] : http://test.uap.diligrp.com/login/login.action
+[2021-09-08 16:55:23] [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-08-27 14:56:05] [INFO] : ======================================================================================
-[2021-08-27 14:56:05] [INFO] : http://test.uap.diligrp.com/login/login.action
-{'data': b'userName=sy_chen&password=123456', '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 16:55:23] [INFO] : ======================================================================================
+[2021-09-08 16:55:23] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
+{"marketId": 15, "businessType": "501"}
+{}
+
+[2021-09-08 16:55:23] [INFO] : ======================================================================================
+[2021-09-08 16:55:23] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
+None
+{'params': {'cardNo': '888800010592'}}
+
+[2021-09-08 16:55:24] [INFO] : ======================================================================================
+[2021-09-08 16:55:24] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 15, "keyword": "\u82f9\u679c", "state": 1}
+{}
+
+[2021-09-08 16:55:24] [INFO] : ======================================================================================
+[2021-09-08 16:55:24] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
+{"allLevelKeyword": "\u91d1\u725b\u533a"}
+{}
+
+[2021-09-08 16:55:24] [INFO] : ======================================================================================
+[2021-09-08 16:55:24] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
+{"marketId": 15, "nameLike": "\u5317\u533a"}
+{}
+
+[2021-09-08 16:55:24] [INFO] : ======================================================================================
+[2021-09-08 16:55:24] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+{"businessType": "501", "chargeItem": 518, "marketId": 15}
+{}
+
+[2021-09-08 16:55:24] [INFO] : ======================================================================================
+[2021-09-08 16:55:24] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
+{"businessType": "501", "chargeItem": 520, "marketId": 15}
+{}
+
+[2021-09-08 16:55:24] [INFO] : ======================================================================================
+[2021-09-08 16:55:24] [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": 278, "areaName": "\u5317\u533a\u7684\u5317\u533a\u7684\u5317\u533a\u7684", "quantity": 0, "productId": 374690, "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": 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-08-27 14:56:05] [INFO] : 发送邮件
-[2021-08-27 14:56:08] [INFO] : 邮件发送完毕