批号结算

liujiqiang
1 parent 1f796a60
Showing 5 changed files with 339 additions and 16 deletions
commons/api/hg/settlement/sellingGoods.py
commons/scripts/replaceJsonData.py
config/marketConfig/conf_test.conf
report/test.log
testcase/hg/test_batchSettlement/test_batchSettlement.py
@@ -30,5 +30,222 @@ def queryRegister(session=None,host=None,**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
+# res = queryRegister(session=sessionHg,host=host,batchCode="2109000266")
+# print(res.json())
+
+def getBySheetNoAndBizNo(session=None,host=None,bizNo="2109000250"):
+    """
+    查询登记单
+    :param batchCode:登记单号
+    """
+    url = host+"/wms-service/api/sheet/manage/getBySheetNoAndBizNo"
+    headers = {}
+    data = {"bizNo":bizNo}
+    res = session.useHeadersRequests(method="get",url=url,params=data,headers=headers)
+    return res
+
+# res = getBySheetNoAndBizNo(session=sessionHg,host=host,bizNo="2109000250")
+# print(res.json())
+
+def getArea(session=None,host=None,**kwargs):
+    """
+    查询登记单
+    :param batchCode:登记单号
+    """
+    url = host+"/assets-service/api/district/search"
+    headers = dct.jsonCode()
+    data = {"id":272,"marketId":15,"departmentId":177}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+# res = getArea(session=sessionHg,host=host,bizNo="2109000250")
+# print(res.json())
+
+def validateReduce(session=None,host=None,**kwargs):
+    """
+    查询登记单
+    :param batchCode:登记单号
+    """
+    url = host+"/wms-service/api/sheet/manage/validateReduce"
+    headers = dct.jsonCode()
+    data = {"bizNo":"2109000250","firmId":15,"kid":36,"weight":50}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+# res = validateReduce(session=sessionHg,host=host,bizNo="2109000250")
+# print(res.json())
+
+def listByExample(session=None,host=None,**kwargs):
+    """
+    查询登记单
+    :param IsEnable:是否可用
+    :param MarketId:登记单号
+    :param BusinessType:身份类型，hg_trading_buyer,hg_trading_seller
+    """
+    url = host+"/assets-service/api/businessChargeItem/listByExample"
+    headers = dct.jsonCode()
+    data = {"IsEnable":1,"MarketId":15,"BusinessType":"hg_trading_buyer"}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+# res = listByExample(session=sessionHg,host=host,bizNo="2109000250")
+# print(res.json())
+
+
+def queryFee(session=None,host=None,**kwargs):
+    """
+    查询登记单
+    :param batchCode:登记单号
+    """
+    url = host+"/dili-rule/api/chargeRule/queryFee"
+    headers = dct.jsonCode()
+    data = {"marketId": 15, "businessType": "hg_trading_buyer", "chargeItem": 521, "calcParams": {"amount": 150.0},
+            "conditionParams": {"payment": 150.0, "categoryId": 754107}}
+    data = dict(data,**kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+# res = queryFee(session=sessionHg,host=host)
+# print(res.json())
+
+def get_simpleInfo(session=None,host=None,ic="888800010592"):
+    url = host+"/account-service/api/account/simpleInfo"
+    headers=dct.jsonCode()
+    data={"cardNo":ic}
+    res = session.useHeadersRequests(method="GET",url=url,params=data,headers=headers)
+    return res
+
+# res = get_simpleInfo(session=sessionHg,host=host,ic="888800010592")
+# print(res.text)
+
+def getCustomerInfoExpireState(session=None,host=None,customerId="141963"):
+    url = host+"/customer-service/api/customerMarket/getCustomerInfoExpireState"
+    headers=dct.jsonCode()
+    data={"customerId":customerId}
+    res = session.useHeadersRequests(method="post",url=url,params=data,headers=headers)
+    return res
+
+# res = getCustomerInfoExpireState(session=sessionHg,host=host,customerId="141963")
+# print(res.text)
+
+
+def createAndTrade(session=None,host=None,**kwargs):
+    url = host+"/hg-trading/api/tradingOrder/createAndTrade"
+    headers=dct.jsonCode()
+    data = {"sellerId": 142000, "sellerName": "史东晶", "sellerAccountId": 107796, "sellerCardNo": "888800010591",
+            "buyerId": 141963, "buyerName": "杭果客户长歌一", "buyerAccountId": 107667, "buyerCardNo": "888800010592",
+            "posCode": "123", "tradePassword": "111111", "orderItemList": [
+            {"number": 0, "batchCode": "2109000262", "productId": 36, "productCode": "754107", "productName": "葡萄",
+             "categoryId": 754107, "weightType": 2, "quantity": 1, "pieceWeight": None, "grossWeight": 0,
+             "tareWeight": 0, "weight": 50, "price": 200, "PriceStr": "2", "amount": 10000, "amountStr": 100.0,
+             "originId": 500101, "originName": "万州区",
+             "feeItemList": [{"type": 1, "chargeItemId": 521, "chargeItemName": "买家手续费", "amount": 1122.00},
+                             {"type": 2, "chargeItemId": 522, "chargeItemName": "卖家手续费", "amount": 610.0},
+                             {"type": 2, "chargeItemId": 527, "chargeItemName": "卖家仓储服务费", "amount": 522.00}]}]}
+    data = rJD.replaceJsonData(json=data,data=kwargs)
+    res = session.useHeadersRequests(method="post",url=url,data=json.dumps(data),headers=headers)
+    return res
+
+# res = createAndTrade(session=sessionHg,host=host)
+# print(res.text)
+
+def doCreateAndTrade(session=None,host=None,batchCode=None,weight="50",PriceStr="2",posCode="123",tradePassword="111111",
+                     ic="888800010592"):
+    # 获取订单信息
+    resQuery = queryRegister(session=session,host=host,batchCode=batchCode)
+    # print(resQuery.json())
+
+    # 订单信息中提取卖家信息
+    sellerId = resQuery.json()["data"][0]["registerRecord"]["customerId"]
+    sellerName = resQuery.json()["data"][0]["registerRecord"]["customerName"]
+    sellerAccountId = resQuery.json()["data"][0]["registerRecord"]["accountId"]
+    sellerCardNo = resQuery.json()["data"][0]["registerRecord"]["cardNo"]
+    posCode=posCode
+    tradePassword=tradePassword
+
+    # 订单信息中提取商品信息
+    productId = resQuery.json()["data"][0]["product"]["id"]
+    productCode = resQuery.json()["data"][0]["product"]["categoryCode"]
+    productName = resQuery.json()["data"][0]["product"]["categoryName"]
+    categoryId = resQuery.json()["data"][0]["product"]["categoryId"]
+    originId = resQuery.json()["data"][0]["product"]["originId"]
+    originName = resQuery.json()["data"][0]["product"]["originName"]
+
+
+    # 获取信息
+    res = getBySheetNoAndBizNo(session=session,host=host,bizNo=batchCode)
+    # print(res.json())
+
+
+    # 打印客户信息
+    id = resQuery.json()["data"][0]["registerDetail"]["areaId"]
+    departmentId = session.userInfo["data"]["user"]["departmentId"]
+    marketId = session.userInfo["data"]["user"]["firmId"]
+    resArea = getArea(session=session,host=host,id=id,departmentId=departmentId,marketId=marketId)
+    print(resArea.json())
+
+    # 称重信息
+    weightType = resQuery.json()["data"][0]["registerDetail"]["weightType"]
+    weight=weight
+    PriceStr = PriceStr
+    price = int(float(PriceStr)*100)
+    amount = int(float(weight)*price)
+    amountStr = str(float(amount)/100)
+
+    # 判断库存
+    resValidate = validateReduce(session=session,host=host,bizNo=batchCode,firmId=marketId,kid=productId,weight=weight)
+    # print(resValidate.json())
+
+    # 费用信息获取，初始化费用信息
+    feeItemList=[]
+
+    # 买家身份费用获取
+    BusinessType = "hg_trading_buyer"
+    resExample = listByExample(session=session,host=host,marketId=marketId,BusinessType=BusinessType)
+    chargeItemList = [i["id"] for i in resExample.json()["data"]]
+    for item in chargeItemList:
+        res = queryFee(session=session,host=host,businessType=BusinessType,marketId=marketId,chargeItem=item,
+                       amount=amount,payment=amount,categoryId=categoryId)
+        feeItem = {}
+        feeItem["type"]=1
+        feeItem["chargeItemId"]=item
+        feeItem["chargeItemName"]=[i["chargeItem"] for i in resExample.json()["data"] if i["id"] == item][0]
+        feeItem["amount"]=float(res.json()["data"]["totalFee"])*100
+        feeItemList.append(feeItem)
+
+    # 卖家费用获取
+    BusinessType = "hg_trading_seller"
+    resExample = listByExample(session=session,host=host,marketId=marketId,BusinessType=BusinessType)
+    chargeItemList = [i["id"] for i in resExample.json()["data"]]
+    for item in chargeItemList:
+        res = queryFee(session=session,host=host,businessType=BusinessType,marketId=marketId,chargeItem=item,
+                       amount=amount,payment=amount,categoryId=categoryId)
+        feeItem = {}
+        feeItem["type"]=2
+        feeItem["chargeItemId"]=item
+        feeItem["chargeItemName"]=[i["chargeItem"] for i in resExample.json()["data"] if i["id"] == item][0]
+        feeItem["amount"]=float(res.json()["data"]["totalFee"])*100
+        feeItemList.append(feeItem)
+    print(feeItemList)
+
+    # 获取买家信息
+    resSimpleInfo = get_simpleInfo(session=session,host=host,ic=ic)
+    # print(resSimpleInfo.json())
+    buyerId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"]
+    buyerName = resSimpleInfo.json()["data"]["accountInfo"]["customerName"]
+    buyerAccountId = resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+    buyerCardNo = resSimpleInfo.json()["data"]["accountInfo"]["cardNo"]
+
+    resCAT = createAndTrade(session=session,host=host,sellerId=sellerId,sellerName=sellerName,sellerAccountId=sellerAccountId,
+                            sellerCardNo=sellerCardNo,posCode=posCode,tradePassword=tradePassword,productId=productId,
+                            productCode=productCode,productName=productName,categoryId=categoryId,originId=originId,
+                            originName=originName,weightType=weightType,weight=weight,PriceStr=PriceStr,price=price,
+                            amount=amount,amountStr=amountStr,batchCode=batchCode,buyerId=buyerId,
+                            buyerName=buyerName,buyerAccountId=buyerAccountId,buyerCardNo=buyerCardNo,feeItemList=feeItemList)
+    return resCAT
+
+# res = doCreateAndTrade(session=sessionHg,host=host,batchCode="2109000289",ic="888800010592")
+# print(res.text)
 \ No newline at end of file
@@ -19,4 +19,11 @@ def replaceJsonData(json={},data={}):
             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
+                else:
+                    if i in data.keys():
+                        json[i] = data[i]
+    return json
+
+json = {"a":"1","b":[{"c":"1"},{"c":2}],"d":[1],"e":"1","f":{"g":1},"h":1,"i":[1]}
+data = {"a":"a","c":"c","e":"e","d": {"d1":"d1"},"g":"g","h":"h"}
+print(replaceJsonData(json=json,data=data))
 \ No newline at end of file
@@ -13,6 +13,7 @@ hd_cardNumRe_01=210823173732
 #hg
 hg_cardNumRe_01=888800010591
 hg_cardNumRe_02=888800010592
+hg_posCode_01=123
  
  
 [host]
-[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
+[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
 {'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 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-13 11:09:46] [INFO] : ======================================================================================
+[2021-09-13 11:09:46] [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
+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
+{"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
+{"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
+{"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
+{"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
+{"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
+{"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-13 11:09:48] [INFO] : ======================================================================================
+[2021-09-13 11:09:48] [INFO] : http://test.gateway.diligrp.com:8285/wms-service/api/sheet/manage/getBySheetNoAndBizNo
+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}]}]}
 {}
  
@@ -12,6 +12,7 @@
 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 sellingGoods
 from commons.scripts.readConf import rC
 import unittest,random
  
@@ -28,6 +29,8 @@ class test_batch(unittest.TestCase):
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
         cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
         cls.ic = rC.returnOptionsItems("testInfo", "hg_cardNumRe_01")
+        cls.ic_buyer = rC.returnOptionsItems("testInfo", "hg_cardNumRe_02")
+        cls.posCode = rC.returnOptionsItems("testInfo", "hg_posCode_01")
  
     @classmethod
     def tearDownClass(cls) -> None:
@@ -38,6 +41,11 @@ class test_batch(unittest.TestCase):
         批号管理--查询--输入【在售】状态的完整批号，查询出该批号下的相关数据
         """
         # 创建初始数据
+        posCode = self.posCode
         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
+        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())
+        assert resCAT.json()["code"]=="200","登记单交易失败"
 \ No newline at end of file