Merge remote-tracking branch 'origin/master'

wenleiming
2 parents 8ee30e52 2e47e5ce
Showing 4 changed files with 284 additions and 44 deletions
commons/api/entranceFeeBillList.py
report/test.log
testcase/test_ZC/test_ZC.py
testcase/weightBizBill/test_weighingServiceSave.py
@@ -247,9 +247,182 @@ def do_doPay(host=&quot;&quot;,autocompletecartype=None,fee_str=&quot;&quot;,**kwargs):
     res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers)
     return res
  
+def do_payOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032"):
+    a = listPage(host=host, attrName=attrName, attrValue=attrValue)
+    print("listPage", a.json())
+    orderId = a.json()["rows"][0]["id"]
+    number = a.json()["rows"][0]["number"]
+    created = a.json()["rows"][0]["created"]
+    print(orderId)
+
+    # # 订单详情获取
+
+    resOrderDetails = get_OrderDetails(host=host, orderId=orderId)
+    unitPrice = re.findall('name="unitPrice" value="(.*?)" id', resOrderDetails.text)[0]
+    goodsId = re.findall('id="goodsId" value="(.*?)">', resOrderDetails.text)[0]
+    status = re.findall('"status" name="status" value="(.*?)">', resOrderDetails.text)[0]
+    source = re.findall('id="source" name="source" value="(.*?)">', resOrderDetails.text)[0]
+    optType = re.findall('id="optType" name="optType" value="(.*?)">', resOrderDetails.text)[0]
+    correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">', resOrderDetails.text)[0]
+    weightType = re.findall('name="weightType" id="weightType" value="(.*?)">', resOrderDetails.text)[0]
+    correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">', resOrderDetails.text)[0]
+    regionId = re.findall('<option value="(.*?)" bind-name="', resOrderDetails.text)[0]
+    goodsTagIds = \
+    re.findall('<input name="goodsTagIds" type="radio" value="(.*?)" readonly  checked>', resOrderDetails.text)[0]
+    sumPrice = re.findall('<input type="hidden" name="sumPrice" value="(.*?)" id="sumPrice">', resOrderDetails.text)[0]
+    calcFeeDepId = re.findall('<input type="hidden"  name="calcFeeDepId" value="(.*?)">', resOrderDetails.text)[0]
+    tradeTypeId = \
+    re.findall('input type="hidden" class="form-control" name="tradeTypeId"  value="(.*?)" >', resOrderDetails.text)[0]
+    shareRatio = \
+    re.findall('input type="hidden" id="shareRatioVal" name="shareRatio" value="(.*?)"', resOrderDetails.text)[0]
+    regionName = re.findall('" bind-name="(.*?)"', resOrderDetails.text)[0]
+
+    # 用户信息获取
+    ic = 888810032426
+    res = get_icCheck(host=host, ic=ic)
+    print(res.text)
+    customerId = res.json()["data"]["aInfo"]["customerId"]
+    customerName = res.json()["data"]["aInfo"]["customerName"]
+    accountId = res.json()["data"]["aInfo"]["accountId"]
+    mobile = res.json()["data"]["aInfo"]["mobile"]
+
+    # 省市区获取
+    res = get_city(host=host, name="万州")
+    print(res.text)
+    originId = res.json()["suggestions"][0]["id"]
+    parentId = res.json()["suggestions"][0]["parentId"]
+    value = res.json()["suggestions"][0]["value"]
+
+    # 获取缴费金额
+    # host = "http://test.jmsf.diligrp.com:8385"
+    plate = re.findall('name="plate" class="form-control"  value="(.*?)" id="plate"', resOrderDetails.text)[0]
+    modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+    carTypeName = re.findall('name="carTypeName" id="carTypeName" value="(.*?)" ', resOrderDetails.text)[0]
+    carTypeCode = re.findall('name="carTypeCode" id="carTypeCode" value="(.*?)" ', resOrderDetails.text)[0]
+    carTypeId = re.findall('name="carTypeId" id="carTypeId" value="(.*?)" ', resOrderDetails.text)[0]
+    carTypeWeight = "333"
+    proveType = re.findall(' value="(.*?)" id="proveType" name="proveType"', resOrderDetails.text)[0]
+    proveTypeCode = proveType
+    grossWeight = re.findall('name="grossWeight"  id="grossWeight" value="(.*?)"', resOrderDetails.text)[0]
+    newWeight = re.findall('name="weight" readonly value="(.*?)" id="weight"', resOrderDetails.text)[0]
+    tareWeight = re.findall('name="tareWeight" id="tareWeight" value="(.*?)"', resOrderDetails.text)[0]
+    depName = re.findall('id="depName" name="depName" value="(.*?)"', resOrderDetails.text)[0]
+    feeDepId = re.findall('name="calcDepId" value="(.*?)"', resOrderDetails.text)[0]
+    productName = re.findall('name="productName" value="(.*?)"', resOrderDetails.text)[0]
+    productId = re.findall('id="productId" value="(.*?)"', resOrderDetails.text)[0]
+    grossWeightDate = re.findall('name="grossWeightDate" value="(.*?)"', resOrderDetails.text)[0]
+    tareWeightDate = re.findall('name="tareWeightDate" value="(.*?)"', resOrderDetails.text)[0]
+    weight = re.findall('name="weight" readonly value="(.*?)"', resOrderDetails.text)[0]
+    calcDepId = re.findall('name="calcDepId" value="(.*?)"', resOrderDetails.text)[0]
+    categoryName = "水果"
+    categoryId = "14436"
+    inGreeterName = re.findall('id="inGreeterName" value="(.*?)"', resOrderDetails.text)[0]
+    inGreeterId = re.findall('name="inGreeterId" id="inGreeterId" value="(.*?)"', resOrderDetails.text)[0]
+
+    autocompletecartype = f"{carTypeCode}({carTypeName})"
+    print(autocompletecartype)
+
+    res = get_calculateRes(host=host, autocompletecartype=autocompletecartype, optType=optType, correctInfo=correctInfo,
+                           weightType=weightType, id=orderId, goodsId=goodsId, number=number, modified=modified,
+                           status=status,
+                           source=source, correctDiscount=correctDiscount, plate=plate, carTypeName=carTypeName,
+                           carTypeCode=carTypeCode,
+                           carTypeId=carTypeId, carTypeWeight=carTypeWeight, proveType=proveType,
+                           grossWeight=grossWeight,
+                           tareWeight=tareWeight, unitPrice=unitPrice, depName=depName, productName=productName,
+                           productId=productId, originId=originId, tradeTypeId=tradeTypeId, created=created,
+                           goodsTagIds=goodsTagIds,
+                           shareRatio=shareRatio, categoryName=categoryName, categoryId=categoryId,
+                           grossWeightDate=grossWeightDate,
+                           tareWeightDate=tareWeightDate, sumPrice=sumPrice, calcDepId=calcDepId, weight=weight,
+                           inGreeterName=inGreeterName, inGreeterId=inGreeterId)
+
+    # backSkinTwo = re.findall('name="backSkinTwo" value="(.*?)" >',res.text)[0]
+    # 缴费信息
+    totalMoney = re.findall('name="totalMoney" value="(.*?)">', res.text)[0]
+    discountAmount = re.findall('name="discountAmount" value="(.*?)">', res.text)[0]
+    collectionPrice = re.findall('" name="collectionPrice" value="(.*?)">', res.text)[0]
+    handReceivableAmount = re.findall('name="handReceivableAmount" value="(.*?)">', res.text)[0]
+    correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">', res.text)[0]
+    billItemCheckIds = re.findall('" name="billItemCheckIds" value="(.*?)" ', res.text)[0]
+    billItemCheckIdsV = re.findall('" maxlength="15" data-old="(.*?)"', res.text)[0]
+    receivable = re.findall('id="creceivableLong" name="receivable" value="(.*?)">', res.text)[0]
+
+    soup = BeautifulSoup(res.text, "html.parser")
+    # 查找dl标签class为包含'ui-font-'字符的所有dl标签
+    fee_str = "correctDiscount=1&billItems=&billItemsDic="
+    fee_int = 0
+    discount_amount = 0
+    for tag in soup.findAll("div", class_="d-flex align-items-center"):
+        print("=============================================")
+        c = tag.findAll("input")
+        for i in c:
+            print(i)
+            if i.get("name") != None:
+                fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
+                if i.get("type") == "text":
+                    print("---------------- f 2 s----------------")
+                    print(i)
+                    print(i.get("value"))
+                    fee_int = fee_int + int(float(i.get("value")))
+                    print("---------------- f 2 e----------------")
+                if "优惠" in i.get("value"):
+                    discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100
+                # fee_int = fee_int+int(i.get("value"))
+    # print(fee_str)
+    # print(fee_int)
+    # print("discount_amount",discount_amount)
+    # print("discountAmount",discountAmount)
+
+    pwd = "111111"
+    id = orderId
+    totalAmount = totalMoney
+    customerPhone = mobile
+    productPrice = "1.00000"
+    dep = feeDepId
+    productArea = "重庆,重庆市,万州区"
+    chargeTotalAmount = totalMoney
+    chargeTotalAmountYuan = fee_int - int(discount_amount)
+    freezeMoneySymbol = fee_int
+    comparisonFreezeAmount = fee_int
+    modified = created
+    firmCode = "sy"
+    marketFlag = firmCode
+    collectionPrice = 0
+    itemReceivableAmount = receivable
+    receivableAmount = receivable
+    tareWeightDate = tareWeightDate
+    aa = do_doPay(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+                  weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
+                  source=source,
+                  correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
+                  fundAccount=accountId,
+                  accountId=accountId, ic=ic, customerName=customerName, customerPhone=customerPhone, plate=plate,
+                  carTypeName=carTypeName, carTypeCode=carTypeCode, carTypeId=carTypeId, carTypeWeight=carTypeWeight,
+                  proveType=proveType, grossWeight=grossWeight, tareWeight=tareWeight, weight=weight,
+                  productPrice=productPrice,
+                  unitPrice=unitPrice, depName=depName, calcDepId=calcDepId, dep=dep, regionName=regionName,
+                  regionId=regionId,
+                  productName=productName, productId=productId, productArea=productArea, originId=originId,
+                  tradeTypeId=tradeTypeId, correctInfo=correctInfo, chargeTotalAmount=chargeTotalAmount,
+                  freezeMoneySymbol=freezeMoneySymbol, comparisonFreezeAmount=comparisonFreezeAmount, modified=modified,
+                  goodsTagIds=goodsTagIds, marketFlag=marketFlag, totalMoney=totalMoney, receivable=receivable,
+                  collectionPrice=collectionPrice, discountAmount=discountAmount,
+                  handReceivableAmount=handReceivableAmount,
+                  itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
+                  categoryName=categoryName,
+                  categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
+                  sumPrice=sumPrice,
+                  chargeTotalAmountYuan=chargeTotalAmountYuan)
+
+    print(aa.text)
+    return aa
+
+do_payOrder(attrValue="202108060900035")
  
  
-a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900028")
+"""
+a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900032")
 print("listPage",a.json())
 orderId = a.json()["rows"][0]["id"]
 number = a.json()["rows"][0]["number"]
@@ -257,15 +430,12 @@ created = a.json()[&quot;rows&quot;][0][&quot;created&quot;]
 print(orderId)
  
 # # 订单详情获取
-# orderId = 3674
+
 resOrderDetails = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId)
-# print(res.text)
 unitPrice = re.findall('name="unitPrice" value="(.*?)" id',resOrderDetails.text)[0]
-
 goodsId = re.findall('id="goodsId" value="(.*?)">',resOrderDetails.text)[0]
 status = re.findall('"status" name="status" value="(.*?)">',resOrderDetails.text)[0]
 source = re.findall('id="source" name="source" value="(.*?)">',resOrderDetails.text)[0]
-
 optType = re.findall('id="optType" name="optType" value="(.*?)">',resOrderDetails.text)[0]
 correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">',resOrderDetails.text)[0]
 weightType = re.findall('name="weightType" id="weightType" value="(.*?)">',resOrderDetails.text)[0]
@@ -296,42 +466,29 @@ parentId = res.json()[&quot;suggestions&quot;][0][&quot;parentId&quot;]
 value = res.json()["suggestions"][0]["value"]
  
 # 获取缴费金额
-plate="川B00001"
 host="http://test.jmsf.diligrp.com:8385"
+plate= re.findall('name="plate" class="form-control"  value="(.*?)" id="plate"',resOrderDetails.text)[0]
 modified=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
 carTypeName= re.findall('name="carTypeName" id="carTypeName" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeCode = re.findall('name="carTypeCode" id="carTypeCode" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeId = re.findall('name="carTypeId" id="carTypeId" value="(.*?)" ',resOrderDetails.text)[0]
 carTypeWeight = "333"
-# proveTypeCode = "1621"
 proveType = re.findall(' value="(.*?)" id="proveType" name="proveType"',resOrderDetails.text)[0]
 proveTypeCode = proveType
-# grossWeight="353"
 grossWeight = re.findall('name="grossWeight"  id="grossWeight" value="(.*?)"',resOrderDetails.text)[0]
-# newWeight="20"
 newWeight = re.findall('name="weight" readonly value="(.*?)" id="weight"',resOrderDetails.text)[0]
-# tareWeight="333"
 tareWeight=re.findall('name="tareWeight" id="tareWeight" value="(.*?)"',resOrderDetails.text)[0]
-# depName="接车部"
 depName = re.findall('id="depName" name="depName" value="(.*?)"',resOrderDetails.text)[0]
-# feeDepId="103"
 feeDepId = re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0]
-# productName="雪莲果"
 productName = re.findall('name="productName" value="(.*?)"',resOrderDetails.text)[0]
-# productId="14158"
 productId=re.findall('id="productId" value="(.*?)"',resOrderDetails.text)[0]
-# grossWeightDate=created
 grossWeightDate=re.findall('name="grossWeightDate" value="(.*?)"',resOrderDetails.text)[0]
-# tareWeightDate=created
 tareWeightDate = re.findall('name="tareWeightDate" value="(.*?)"',resOrderDetails.text)[0]
-# weight=newWeight
 weight = re.findall('name="weight" readonly value="(.*?)"',resOrderDetails.text)[0]
 calcDepId=re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0]
 categoryName="水果"
 categoryId="14436"
-# inGreeterName="通用测试"
 inGreeterName = re.findall('id="inGreeterName" value="(.*?)"',resOrderDetails.text)[0]
-# inGreeterId="274"
 inGreeterId = re.findall('name="inGreeterId" id="inGreeterId" value="(.*?)"',resOrderDetails.text)[0]
  
  
@@ -371,7 +528,6 @@ for tag in soup.findAll(&quot;div&quot;, class_=&quot;d-flex align-items-center&quot;):
     c = tag.findAll("input")
     for i in c:
         print(i)
-        # print(i.get("name"))
         if i.get("name") != None:
             fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))
             if i.get("type") == "text":
@@ -422,4 +578,5 @@ aa = do_doPay(host=host,autocompletecartype=autocompletecartype,fee_str=fee_str,
               categoryId=carTypeId,grossWeightDate=grossWeightDate,tareWeightDate=tareWeightDate,sumPrice=sumPrice,
               chargeTotalAmountYuan=chargeTotalAmountYuan)
  
-print(aa.text)
 \ No newline at end of file
+print(aa.text)
+"""
 \ No newline at end of file
-[2021-08-06 15:48:12] [INFO] : ======================================================================================
-[2021-08-06 15:48:12] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sy_chen', 'password': 'VTOTPkEIxvmtuO8zWAmUxzEJRCclqyDB4PzmKnOTpX86q20urQX6IRUZPGHh4g5JDryMvrFYBWufCB9kTnOzHmN1rHx5CIpV8yR6bX0+lQAk2hFlPcZbsWoDgK31CsPr4epTirwTf3WX1lhpMh45oZCYWgaR9PctTb4vAbVJ4m0='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-06 16:26:45] [INFO] : ======================================================================================
+[2021-08-06 16:26:45] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sy_chen', 'password': 'RpLVclIKYcw4w+0W7Dy4arorr3tELiF61AMIxbZRMIl5OKQjqSmmM9GLIl+hkjpQfknMPmyM7KYE1T3/Stqfq9v48sMmfPNd4Fgie76GPU+roZT2rkAC9CXGqlsiLD/k1lzN9unVwJrtTlCnHAhzb2+JArtjfOis3t2RUax7398='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
  
-[2021-08-06 15:48:13] [INFO] : ======================================================================================
-[2021-08-06 15:48:13] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
-{'data': None, 'json': {'userName': 'sygangda', 'password': 'kflO1Y7sTjw7YW/y91OMEKKuxKDQCZHNpvL6CUTRMcYg5AJkoN+B1OJW6z5K2vHDeNiJC0+cEnZYcPYsBmFxWgVIiUjf/XAWhd2dsh1HcOQ/HK65PmUFPVOAWlMqFnmkPCgBpd8OYMYUHn6/gHqpyh+MUDi++TSDQcswcgKbY8E='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
+[2021-08-06 16:26:45] [INFO] : ======================================================================================
+[2021-08-06 16:26:45] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
+{'data': None, 'json': {'userName': 'sygangda', 'password': 'XlCvoKN1bvOWvCxcqYIxE+KwB0iiKTCqZL5by2w+jSibVOHdgsX53UY+lVad68+DRw+Qa2nvCJlzwzza3LL/YLnnqw9Ifme3X4C/zak19/4KeAFn2GB2JGbQBQLRaYyiw8l03bJbSb3iw6psYyINQN2SpbaU7CJwjHtehWyObrQ='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
  
-[2021-08-06 15:48:13] [INFO] : ======================================================================================
-[2021-08-06 15:48:13] [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': '202108060900019'}
+[2021-08-06 16:26:45] [INFO] : ======================================================================================
+[2021-08-06 16:26:45] [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': '202108060900035'}
 {}
  
-[2021-08-06 15:48:13] [INFO] : ======================================================================================
-[2021-08-06 15:48:13] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3745.action
+[2021-08-06 16:26:45] [INFO] : ======================================================================================
+[2021-08-06 16:26:45] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3761.action
 None
 {}
  
-[2021-08-06 15:48:15] [INFO] : ======================================================================================
-[2021-08-06 15:48:15] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
+[2021-08-06 16:26:47] [INFO] : ======================================================================================
+[2021-08-06 16:26:47] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
 None
 {}
  
-[2021-08-06 15:48:20] [INFO] : ======================================================================================
-[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+[2021-08-06 16:26:48] [INFO] : ======================================================================================
+[2021-08-06 16:26:48] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
 None
 {}
  
-[2021-08-06 15:48:20] [INFO] : ======================================================================================
-[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
-{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3745, 'goodsId': '3759', 'number': '202108060900019', 'modified': '2021-08-06 15:48:20', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00001', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1621', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '接车部', 'calcDepId': '103', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-06 15:47:54', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-06 15:47:54', 'tareWeightDate': '2021-08-06 15:47:54', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
+[2021-08-06 16:26:48] [INFO] : ======================================================================================
+[2021-08-06 16:26:48] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
+{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3761, 'goodsId': '3775', 'number': '202108060900035', 'modified': '2021-08-06 16:26:48', 'status': '4', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00001', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1621', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '接车部', 'calcDepId': '103', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-06 16:23:44', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-06 16:23:44', 'tareWeightDate': '2021-08-06 16:23:44', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
 {}
  
-[2021-08-06 15:48:21] [INFO] : ======================================================================================
-[2021-08-06 15:48:21] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
-protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3745&goodsId=3759&number=202108060900019&modified=2021-08-06%2015%3A47%3A54&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=800&customerId=389&fundAccount=105847&ic=888810032426&customerName=%E9%95%BF%E6%AD%8C%E4%B9%B0%E5%AE%B6%E7%9C%81%E5%86%85%E5%95%8A%E5%95%8A%E5%95%8A%E5%98%BF&customerPhone=18011501258&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DB00001&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=1621&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%8E%A5%E8%BD%A6%E9%83%A8&calcDepId=103&dep=103&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=14158&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=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-06%2015%3A47%3A54&remark=&goodsTagIds=1900&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-06%2015%3A47%3A54&tareWeightDate=2021-08-06%2015%3A47%3A54&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.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%3A1000%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-06 16:26:48] [INFO] : ======================================================================================
+[2021-08-06 16:26:48] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
+protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3761&goodsId=3775&number=202108060900035&modified=2021-08-06%2016%3A23%3A44&status=4&source=1&updateFeeItems=&correctDiscount=1&totalAmount=800&customerId=389&fundAccount=105847&ic=888810032426&customerName=%E9%95%BF%E6%AD%8C%E4%B9%B0%E5%AE%B6%E7%9C%81%E5%86%85%E5%95%8A%E5%95%8A%E5%95%8A%E5%98%BF&customerPhone=18011501258&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DB00001&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=1621&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%8E%A5%E8%BD%A6%E9%83%A8&calcDepId=103&dep=103&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=14158&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=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-06%2016%3A23%3A44&remark=&goodsTagIds=1900&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-06%2016%3A23%3A44&tareWeightDate=2021-08-06%2016%3A23%3A44&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.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%3A1000%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%3A1%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-06 16:26:49] [INFO] : ======================================================================================
+[2021-08-06 16:26:49] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
+{"businessCode": "jmsf"}
+{}
+
+[2021-08-06 16:26:49] [INFO] : ======================================================================================
+[2021-08-06 16:26:49] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
+{"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
+{}
+
+[2021-08-06 16:26:49] [INFO] : ======================================================================================
+[2021-08-06 16:26:49] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
+{"firmCode": "sy", "departmentId": 58, "keyword": ""}
+{}
+
+[2021-08-06 16:26:49] [INFO] : ======================================================================================
+[2021-08-06 16:26:49] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
+{"pageNum": 100, "pageSize": 100, "marketId": 9}
+{}
+
+[2021-08-06 16:26:49] [INFO] : ======================================================================================
+[2021-08-06 16:26:49] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+None
+{'params': {'pid': 'goods_tag'}}
+
+[2021-08-06 16:26:50] [INFO] : ======================================================================================
+[2021-08-06 16:26:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
+{"province": "C", "city": null, "area": null}
+{}
+
+[2021-08-06 16:26:50] [INFO] : ======================================================================================
+[2021-08-06 16:26:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
+{"keyword": ""}
+{}
+
+[2021-08-06 16:26:50] [INFO] : ======================================================================================
+[2021-08-06 16:26:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
+None
+{'params': {'pid': 'prove_type'}}
+
+[2021-08-06 16:26:51] [INFO] : ======================================================================================
+[2021-08-06 16:26:51] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
+None
+{}
+
+[2021-08-06 16:26:51] [INFO] : ======================================================================================
+[2021-08-06 16:26:51] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
+{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddB00001", "inGreeterId": 274, "inGreeterName": "\u901a\u7528\u6d4b\u8bd5", "productId": 14158, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 1621, "proveTypeName": "\u7eff\u8272\u852c\u83dc", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 353, "grossWeightDate": "2021-08-06 16:26:51", "newWeight": 20, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddB00001", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 103, "depName": "\u63a5\u8f66\u90e8", "cateId": 14158, "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": "9002", "tradeTypeName": "\u6c88\u96332\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 71, "id": 0, "protocolId": null, "goodsTagId": 1900}
+{}
+
+[2021-08-06 16:26:52] [INFO] : ======================================================================================
+[2021-08-06 16:26:52] [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': '202108060900037'}
+{}
+
+[2021-08-06 16:26:52] [INFO] : ======================================================================================
+[2021-08-06 16:26:52] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3763.action
+None
+{}
+
+[2021-08-06 16:26:53] [INFO] : ======================================================================================
+[2021-08-06 16:26:53] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
+None
+{}
+
+[2021-08-06 16:26:54] [INFO] : ======================================================================================
+[2021-08-06 16:26:54] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
+None
+{}
+
+[2021-08-06 16:26:54] [INFO] : ======================================================================================
+[2021-08-06 16:26:54] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
+{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3763, 'goodsId': '3777', 'number': '202108060900037', 'modified': '2021-08-06 16:26:54', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00001', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '1621', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '接车部', 'calcDepId': '103', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-06 16:26:52', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-06 16:26:52', 'tareWeightDate': '2021-08-06 16:26:52', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
+{}
+
+[2021-08-06 16:26:54] [INFO] : ======================================================================================
+[2021-08-06 16:26:54] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
+protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3763&goodsId=3777&number=202108060900037&modified=2021-08-06%2016%3A26%3A52&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=800&customerId=389&fundAccount=105847&ic=888810032426&customerName=%E9%95%BF%E6%AD%8C%E4%B9%B0%E5%AE%B6%E7%9C%81%E5%86%85%E5%95%8A%E5%95%8A%E5%95%8A%E5%98%BF&customerPhone=18011501258&payway=%E5%88%B7%E5%8D%A1&plate=%E5%B7%9DB00001&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=1621&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%8E%A5%E8%BD%A6%E9%83%A8&calcDepId=103&dep=103&regionName=A1%E5%8C%BA&regionId=72&productName=%E9%9B%AA%E8%8E%B2%E6%9E%9C&productId=14158&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=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-06%2016%3A26%3A52&remark=&goodsTagIds=1900&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=%E6%B0%B4%E6%9E%9C&categoryId=53&driverTel=&grossWeightDate=2021-08-06%2016%3A26%3A52&tareWeightDate=2021-08-06%2016%3A26%3A52&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepName=&calcFeeDepId=&feeDepId=&accountId=105847&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=10.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%3A1000%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
 {}
  
@@ -13,6 +13,7 @@ import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
+from commons.api import entranceFeeBillList as eFBL
 import time,random
  
 class test_demo(unittest.TestCase):
@@ -126,6 +127,8 @@ class test_demo(unittest.TestCase):
                                   userName="ty_test",transactionName="沈阳2号",newWeight=20,
                                   depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜")
         print(cre_res.json())
+        number = cre_res.json()["data"]["number"]
+        aa = eFBL.do_payOrder(attrValue=number)
         # cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00002",newWeight=20)
         # print(cre_res.json())
  
@@ -21,9 +21,9 @@ class test_weighingServiceSave(unittest.TestCase):
         pass
  
     def setUp(self) :
-        pass
+        we.refresh_commit_token()
  
-    # @com.mylog
+    @com.mylog
     @unittest.case_mark(my.mark())
     def test_weighingServiceSave_01(self):
         "称重服务：成功新增一条称重服务单"