Merge remote-tracking branch 'origin/master'

wenleiming
2 parents ed05fd9d 75efb1b0
Showing 8 changed files with 231 additions and 143 deletions
commons/api/entranceFeeBillList/operationDoAmend.py
commons/api/entranceFeeBillList/operationDoCorrect.py
commons/api/entranceFeeBillList/operationDoInvalid.py
commons/api/entranceFeeBillList/operationDoUndo.py
commons/api/entranceFeeBillList/operationUnfreeze.py
commons/api/sjApi.py
report/test.log
testcase/heb/test_listPage/test_listPageOperation.py
@@ -167,6 +167,11 @@ def do_doAmend(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data["autocomplete-cartype"] = autocompletecartype
     data = dict(data, **kwargs)
+
+    # 当模板没有配置货物标签时，参数不能传递货物标签所以需要删除
+    if kwargs["goodsTagIds"] =="":
+        del data["goodsTagIds"]
+
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================开始请求================")
     res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
@@ -201,7 +206,14 @@ def do_amendOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     correctInfo = orderDetailsDict["correctInfo"]
     weightType = orderDetailsDict["weightType"]
     correctDiscount = orderDetailsDict["correctDiscount"]
-    goodsTagIds = orderDetailsDict["goodsTagIds"]
+
+    # goodsTagIds = orderDetailsDict["goodsTagIds"]
+    # 货物标签特别判断
+    if "goodsTagIds" in orderDetailsDict.keys():
+        goodsTagIds = orderDetailsDict["goodsTagIds"]
+    else:
+        goodsTagIds = ""
+
     sumPrice = orderDetailsDict["sumPrice"]
     shareRatio = orderDetailsDict["shareRatio"]
     plate = orderDetailsDict["plate"]
@@ -169,6 +169,11 @@ def do_doCorrect(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     data["autocomplete-cartype"] = autocompletecartype
     data = dict(data, **kwargs)
+
+    # 当模板没有配置货物标签时，参数不能传递货物标签所以需要删除
+    if kwargs["goodsTagIds"] =="":
+        del data["goodsTagIds"]
+
     data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str
     print("================开始请求================")
     res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
@@ -203,7 +208,14 @@ def do_correctOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     correctInfo = orderDetailsDict["correctInfo"]
     weightType = orderDetailsDict["weightType"]
     correctDiscount = "2"
-    goodsTagIds = orderDetailsDict["goodsTagIds"]
+
+    # goodsTagIds = orderDetailsDict["goodsTagIds"]
+    # 货物标签特别判断
+    if "goodsTagIds" in orderDetailsDict.keys():
+        goodsTagIds = orderDetailsDict["goodsTagIds"]
+    else:
+        goodsTagIds = ""
+
     sumPrice = orderDetailsDict["sumPrice"]
     shareRatio = orderDetailsDict["shareRatio"]
     plate = orderDetailsDict["plate"]
@@ -197,7 +197,14 @@ def do_invalidOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单
     correctInfo = orderDetailsDict["correctInfo"]
     weightType = orderDetailsDict["weightType"]
     correctDiscount = orderDetailsDict["correctDiscount"]
-    goodsTagIds = orderDetailsDict["goodsTagIds"]
+
+    # goodsTagIds = orderDetailsDict["goodsTagIds"]
+    # 货物标签特别判断
+    if "goodsTagIds" in orderDetailsDict.keys():
+        goodsTagIds = orderDetailsDict["goodsTagIds"]
+    else:
+        goodsTagIds = ""
+
     sumPrice = orderDetailsDict["sumPrice"]
     tradeTypeId = orderDetailsDict["tradeTypeId"]
     shareRatio = orderDetailsDict["shareRatio"]
@@ -42,7 +42,7 @@ def get_calculateRes(host=&quot;&quot;,autocompletecartype=None,**kwargs):
             "regionName": "", "regionId": "0", "productName": "productName", "productId": "productId",
             "productArea": "重庆,重庆市,万州区", "parentId": "", "levelType": "", "originId": "originId", "tradeTypeId": "tradeTypeId",
             "chargeTotalAmount": "", "chargeTotalAmountYuan": "", "freezeMoneySymbol": "", "comparisonFreezeAmount": "",
-            "created": "created", "remark": "false", "goodsTagIds": "goodsTagIds", "shareRatio": "shareRatio",
+            "created": "created", "remark": "false", "goodsTagIds": "", "shareRatio": "shareRatio",
             "handlingTeam": "", "handlingRatio": "", "handActualAmount": "", "handManageAmount": "",
             "handCollectionAmount": "", "receivableAmount": "", "categoryName": "productName",
             "categoryId": "productId", "driverTel": "", "grossWeightDate": "grossWeightDate",
@@ -117,7 +117,14 @@ def do_undoOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;收费单号
     correctInfo = orderDetailsDict["correctInfo"]
     weightType = orderDetailsDict["weightType"]
     correctDiscount = orderDetailsDict["correctDiscount"]
-    goodsTagIds = orderDetailsDict["goodsTagIds"]
+
+    # goodsTagIds = orderDetailsDict["goodsTagIds"]
+    # 货物标签特别判断
+    if "goodsTagIds" in orderDetailsDict.keys():
+        goodsTagIds = orderDetailsDict["goodsTagIds"]
+    else:
+        goodsTagIds = ""
+
     sumPrice = orderDetailsDict["sumPrice"]
     tradeTypeId = orderDetailsDict["tradeTypeId"]
     shareRatio = orderDetailsDict["shareRatio"]
@@ -188,7 +188,14 @@ def do_unfreezeOrder(host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;æ”¶è´¹å
     correctInfo = orderDetailsDict["correctInfo"]
     weightType = orderDetailsDict["weightType"]
     correctDiscount = orderDetailsDict["correctDiscount"]
-    goodsTagIds = orderDetailsDict["goodsTagIds"]
+
+    # goodsTagIds = orderDetailsDict["goodsTagIds"]
+    # è´§ç‰©æ ‡ç¾ç‰¹åˆ«åˆ¤æ–
+    if "goodsTagIds" in orderDetailsDict.keys():
+        goodsTagIds = orderDetailsDict["goodsTagIds"]
+    else:
+        goodsTagIds = ""
+
     sumPrice = orderDetailsDict["sumPrice"]
     tradeTypeId = orderDetailsDict["tradeTypeId"]
     shareRatio = orderDetailsDict["shareRatio"]
@@ -14,6 +14,7 @@ from commons.scripts import dealContentType as dct
 from commons.MySession import my
 from commons.api import zcApi
 from commons.api import entranceFeeBillList as eFBL
+from commons.basic import getLookupList as gLL
 def create_sparePartsWeighSave(host="",duplicateToken=None,**kwargs):
@@ -99,92 +100,159 @@ def create_sj(host=None,carTypeName=None,keyword=&quot;蔬菜&quot;,userName=None,transact
     """
     """
+    # 模板获取
+    templateAttr_list = gLL.get_templateAttr(host=host,moduleCode="SJ")
+    print(templateAttr_list)
+
     # 获取车型
-    carType = zcApi.get_carType(host=host)
-    print(carType.text)
-    if carTypeName ==None:
-        carTypeIndex = 0
+    if "车型" in templateAttr_list:
+        carType = zcApi.get_carType(host=host)
+        print(carType.text)
+        if carTypeName == None:
+            carTypeIndex = 0
+        else:
+            carTypeIndex = carType.json()["data"].index(
+                [i for i in carType.json()["data"] if i["carTypeName"] == carTypeName][0])
+        carTypeCode = carType.json()["data"][carTypeIndex]["code"]
+        carTypeId = carType.json()["data"][carTypeIndex]["id"]
+        carTypeName = carType.json()["data"][carTypeIndex]["carTypeName"]
+        carTypeWeight = carType.json()["data"][carTypeIndex]["weight"]
     else:
-        carTypeIndex = carType.json()["data"].index(
-            [i for i in carType.json()["data"] if i["carTypeName"] == carTypeName][0])
-    carTypeCode = carType.json()["data"][carTypeIndex]["code"]
-    carTypeId = carType.json()["data"][carTypeIndex]["id"]
-    carTypeName = carType.json()["data"][carTypeIndex]["carTypeName"]
-    carTypeWeight = carType.json()["data"][carTypeIndex]["weight"]
+        carTypeCode = ""
+        carTypeId = ""
+        carTypeName = ""
+        carTypeWeight = ""
+
     # 获取商品
-    categoryByCondition = zcApi.get_listCategoryByCondition(host=host,keyword=keyword)
-    print(categoryByCondition.json())
-    cateId = categoryByCondition.json()["data"][0]["id"]
-    productId = categoryByCondition.json()["data"][0]["id"]
-    productName = categoryByCondition.json()["data"][0]["name"]
-    # productCode = categoryByCondition.json()["data"][0]["keycode"]
-    print(productName)
-    print(productId)
+    if "商品" in templateAttr_list or "商品(末级)" in templateAttr_list:
+        categoryByCondition = zcApi.get_listCategoryByCondition(host=host, keyword=keyword)
+        cateId = categoryByCondition.json()["data"][0]["id"]
+        productId = categoryByCondition.json()["data"][0]["id"]
+        productName = categoryByCondition.json()["data"][0]["name"]
+        # productCode = categoryByCondition.json()["data"][0]["keycode"]
+    else:
+        cateId = ""
+        productId = ""
+        productName = ""
+
     # 获取接车员信息
-    listByExample = zcApi.get_listByExample(host=host)
-    print(listByExample.json())
-    if userName ==None:
-        listByExampleIndex = 0
+    if "进门接车员" in templateAttr_list:
+        firmCode = my.userInfo["data"]["user"]["firmCode"]
+        firmId = my.userInfo["data"]["user"]["firmId"]
+
+        try:
+            res_config = gLL.get_config(host=host, marketId=firmId)
+            departmentId = [i["value"] for i in res_config.json()["rows"] if i["name"] == "DepartmentId"][0]
+        except:
+            departmentId = None
+        # print("==========1============")
+        # print(my.userInfo["data"]["user"])
+        # print(firmCode)
+        # print(departmentId)
+        # print("==========1============")
+        listByExample =  zcApi.get_listByExample(host=host,firmCode=firmCode,departmentId=departmentId)
+        print("listByExample",listByExample.json())
+        if userName == None:
+            listByExampleIndex = 0
+        else:
+            listByExampleIndex = listByExample.json()["data"].index(
+                [i for i in listByExample.json()["data"] if i["userName"] == userName][0])
+        inGreeterId = listByExample.json()["data"][listByExampleIndex]["id"]
+        inGreeterName = listByExample.json()["data"][listByExampleIndex]["realName"]
     else:
-        listByExampleIndex = listByExample.json()["data"].index(
-            [i for i in listByExample.json()["data"] if i["userName"] == userName][0])
-    inGreeterId = listByExample.json()["data"][listByExampleIndex]["id"]
-    inGreeterName = listByExample.json()["data"][listByExampleIndex]["realName"]
+        inGreeterId=""
+        inGreeterName = ""
+
+    # if "进门接车员" in templateAttr_list:
+    #     listByExample = zcApi.get_listByExample(host=host)
+    #     print(listByExample.json())
+    #     if userName == None:
+    #         listByExampleIndex = 0
+    #     else:
+    #         listByExampleIndex = listByExample.json()["data"].index(
+    #             [i for i in listByExample.json()["data"] if i["userName"] == userName][0])
+    #     inGreeterId = listByExample.json()["data"][listByExampleIndex]["id"]
+    #     inGreeterName = listByExample.json()["data"][listByExampleIndex]["realName"]
+    # else:
+    #     inGreeterId = ""
+    #     inGreeterName = ""
     # 获取交易类型
-    transactionType = zcApi.query_transactionType(host=host)
-    print(transactionType.json())
-    print("交易类型")
-    if transactionName ==None:
-        transactionTypeIndex = 0
+    if "交易类型" in templateAttr_list:
+        transactionType = zcApi.query_transactionType(host=host)
+        print(transactionType.json())
+        print("交易类型")
+        if transactionName == None:
+            transactionTypeIndex = 0
+        else:
+            transactionTypeIndex = transactionType.json()["rows"].index(
+                [i for i in transactionType.json()["rows"] if i["name"] == transactionName][0])
+        tradeType = transactionType.json()["rows"][transactionTypeIndex]["code"]
+        tradeTypeId = transactionType.json()["rows"][transactionTypeIndex]["id"]
+        tradeTypeName = transactionType.json()["rows"][transactionTypeIndex]["name"]
     else:
-        transactionTypeIndex = transactionType.json()["rows"].index(
-            [i for i in transactionType.json()["rows"] if i["name"] == transactionName][0])
-    tradeType = transactionType.json()["rows"][transactionTypeIndex]["code"]
-    tradeTypeId = transactionType.json()["rows"][transactionTypeIndex]["id"]
-    tradeTypeName = transactionType.json()["rows"][transactionTypeIndex]["name"]
+        tradeType = ""
+        tradeTypeId = ""
+        tradeTypeName = ""
     # 获取货物标签
-    goodsTag = zcApi.get_goodsTag(host=host)
-    print(goodsTag.json())
-    if goodsTagName ==None:
-        transactionTypeIndex = 0
+    if "货物标签" in templateAttr_list:
+        goodsTag = zcApi.get_goodsTag(host=host)
+        print(goodsTag.json())
+        if goodsTagName == None:
+            transactionTypeIndex = 0
+        else:
+            transactionTypeIndex = goodsTag.json()["data"].index(
+                [i for i in goodsTag.json()["data"] if i["name"] == goodsTagName][0])
+        goodsTagId = goodsTag.json()["data"][transactionTypeIndex]["id"]
     else:
-        transactionTypeIndex = goodsTag.json()["data"].index(
-            [i for i in goodsTag.json()["data"] if i["name"] == goodsTagName][0])
-    goodsTagId = goodsTag.json()["data"][transactionTypeIndex]["id"]
+        goodsTagId = ""
     # 产地信息获取
-    address = zcApi.get_address(host=host)
-    print(address.json())
-    originId = address.json()["data"][0]["id"]
-    origin = address.json()["data"][0]["name"]
-    originCode = address.json()["data"][0]["cityCode"]
+    if "产地" in templateAttr_list:
+        address = zcApi.get_address(host=host)
+        print(address.json())
+        originId = address.json()["data"][0]["id"]
+        origin = address.json()["data"][0]["name"]
+        originCode = address.json()["data"][0]["cityCode"]
+    else:
+        originId = ""
+        origin = ""
+        originCode = ""
     # 查询部门信息
-    depRes = zcApi.get_dep(host=host)
-    print(depRes.json())
-    if depName ==None:
-        depResIndex = 0
+    # 查询部门信息
+    if "接车部门" in templateAttr_list or "收费部门" in templateAttr_list:
+        depRes = zcApi.get_dep(host=host)
+        print(depRes.json())
+        if depName == None:
+            depResIndex = 0
+        else:
+            depResIndex = depRes.json()["data"].index(
+                [i for i in depRes.json()["data"] if i["name"] == depName][0])
+        feeDepId = depRes.json()["data"][depResIndex]["id"]
+        feeDepName = depRes.json()["data"][depResIndex]["name"]
     else:
-        depResIndex = depRes.json()["data"].index(
-            [i for i in depRes.json()["data"] if i["name"] == depName][0])
-    feeDepId = depRes.json()["data"][depResIndex]["id"]
-    feeDepName = depRes.json()["data"][depResIndex]["name"]
+        feeDepId = ""
+        feeDepName = ""
     # 获取证明类型
-    proveType = zcApi.get_proveType(host=host)
-    print(proveType.json())
-    # print("proveName",proveName)
-    if proveName ==None:
-        proveTypeIndex = 0
+    if "证明类型" in templateAttr_list:
+        proveType = zcApi.get_proveType(host=host)
+        print(proveType.json())
+        # print("proveName",proveName)
+        if proveName == None:
+            proveTypeIndex = 0
+        else:
+            proveTypeIndex = proveType.json()["data"].index(
+                [i for i in proveType.json()["data"] if i["name"] == proveName][0])
+        proveTypeCode = proveType.json()["data"][proveTypeIndex]["id"]
+        proveTypeName = proveType.json()["data"][proveTypeIndex]["name"]
     else:
-        proveTypeIndex = proveType.json()["data"].index(
-            [i for i in proveType.json()["data"] if i["name"] == proveName][0])
-    proveTypeCode = proveType.json()["data"][proveTypeIndex]["id"]
-    proveTypeName = proveType.json()["data"][proveTypeIndex]["name"]
+        proveTypeCode = ""
+        proveTypeName = ""
     print("proveTypeCode", proveTypeCode)
     print("proveTypeName", proveTypeName)
-[2021-08-24 14:42:58] [INFO] : ======================================================================================
-[2021-08-24 14:42:58] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sy_chen', 'password': 'YYD/RlWIycywtAC8mAg3/GRHq0j93TXvKtos9JcQH8XusbxAhZjdroSDlCBNSKSNTWTgB0XDxfTuhTLooR+zykQuVUz0Q4ewLWybEWeH8OW+faPyx6MT8+HQNXTHxrZrmEbNXTmOnISbPZVIp/XRebjkCHwuK9FCwO6X15qSCkI='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-24 15:20:00] [INFO] : ======================================================================================
+[2021-08-24 15:20:00] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sy_chen', 'password': 'C42blCKuy0KGckFVnm6jVxlefUvHjUhXxhxrlZeRzeyRpnCoeVkBGIp4513NT9a3GydAFl63/2CWJV1rIpQ7VYnEKP/mDQtc+yjnIawnF4Nu7HqDs77Jv4MJOtSWo1y2BfezF1zesosf9Fbpd7xvtsC0voeRRxO++nQ+cCpnmdM='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-24 14:42:58] [INFO] : ======================================================================================
-[2021-08-24 14:42:58] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': '哈尔滨田太子', 'password': 'Rs2ck6WidOLh5l3AIpftdffQ2xphJhV0OQmgcijsQpMr5Pj9BJYoYJSVaa99scA45Uh4+/pxtibFCThdDe0iMZd86do9C5awilWOWhIj7JR1vSCqHhy8uV5WXubIINq4PtK3VEzLn/iO3YEm62Yggrr6lcMgudHfvlZ7OayYfDI='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-24 15:20:00] [INFO] : ======================================================================================
+[2021-08-24 15:20:00] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': '哈尔滨田太子', 'password': 'Mw7xAxBDv/FmpNrLr26u3AIzsVQgUcvnp3cjMSAkPI7VfpCiKX1ttiXs8dLYy3rtAgIb+0LOs6YIOi89GJZLQLKoVD6vgCEKj6M/Vt6XtDMEOuhdjDnbnMRiMKM/AhQcvIq9AiYDv+l9F7nd7E42cV8nQr5DT5/tzot25EvG1V0='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
-[2021-08-24 14:42:58] [INFO] : ======================================================================================
-[2021-08-24 14:42:58] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/config/query
-{"marketId": "9", "pageNum": 100, "pageSize": 100}
-{}
-
-[2021-08-24 14:42:59] [INFO] : ======================================================================================
-[2021-08-24 14:42:59] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/template/getTemplateUnit?marketCode=9&moduleCode=ZC
+[2021-08-24 15:20:00] [INFO] : ======================================================================================
+[2021-08-24 15:20:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/template/getTemplateUnit?marketCode=9&moduleCode=SJ
 None
 {}
-[2021-08-24 14:42:59] [INFO] : ======================================================================================
-[2021-08-24 14:42:59] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
+[2021-08-24 15:20:01] [INFO] : ======================================================================================
+[2021-08-24 15:20:01] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
 {"businessCode": "jmsf"}
 {}
-[2021-08-24 14:42:59] [INFO] : ======================================================================================
-[2021-08-24 14:42:59] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+[2021-08-24 15:20:01] [INFO] : ======================================================================================
+[2021-08-24 15:20:01] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
 {"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
 {}
-[2021-08-24 14:42:59] [INFO] : ======================================================================================
-[2021-08-24 14:42:59] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/config/query
+[2021-08-24 15:20:01] [INFO] : ======================================================================================
+[2021-08-24 15:20:01] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/config/query
 {"marketId": 9, "pageNum": 100, "pageSize": 100}
 {}
-[2021-08-24 14:42:59] [INFO] : ======================================================================================
-[2021-08-24 14:42:59] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
+[2021-08-24 15:20:01] [INFO] : ======================================================================================
+[2021-08-24 15:20:01] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
 {"firmCode": "sy", "departmentId": "58", "keyword": ""}
 {}
-[2021-08-24 14:43:00] [INFO] : ======================================================================================
-[2021-08-24 14:43:00] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
+[2021-08-24 15:20:01] [INFO] : ======================================================================================
+[2021-08-24 15:20:01] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
 {"pageNum": 100, "pageSize": 100, "marketId": 9}
 {}
-[2021-08-24 14:43:00] [INFO] : ======================================================================================
-[2021-08-24 14:43:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+[2021-08-24 15:20:01] [INFO] : ======================================================================================
+[2021-08-24 15:20:01] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
 {'params': {'pid': 'goods_tag'}}
-[2021-08-24 14:43:00] [INFO] : ======================================================================================
-[2021-08-24 14:43:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
+[2021-08-24 15:20:02] [INFO] : ======================================================================================
+[2021-08-24 15:20:02] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
 {"province": "C", "city": null, "area": null}
 {}
-[2021-08-24 14:43:00] [INFO] : ======================================================================================
-[2021-08-24 14:43:00] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
+[2021-08-24 15:20:02] [INFO] : ======================================================================================
+[2021-08-24 15:20:02] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
 None
 {'params': {'keyword': ''}}
-[2021-08-24 14:43:01] [INFO] : ======================================================================================
-[2021-08-24 14:43:01] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+[2021-08-24 15:20:03] [INFO] : ======================================================================================
+[2021-08-24 15:20:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
 None
 {'params': {'pid': 'prove_type'}}
-[2021-08-24 14:43:01] [INFO] : ======================================================================================
-[2021-08-24 14:43:01] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
+[2021-08-24 15:20:03] [INFO] : ======================================================================================
+[2021-08-24 15:20:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
 None
 {}
-[2021-08-24 14:43:01] [INFO] : ======================================================================================
-[2021-08-24 14:43:01] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
-{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA42238", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 2182, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 432, "grossWeightDate": "2021-08-24 14:43:01", "newWeight": 99, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA42238", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 2182, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 70, "id": 0, "protocolId": null, "goodsTagId": 663}
+[2021-08-24 15:20:03] [INFO] : ======================================================================================
+[2021-08-24 15:20:03] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/sparePartsWeighSave
+{"driverTel": "", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "itemWeight": 11, "productId": 2182, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "qty": 33, "weighRemark": null, "weight": 220, "weighmanRecord": {"grossWeight": null, "grossWeightDate": null, "newWeight": null, "tareWeight": null, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "plate": "\u5dddA90810", "carTypeId": 53, "carTypeCode": "003", "carTypeName": "\u677f\u8f66", "pathAddress": "A4-BB-6D-0A-F4-13", "entryPlateInputType": 1, "feeDepId": 0, "feeDepName": null, "dep": 58, "depName": "\u6c34\u679c\u90e8", "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "type": 2, "tradeTypeId": 70, "tradeType": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "goodsTagId": 663, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "trailerNumber": "\u5dddA90810", "cateId": 2182, "productState": "1"}
 {}
-[2021-08-24 14:43:02] [INFO] : ======================================================================================
-[2021-08-24 14:43:02] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
-{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108240900283'}
+[2021-08-24 15:20:04] [INFO] : ======================================================================================
+[2021-08-24 15:20:04] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
+{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108240900321'}
 {}
-[2021-08-24 14:43:02] [INFO] : ======================================================================================
-[2021-08-24 14:43:02] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/5281.action
+[2021-08-24 15:20:04] [INFO] : ======================================================================================
+[2021-08-24 15:20:04] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/5349.action
 None
 {}
-[2021-08-24 14:43:04] [INFO] : ======================================================================================
-[2021-08-24 14:43:04] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810033081
+[2021-08-24 15:20:06] [INFO] : ======================================================================================
+[2021-08-24 15:20:06] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810033081
 None
 {}
-[2021-08-24 14:43:04] [INFO] : ======================================================================================
-[2021-08-24 14:43:04] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+[2021-08-24 15:20:07] [INFO] : ======================================================================================
+[2021-08-24 15:20:07] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
 None
 {}
-[2021-08-24 14:43:04] [INFO] : ======================================================================================
-[2021-08-24 14:43:04] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
-{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 5281, 'goodsId': '5295', 'number': '202108240900283', 'modified': '2021-08-24 14:43:04', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A42238', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '665', 'grossWeight': '432', 'tareWeight': '333', 'weight': '99', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'calcDepId': '58', 'regionName': 'A1区', 'regionId': '0', 'productName': '雪莲果', 'productId': '2182', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '70', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-24 14:43:03', 'remark': 'false', 'goodsTagIds': '663', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '1616', 'driverTel': '', 'grossWeightDate': '2021-08-24 14:43:03', 'tareWeightDate': '2021-08-24 14:43:03', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '测试沈阳', 'inGreeterId': '223', 'outGreeterId': '', 'sumPrice': '9900', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
-{}
-
-[2021-08-24 14:43:05] [INFO] : ======================================================================================
-[2021-08-24 14:43:05] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doFreeze.action
-protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=5281&goodsId=5295&number=202108240900283&modified=2021-08-24%2014%3A43%3A03&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=4800&customerId=384&fundAccount=103101&ic=888810033081&customerName=%2A%2A%2A%2A%2A%2A&customerPhone=19010001000&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DA42238&autocomplete-cartype=003%28%E6%9D%BF%E8%BD%A6%29&carTypeName=%E6%9D%BF%E8%BD%A6&carTypeCode=003&carTypeId=53&carTypeWeight=333&storeTareWeight=&proveType=665&grossWeight=432&tareWeight=333&weight=99&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%B0%B4%E6%9E%9C%E9%83%A8&calcDepId=58&dep=58&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=2182&productArea=%E9%87%8D%E5%BA%86%2C%E9%87%8D%E5%BA%86%E5%B8%82%2C%E4%B8%87%E5%B7%9E%E5%8C%BA&parentId=500100&levelType=&originId=500101&tradeTypeId=70&chargeTotalAmount=4800&chargeTotalAmountYuan=48&freezeMoneySymbol=53&comparisonFreezeAmount=53&created=2021-08-24%2014%3A43%3A03&remark=&goodsTagIds=663&marketFlag=sy&totalMoney=4800&receivable=5300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=5300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=5300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=1616&driverTel=&grossWeightDate=2021-08-24%2014%3A43%3A03&tareWeightDate=2021-08-24%2014%3A43%3A03&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=9900&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=103101&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=50.00&billItems=%7B%22discount%22%3A500%2C%22id%22%3A103%2C%22name%22%3A%22%E4%BA%A4%E6%98%93%E7%AE%A1%E7%90%86%E8%B4%B9%22%2C%22receivable%22%3A5000%2C%22require%22%3A1%7D&billItemDicCheckIds=105&billItemsDic=%7B%22discount%22%3A0%2C%22id%22%3A105%2C%22name%22%3A%22%E4%BC%98%E6%83%A0%E6%94%B6%E8%B4%B9%22%2C%22receivable%22%3A500%2C%22require%22%3A0%7D&billItemCheckIds=106&106=3.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A106%2C%22name%22%3A%22%E6%A3%80%E6%B5%8B%E8%B4%B9%22%2C%22receivable%22%3A300%2C%22require%22%3A1%7D
-{}
-
-[2021-08-24 14:43:08] [INFO] : ======================================================================================
-[2021-08-24 14:43:08] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listBackSkinTrucks
-{"plate": "", "number": "202108240900283", "customerName": ""}
-{}
-
-[2021-08-24 14:43:09] [INFO] : ======================================================================================
-[2021-08-24 14:43:09] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
-{"firmCode": "sy", "departmentId": 58, "keyword": ""}
-{}
-
-[2021-08-24 14:43:09] [INFO] : ======================================================================================
-[2021-08-24 14:43:09] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/backSkinWeighSave
-{"hasStoreTruck": 1, "number": "202108240900283", "outGreeterId": 223, "outGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "plate": "\u5dddA42238", "rail": 1, "tareWeight": 391, "tareWeightDate": "2021-08-24 14:43:09", "weighImgs": [], "weighId": 0, "remark": "123", "carTypeWeight": 333, "trailerNumber": "\u5dddA42238", "pathAddress": "A4-BB-6D-0A-F4-13", "bskinWithGoods": -1, "ic": "", "customerName": null, "customerId": 0, "carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66"}
+[2021-08-24 15:20:07] [INFO] : ======================================================================================
+[2021-08-24 15:20:07] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
+{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '2', 'id': 5349, 'goodsId': '5363', 'number': '202108240900321', 'modified': '2021-08-24 15:20:07', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A90810', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '', 'storeTareWeight': '', 'proveType': '665', 'grossWeight': '0', 'tareWeight': '0', 'weight': '220', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'calcDepId': '58', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '2182', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '70', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-24 15:20:05', 'remark': 'false', 'goodsTagIds': '663', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '1616', 'driverTel': '', 'grossWeightDate': '2021-08-24 15:20:04', 'tareWeightDate': '2021-08-24 15:20:04', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '测试沈阳', 'inGreeterId': '223', 'outGreeterId': '', 'sumPrice': '22000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
 {}
-[2021-08-24 14:43:09] [INFO] : ======================================================================================
-[2021-08-24 14:43:09] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
-{'rows': '10', 'page': '1', 'sort': 'et.created', 'order': 'desc', 'metadata[created]': '{"provider": "datetimeProvider", "index": 10, "field": "created"}', 'metadata[totalPrice]': '{"provider": "moneyProvider", "index": 20, "field": "totalPrice"}', 'metadata[paymentTime]': '{"provider": "datetimeProvider", "index": 30, "field": "paymentTime"}', 'metadata[type]': '{"provider": "entranceFeeBillTypeProvider", "index": 40, "field": "type"}', 'metadata[status]': '{"provider": "entranceFeeBillStateProvider", "index": 50, "field": "status"}', 'attr': 'number', 'attrValue': '202108240900283'}
+[2021-08-24 15:20:07] [INFO] : ======================================================================================
+[2021-08-24 15:20:07] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
+protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=2&id=5349&goodsId=5363&number=202108240900321&modified=2021-08-24%2015%3A20%3A05&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=4800&customerId=384&fundAccount=103101&ic=888810033081&customerName=%2A%2A%2A%2A%2A%2A&customerPhone=19010001000&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DA90810&autocomplete-cartype=003%28%E6%9D%BF%E8%BD%A6%29&carTypeName=%E6%9D%BF%E8%BD%A6&carTypeCode=003&carTypeId=53&carTypeWeight=&storeTareWeight=&proveType=665&grossWeight=0&tareWeight=0&weight=220&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%B0%B4%E6%9E%9C%E9%83%A8&calcDepId=58&dep=58&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=2182&productArea=%E9%87%8D%E5%BA%86%2C%E9%87%8D%E5%BA%86%E5%B8%82%2C%E4%B8%87%E5%B7%9E%E5%8C%BA&parentId=500100&levelType=&originId=500101&tradeTypeId=70&chargeTotalAmount=4800&chargeTotalAmountYuan=48&freezeMoneySymbol=53&comparisonFreezeAmount=53&created=2021-08-24%2015%3A20%3A05&remark=&goodsTagIds=663&marketFlag=sy&totalMoney=4800&receivable=5300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=5300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=5300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=1616&driverTel=&grossWeightDate=2021-08-24%2015%3A20%3A04&tareWeightDate=2021-08-24%2015%3A20%3A04&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=%E6%B5%8B%E8%AF%95%E6%B2%88%E9%98%B3&inGreeterId=223&outGreeterId=&sumPrice=22000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=103101&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=50.00&billItems=%7B%22discount%22%3A500%2C%22id%22%3A103%2C%22name%22%3A%22%E4%BA%A4%E6%98%93%E7%AE%A1%E7%90%86%E8%B4%B9%22%2C%22receivable%22%3A5000%2C%22require%22%3A1%7D&billItemDicCheckIds=105&billItemsDic=%7B%22discount%22%3A0%2C%22id%22%3A105%2C%22name%22%3A%22%E4%BC%98%E6%83%A0%E6%94%B6%E8%B4%B9%22%2C%22receivable%22%3A500%2C%22require%22%3A0%7D&billItemCheckIds=106&106=3.00&billItems=%7B%22discount%22%3A0%2C%22id%22%3A106%2C%22name%22%3A%22%E6%A3%80%E6%B5%8B%E8%B4%B9%22%2C%22receivable%22%3A300%2C%22require%22%3A1%7D
 {}
@@ -165,7 +165,7 @@ class test_listPage(unittest.TestCase):
         goods = "雪莲果"
         cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
         number = cre_res.json()["data"]["number"]
-        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number)
+        res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=self.ic)
         res_undo = oDU.do_undoOrder(host=self.jmsfHost,attrValue=number)
         assert res_undo.json()["code"] == "200","退款失败"
         assert res_undo.json()["message"] == "OK","退款失败"
 \ No newline at end of file