Commit c27e28cd5c81ebdbc71c8bbecee567bcc0240eae

Authored by lixi
2 parents 7616f3c7 7e5da204

Merge remote-tracking branch 'origin/master'

commons/api/entranceFeeBillList/operationDoAmend.py
@@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs): @@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs):
113 url = host + "/calculate/index.action" 113 url = host + "/calculate/index.action"
114 headers = dct.urlCode() 114 headers = dct.urlCode()
115 115
116 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "", 116 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "amend", "optType": "optType", "optUrl": "",
117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId", 117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "", 118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "", 119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -144,10 +144,9 @@ def do_doAmend(host="",autocompletecartype=None,fee_str="",**kwargs): @@ -144,10 +144,9 @@ def do_doAmend(host="",autocompletecartype=None,fee_str="",**kwargs):
144 url = host + "/entranceFeeBill/doAmend.action" 144 url = host + "/entranceFeeBill/doAmend.action"
145 headers = dct.urlCode() 145 headers = dct.urlCode()
146 146
147 - # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"}  
148 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "", 147 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "amend", "optType": "0", "optUrl": "",
149 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122", 148 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
150 - "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "", 149 + "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "2",
151 "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847", 150 "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
152 "accountId": "105847", "ic": "888810032426", "customerName": "长歌买家省内啊啊啊嘿", "customerPhone": "18011501258", 151 "accountId": "105847", "ic": "888810032426", "customerName": "长歌买家省内啊啊啊嘿", "customerPhone": "18011501258",
153 "payway": "刷卡", "plate": "川B00001", "autocomplete-cartype": "003(板车)", "carTypeName": "板车", 152 "payway": "刷卡", "plate": "川B00001", "autocomplete-cartype": "003(板车)", "carTypeName": "板车",
@@ -184,7 +183,7 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -184,7 +183,7 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
184 183
185 # # 订单详情获取 184 # # 订单详情获取
186 resOrderDetails = get_orderAmend(host=host, orderId=orderId) 185 resOrderDetails = get_orderAmend(host=host, orderId=orderId)
187 - print(resOrderDetails.text) 186 + # print(resOrderDetails.text)
188 187
189 # bs取值 188 # bs取值
190 orderDetailsSoup = BeautifulSoup(resOrderDetails.text, "html.parser") 189 orderDetailsSoup = BeautifulSoup(resOrderDetails.text, "html.parser")
@@ -192,7 +191,7 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -192,7 +191,7 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
192 # 第一种取值 191 # 第一种取值
193 orderDetailsList = orderDetailsSoup.findAll("input") 192 orderDetailsList = orderDetailsSoup.findAll("input")
194 orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList} 193 orderDetailsDict = {i.get("name"): i.get("value") for i in orderDetailsList}
195 - print("orderDetailsDict",orderDetailsDict) 194 + # print("orderDetailsDict",orderDetailsDict)
196 unitPrice = orderDetailsDict["unitPrice"] 195 unitPrice = orderDetailsDict["unitPrice"]
197 regionId=orderDetailsDict["regionId"] 196 regionId=orderDetailsDict["regionId"]
198 goodsId = orderDetailsDict["goodsId"] 197 goodsId = orderDetailsDict["goodsId"]
@@ -248,12 +247,12 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -248,12 +247,12 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
248 247
249 # 省市区获取 248 # 省市区获取
250 res = eFBL.get_city(host=host, name="万州") 249 res = eFBL.get_city(host=host, name="万州")
251 - print(res.text) 250 + # print(res.text)
252 originId = res.json()["suggestions"][0]["id"] 251 originId = res.json()["suggestions"][0]["id"]
253 252
254 # # 获取缴费金额 253 # # 获取缴费金额
255 autocompletecartype = f"{carTypeCode}({carTypeName})" 254 autocompletecartype = f"{carTypeCode}({carTypeName})"
256 - print(autocompletecartype) 255 + # print(autocompletecartype)
257 modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) 256 modified = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
258 257
259 # 获取缴费金额 258 # 获取缴费金额
commons/api/entranceFeeBillList/operationDoCorrect.py
@@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs): @@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs):
113 url = host + "/calculate/index.action" 113 url = host + "/calculate/index.action"
114 headers = dct.urlCode() 114 headers = dct.urlCode()
115 115
116 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "", 116 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "correct", "optType": "optType", "optUrl": "",
117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId", 117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "", 118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "", 119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -145,10 +145,10 @@ def do_doCorrect(host="",autocompletecartype=None,fee_str="",**kwargs): @@ -145,10 +145,10 @@ def do_doCorrect(host="",autocompletecartype=None,fee_str="",**kwargs):
145 headers = dct.urlCode() 145 headers = dct.urlCode()
146 146
147 # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"} 147 # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"}
148 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "", 148 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "correct", "optType": "0", "optUrl": "",
149 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122", 149 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
150 - "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",  
151 - "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847", 150 + "modified": "2021-08-11+17:32:50", "status": "2", "source": "1", "updateFeeItems": "2",
  151 + "correctDiscount": "2", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
152 "accountId": "105847", "ic": "888810032426", "customerName": "长歌买家省内啊啊啊嘿", "customerPhone": "18011501258", 152 "accountId": "105847", "ic": "888810032426", "customerName": "长歌买家省内啊啊啊嘿", "customerPhone": "18011501258",
153 "payway": "刷卡", "plate": "川B00001", "autocomplete-cartype": "003(板车)", "carTypeName": "板车", 153 "payway": "刷卡", "plate": "川B00001", "autocomplete-cartype": "003(板车)", "carTypeName": "板车",
154 "carTypeCode": "003", "carTypeId": "53", "carTypeWeight": "333", "storeTareWeight": "", "proveType": "1621", 154 "carTypeCode": "003", "carTypeId": "53", "carTypeWeight": "333", "storeTareWeight": "", "proveType": "1621",
@@ -164,7 +164,8 @@ def do_doCorrect(host="",autocompletecartype=None,fee_str="",**kwargs): @@ -164,7 +164,8 @@ def do_doCorrect(host="",autocompletecartype=None,fee_str="",**kwargs):
164 "driverTel": "", "grossWeightDate": "2021-08-11+17:32:27", "tareWeightDate": "2021-08-11+17:32:27", 164 "driverTel": "", "grossWeightDate": "2021-08-11+17:32:27", "tareWeightDate": "2021-08-11+17:32:27",
165 "grossPathName": "", "grossPathId": "", "tarePathId": "", "goodsRemark": "备注", "inGreeterName": "通用测试", 165 "grossPathName": "", "grossPathId": "", "tarePathId": "", "goodsRemark": "备注", "inGreeterName": "通用测试",
166 "inGreeterId": "274", "outGreeterId": "", "sumPrice": "2000", "shipperName": "", "shipperId": "", 166 "inGreeterId": "274", "outGreeterId": "", "sumPrice": "2000", "shipperName": "", "shipperId": "",
167 - "shipperPhone": "", "feeDepId": "0"} 167 + "shipperPhone": "", "feeDepId": "0","bskinWithGoods":"-1","outGreeterName":"","proveTypeName":"",
  168 + "feeDepName":"","calcFeeDepId":"","backSkinTwo":"-1"}
168 169
169 data["autocomplete-cartype"] = autocompletecartype 170 data["autocomplete-cartype"] = autocompletecartype
170 data = dict(data, **kwargs) 171 data = dict(data, **kwargs)
@@ -201,7 +202,7 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -201,7 +202,7 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
201 optType = orderDetailsDict["optType"] 202 optType = orderDetailsDict["optType"]
202 correctInfo = orderDetailsDict["correctInfo"] 203 correctInfo = orderDetailsDict["correctInfo"]
203 weightType = orderDetailsDict["weightType"] 204 weightType = orderDetailsDict["weightType"]
204 - correctDiscount = orderDetailsDict["correctDiscount"] 205 + correctDiscount = "2"
205 goodsTagIds = orderDetailsDict["goodsTagIds"] 206 goodsTagIds = orderDetailsDict["goodsTagIds"]
206 sumPrice = orderDetailsDict["sumPrice"] 207 sumPrice = orderDetailsDict["sumPrice"]
207 shareRatio = orderDetailsDict["shareRatio"] 208 shareRatio = orderDetailsDict["shareRatio"]
@@ -226,6 +227,7 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -226,6 +227,7 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
226 inGreeterId = orderDetailsDict["inGreeterId"] 227 inGreeterId = orderDetailsDict["inGreeterId"]
227 productArea = orderDetailsDict["productArea"] 228 productArea = orderDetailsDict["productArea"]
228 productPrice = orderDetailsDict["productPrice"] 229 productPrice = orderDetailsDict["productPrice"]
  230 + proveTypeName = orderDetailsDict["proveTypeName"]
229 231
230 # 第二种取法 232 # 第二种取法
231 selectList = orderDetailsSoup.findAll("select") 233 selectList = orderDetailsSoup.findAll("select")
@@ -293,42 +295,29 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -293,42 +295,29 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
293 c = tag.findAll("input") 295 c = tag.findAll("input")
294 for i in c: 296 for i in c:
295 if i.get("name") != None: 297 if i.get("name") != None:
296 - print("=============1===============")  
297 - print("i", i)  
298 - print('i.get("name")---', i.get("name"))  
299 - print('i.get("value")---', i.get("value"))  
300 - print("\n")  
301 - # fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote(i.get("value"))  
302 if i.get("type") == "text": 298 if i.get("type") == "text":
303 - print('if i.get("type") == "text" i.get("name")',i.get("name"))  
304 - print('if i.get("type") == "text" i.get("value")', i.get("value"))  
305 cNum = random.randint(10,100) 299 cNum = random.randint(10,100)
306 fee_int = fee_int + int(float(i.get("value")))+cNum 300 fee_int = fee_int + int(float(i.get("value")))+cNum
307 if "billItemsDic" == i.get("name"): 301 if "billItemsDic" == i.get("name"):
308 discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100 302 discount_amount = discount_amount + int(json.loads(i.get("value"))["receivable"]) / 100
309 billItems = i.get("value") 303 billItems = i.get("value")
310 if "{" not in billItems and i.get("name") != "billItemCheckIds" and i.get("name")!="billItemDicCheckIds": 304 if "{" not in billItems and i.get("name") != "billItemCheckIds" and i.get("name")!="billItemDicCheckIds":
311 - print('if "{" not in billItems i.get("name")',i.get("name"))  
312 - print('if "{" not in billItems i.get("value")', i.get("value"))  
313 billItems = str(int(float(billItems)) + cNum) 305 billItems = str(int(float(billItems)) + cNum)
314 elif "{" in billItems and i.get("name")!="billItemsDic": 306 elif "{" in billItems and i.get("name")!="billItemsDic":
315 billItemsDict = json.loads(billItems) 307 billItemsDict = json.loads(billItems)
316 billItemsDict["receivable"] = int(billItemsDict["receivable"]) + cNum * 100 308 billItemsDict["receivable"] = int(billItemsDict["receivable"]) + cNum * 100
317 billItems = json.dumps(billItemsDict,ensure_ascii=False,separators=(',', ':')) 309 billItems = json.dumps(billItemsDict,ensure_ascii=False,separators=(',', ':'))
318 - print('i.get("name")---', i.get("name"))  
319 - print('i.get("value")---', i.get("value"))  
320 - print("billItems---", billItems)  
321 - print("type(billItems)",type(billItems))  
322 - # urllib.parse.quote_plus(str(billItems))  
323 fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote_plus(billItems) 310 fee_str = fee_str + "&" + i.get("name") + "=" + urllib.parse.quote_plus(billItems)
324 - # cNum=0  
325 - print("=============2===============\n")  
326 311
327 - print(fee_str)  
328 id = orderId 312 id = orderId
329 - totalAmount = totalMoney 313 + # totalAmount = totalMoney
  314 + totalAmount = int(fee_int)*100-int(discount_amount)*100
  315 + # print("totalAmount",totalAmount)
330 customerPhone = mobile 316 customerPhone = mobile
331 - chargeTotalAmount = totalMoney 317 + # chargeTotalAmount = totalMoney
  318 + chargeTotalAmount = totalAmount
  319 + # receivable
  320 + receivable = fee_int*100
332 chargeTotalAmountYuan = fee_int - int(discount_amount) 321 chargeTotalAmountYuan = fee_int - int(discount_amount)
333 freezeMoneySymbol = fee_int 322 freezeMoneySymbol = fee_int
334 comparisonFreezeAmount = fee_int 323 comparisonFreezeAmount = fee_int
@@ -339,7 +328,7 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -339,7 +328,7 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
339 receivableAmount = receivable 328 receivableAmount = receivable
340 tareWeightDate = tareWeightDate 329 tareWeightDate = tareWeightDate
341 330
342 - aa = do_doCorrect(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType, 331 + res = do_doCorrect(host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
343 weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status, 332 weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
344 source=source, 333 source=source,
345 correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId, 334 correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
@@ -359,11 +348,11 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -359,11 +348,11 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
359 itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount, 348 itemReceivableAmount=itemReceivableAmount, receivableAmount=receivableAmount,
360 categoryName=categoryName, 349 categoryName=categoryName,
361 categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate, 350 categoryId=carTypeId, grossWeightDate=grossWeightDate, tareWeightDate=tareWeightDate,
362 - sumPrice=sumPrice, 351 + sumPrice=sumPrice,proveTypeName=proveTypeName,
363 chargeTotalAmountYuan=chargeTotalAmountYuan) 352 chargeTotalAmountYuan=chargeTotalAmountYuan)
364 353
365 - print(aa.text)  
366 - return aa 354 + print("res.text",res.text)
  355 + print("totalAmount",totalAmount)
  356 + return res,totalAmount
367 357
368 -# time.sleep(5)  
369 -do_correctOrder(attrValue="202108130900144")  
370 \ No newline at end of file 358 \ No newline at end of file
  359 +# do_correctOrder(attrValue="202108160900001")
371 \ No newline at end of file 360 \ No newline at end of file
commons/api/entranceFeeBillList/operationDoInvalid.py
@@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs): @@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs):
113 url = host + "/calculate/index.action" 113 url = host + "/calculate/index.action"
114 headers = dct.urlCode() 114 headers = dct.urlCode()
115 115
116 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "", 116 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "invalid", "optType": "optType", "optUrl": "",
117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId", 117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "", 118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "", 119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -144,7 +144,7 @@ def do_doInvalid(host="",autocompletecartype=None,fee_str="",**kwargs): @@ -144,7 +144,7 @@ def do_doInvalid(host="",autocompletecartype=None,fee_str="",**kwargs):
144 url = host + "/entranceFeeBill/doInvalid.action" 144 url = host + "/entranceFeeBill/doInvalid.action"
145 headers = dct.urlCode() 145 headers = dct.urlCode()
146 146
147 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "", 147 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "invalid", "optType": "0", "optUrl": "",
148 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122", 148 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
149 "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "", 149 "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",
150 "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847", 150 "correctDiscount": "1", "totalAmount": "800", "customerId": "389", "fundAccount": "105847",
commons/api/entranceFeeBillList/operationDoUpdate.py
@@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs): @@ -113,7 +113,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs):
113 url = host + "/calculate/index.action" 113 url = host + "/calculate/index.action"
114 headers = dct.urlCode() 114 headers = dct.urlCode()
115 115
116 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "", 116 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "update", "optType": "optType", "optUrl": "",
117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId", 117 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "", 118 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "", 119 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
commons/api/entranceFeeBillList/operationUnfreeze.py
@@ -105,7 +105,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs): @@ -105,7 +105,7 @@ def get_calculateRes(host="",autocompletecartype=None,**kwargs):
105 url = host + "/calculate/index.action" 105 url = host + "/calculate/index.action"
106 headers = dct.urlCode() 106 headers = dct.urlCode()
107 107
108 - data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "", 108 + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "optType", "optUrl": "",
109 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId", 109 "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId",
110 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "", 110 "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "",
111 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "", 111 "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "",
@@ -135,8 +135,6 @@ def do_doUnfreeze(host="",autocompletecartype=None,fee_str="",**kwargs): @@ -135,8 +135,6 @@ def do_doUnfreeze(host="",autocompletecartype=None,fee_str="",**kwargs):
135 """进门单缴费""" 135 """进门单缴费"""
136 url = host + "/entranceTrade/doUnfreeze.action" 136 url = host + "/entranceTrade/doUnfreeze.action"
137 headers = dct.urlCode() 137 headers = dct.urlCode()
138 -  
139 - # data = {"protocolId":"","pwd":"","clientRedirectTag":"","viewType":"unfreeze","optType":"0","optUrl":"","correctInfo":"1","weightType":"1","id":"3968","goodsId":"3982","number":"202108110900122","modified":"2021-08-11+17:32:50","status":"3","source":"1","updateFeeItems":"","correctDiscount":"1","totalAmount":"800","customerId":"389","fundAccount":"105847","accountId":"105847","ic":"888810032426","customerName":"长歌买家省内啊啊啊嘿","customerPhone":"18011501258","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":"水果部","dep":"58","regionId":"72","productName":"雪莲果","productId":"14158","productArea":"重庆,重庆市,万州区","originId":"500101","tradeTypeId":"71","chargeTotalAmount":"800","chargeTotalAmountYuan":"8","freezeMoneySymbol":"13","comparisonFreezeAmount":"13","created":"2021-08-11+17:32:27","remark":"备注","goodsTagIds":"1900","shareRatio":"0","handlingTeam":"","steveTeamId":"","handlingRatio":"","handActualAmount":"0","handManageAmount":"0","handCollectionAmount":"0","marketFlag":"sy","totalMoney":"800","receivable":"1300","collectionPrice":"0","discountAmount":"500","handReceivableAmount":"0","itemReceivableAmount":"1300","receivableAmount":"1300","categoryName":"水果","categoryId":"14436","driverTel":"","grossWeightDate":"2021-08-11+17:32:27","tareWeightDate":"2021-08-11+17:32:27","grossPathName":"","grossPathId":"","tarePathId":"","goodsRemark":"备注","inGreeterName":"通用测试","inGreeterId":"274","outGreeterId":"","sumPrice":"2000","shipperName":"","shipperId":"","shipperPhone":"","feeDepId":"0"}  
140 data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "", 138 data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "unfreeze", "optType": "0", "optUrl": "",
141 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122", 139 "correctInfo": "1", "weightType": "1", "id": "3968", "goodsId": "3982", "number": "202108110900122",
142 "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "", 140 "modified": "2021-08-11+17:32:50", "status": "3", "source": "1", "updateFeeItems": "",
commons/api/hpApi.py
@@ -70,7 +70,7 @@ def do_backSkinWeighSave(host="",number=None,userName=None): @@ -70,7 +70,7 @@ def do_backSkinWeighSave(host="",number=None,userName=None):
70 carTypeId=carTypeId,carTypeName=carTypeName,tareWeightDate=tareWeightDate, 70 carTypeId=carTypeId,carTypeName=carTypeName,tareWeightDate=tareWeightDate,
71 outGreeterId=outGreeterId,outGreeterName=outGreeterName) 71 outGreeterId=outGreeterId,outGreeterName=outGreeterName)
72 print(res_HP.json()) 72 print(res_HP.json())
73 - return res_HP 73 + return res_HP,tareWeight
74 74
75 75
76 76
report/test.log
1 -[2021-08-13 18:44:25] [INFO] : ======================================================================================  
2 -[2021-08-13 18:44:25] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb  
3 -{'data': None, 'json': {'userName': 'sy_chen', 'password': 'gQfSv4XB0l69pfGI1Agdm1jjPXpmA0rk95Qij6gOzAGWCB8tVLWUVtVAr5MTclFKRRBSLlst/UbQHT8bEtXOOs1rc8RMt1ris4a9m4B2KIE2xqK2ja59mueSGUF93lr3LMgcaK7peKzrS+WBcge4rvpqv0iJe0xty+8qnDewNjU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}} 1 +[2021-08-16 15:10:33] [INFO] : ======================================================================================
  2 +[2021-08-16 15:10:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  3 +{'data': None, 'json': {'userName': 'sy_chen', 'password': 'EFQkrmRJoJ6LdeaAl1gEsYb/iArRAvwFJcpLKHrKlU2280lYhdxeSPkrxxlbUcaSKvQfNNoOXEiNW9YnsgYZtSoNtqEjOAJKNXPAw/6UG/MxOl6NwzNiQrXVJ587MosqW7wmloUZ5pGLz7EY+oNtBN4UgHHCP9NO2i5MSKbRcuM='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
4 4
5 -[2021-08-13 18:44:25] [INFO] : ======================================================================================  
6 -[2021-08-13 18:44:25] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb  
7 -{'data': None, 'json': {'userName': 'sygangda', 'password': 'Z0FZQCgEp9dET3kQq3ev9eqDCVPwKvL+U7k5xf9Tj/8hhMltRK2ZhfvUZlP26cuJJ/sIfac6pDYL7LSXfMfooMmbzRn3FU94le7w8Qb/h8PBKjnca82cp7x9zU71vqZfG5wqqnMST0BqCtOHn/LcMeMR054Czl6oUyf2nsWl0Ww='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}} 5 +[2021-08-16 15:10:33] [INFO] : ======================================================================================
  6 +[2021-08-16 15:10:33] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  7 +{'data': None, 'json': {'userName': 'sygangda', 'password': 'Z4guFblVxIfgFAzI4jcAFrIq/ERjbS1nQX2ZvfuP87kV5imfCsa4FURuEo0PEalYWsJlw/S+0vBgUbv4ovxFwOm0sDnPdL+PV/3gt5zeMHl2k8rriSCA3RZYc8AFYOrKj5K5Bc6Zr/bzki2FzVUP24T2x8XiGUglOgrgNBEO950='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
8 8
9 -[2021-08-13 18:44:25] [INFO] : ======================================================================================  
10 -[2021-08-13 18:44:25] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action  
11 -{'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': '202108130900144'} 9 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  10 +[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
  11 +{'provider': 'carTypeForJmsfProvider'}
12 {} 12 {}
13 13
14 -[2021-08-13 18:44:26] [INFO] : ======================================================================================  
15 -[2021-08-13 18:44:26] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/correct/4224.action 14 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  15 +[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
  16 +{'provider': 'categoryProvider'}
  17 +{}
  18 +
  19 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  20 +[2021-08-16 15:10:34] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  21 +None
  22 +{'params': {'keyword': ''}}
  23 +
  24 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  25 +[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
  26 +{'provider': 'entranceFeeBillTypeProvider'}
  27 +{}
  28 +
  29 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  30 +[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
  31 +{'provider': 'entranceFeeBillStateProvider'}
  32 +{}
  33 +
  34 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  35 +[2021-08-16 15:10:34] [INFO] : http://test.jmsf.diligrp.com:8385/provider/getLookupList.action
  36 +{'provider': 'tradeTypeProvider'}
  37 +{}
  38 +
  39 +[2021-08-16 15:10:34] [INFO] : ======================================================================================
  40 +[2021-08-16 15:10:34] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
  41 +{"businessCode": "jmsf"}
  42 +{}
  43 +
  44 +[2021-08-16 15:10:35] [INFO] : ======================================================================================
  45 +[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  46 +{"marketId": 9, "state": 1, "keyword": "\u96ea\u83b2\u679c"}
  47 +{}
  48 +
  49 +[2021-08-16 15:10:35] [INFO] : ======================================================================================
  50 +[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
  51 +{"firmCode": "sy", "departmentId": 58, "keyword": ""}
  52 +{}
  53 +
  54 +[2021-08-16 15:10:35] [INFO] : ======================================================================================
  55 +[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
  56 +{"pageNum": 100, "pageSize": 100, "marketId": 9}
  57 +{}
  58 +
  59 +[2021-08-16 15:10:35] [INFO] : ======================================================================================
  60 +[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  61 +None
  62 +{'params': {'pid': 'goods_tag'}}
  63 +
  64 +[2021-08-16 15:10:35] [INFO] : ======================================================================================
  65 +[2021-08-16 15:10:35] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
  66 +{"province": "C", "city": null, "area": null}
  67 +{}
  68 +
  69 +[2021-08-16 15:10:36] [INFO] : ======================================================================================
  70 +[2021-08-16 15:10:36] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  71 +None
  72 +{'params': {'keyword': ''}}
  73 +
  74 +[2021-08-16 15:10:36] [INFO] : ======================================================================================
  75 +[2021-08-16 15:10:36] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  76 +None
  77 +{'params': {'pid': 'prove_type'}}
  78 +
  79 +[2021-08-16 15:10:37] [INFO] : ======================================================================================
  80 +[2021-08-16 15:10:37] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
  81 +None
  82 +{}
  83 +
  84 +[2021-08-16 15:10:37] [INFO] : ======================================================================================
  85 +[2021-08-16 15:10:37] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
  86 +{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA75326", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14158, "productName": "\u96ea\u83b2\u679c", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 432, "grossWeightDate": "2021-08-16 15:10:37", "newWeight": 99, "tareWeight": 333, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA75326", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\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": "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}
  87 +{}
  88 +
  89 +[2021-08-16 15:10:37] [INFO] : ======================================================================================
  90 +[2021-08-16 15:10:37] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
  91 +{'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': '202108160900059'}
  92 +{}
  93 +
  94 +[2021-08-16 15:10:38] [INFO] : ======================================================================================
  95 +[2021-08-16 15:10:38] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/4283.action
  96 +None
  97 +{}
  98 +
  99 +[2021-08-16 15:10:39] [INFO] : ======================================================================================
  100 +[2021-08-16 15:10:39] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426
16 None 101 None
17 {} 102 {}
18 103
19 -[2021-08-13 18:44:27] [INFO] : ======================================================================================  
20 -[2021-08-13 18:44:27] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州 104 +[2021-08-16 15:10:40] [INFO] : ======================================================================================
  105 +[2021-08-16 15:10:40] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
21 None 106 None
22 {} 107 {}
23 108
24 -[2021-08-13 18:44:27] [INFO] : ======================================================================================  
25 -[2021-08-13 18:44:27] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action  
26 -{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 4224, 'goodsId': '4238', 'number': '202108130900144', 'modified': '2021-08-13 18:44:27', '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': '1895', 'grossWeight': '353', 'tareWeight': '333', 'weight': '20', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'regionName': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '80', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-13 16:52:59', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '青笋', 'categoryId': '53', 'driverTel': '', 'grossWeightDate': '2021-08-13 16:52:59', 'tareWeightDate': '2021-08-13 16:52:59', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': ''} 109 +[2021-08-16 15:10:40] [INFO] : ======================================================================================
  110 +[2021-08-16 15:10:40] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action
  111 +{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 4283, 'goodsId': '4297', 'number': '202108160900059', 'modified': '2021-08-16 15:10:40', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'accountId': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川A75326', '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': '', 'regionId': '0', 'productName': '雪莲果', 'productId': '14158', 'productArea': '重庆,重庆市,万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '70', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-16 15:10:37', 'remark': 'false', 'goodsTagIds': '663', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-16 15:10:37', 'tareWeightDate': '2021-08-16 15:10:37', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '测试沈阳', 'inGreeterId': '223', 'outGreeterId': '', 'sumPrice': '9900', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''}
  112 +{}
  113 +
  114 +[2021-08-16 15:10:41] [INFO] : ======================================================================================
  115 +[2021-08-16 15:10:41] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action
  116 +protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=4283&goodsId=4297&number=202108160900059&modified=2021-08-16%2015%3A10%3A37&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%9DA75326&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=&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=70&chargeTotalAmount=800&chargeTotalAmountYuan=8&freezeMoneySymbol=13&comparisonFreezeAmount=13&created=2021-08-16%2015%3A10%3A37&remark=&goodsTagIds=663&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-16%2015%3A10%3A37&tareWeightDate=2021-08-16%2015%3A10%3A37&grossPathName=&grossPathId=&tarePathId=&goodsRemark=&inGreeterName=&inGreeterId=0&outGreeterId=&sumPrice=9900&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
  117 +{}
  118 +
  119 +[2021-08-16 15:10:46] [INFO] : ======================================================================================
  120 +[2021-08-16 15:10:46] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
  121 +{'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': '202108160900059'}
27 {} 122 {}
28 123
29 -[2021-08-13 18:44:28] [INFO] : ======================================================================================  
30 -[2021-08-13 18:44:28] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/doCorrect.action  
31 -protocolId=&pwd=111111&clientRedirectTag=&viewType=unfreeze&optType=0&optUrl=&correctInfo=1&weightType=1&id=4224&goodsId=4238&number=202108130900144&modified=2021-08-13%2016%3A52%3A59&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=900&customerId=&fundAccount=&accountId=&ic=&customerName=&customerPhone=&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=1895&grossWeight=353&tareWeight=333&weight=20&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=%E6%B0%B4%E6%9E%9C%E9%83%A8&dep=58&regionId=&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&originId=500101&tradeTypeId=80&chargeTotalAmount=800&chargeTotalAmountYuan=164&freezeMoneySymbol=169&comparisonFreezeAmount=169&created=2021-08-13%2016%3A52%3A59&remark=%E5%A4%87%E6%B3%A8&goodsTagIds=1900&shareRatio=0&handlingTeam=&steveTeamId=&handlingRatio=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&marketFlag=sy&totalMoney=800&receivable=1300&collectionPrice=0&discountAmount=500&handReceivableAmount=0&itemReceivableAmount=1300&receivableAmount=1300&categoryName=%E9%9D%92%E7%AC%8B&categoryId=53&driverTel=&grossWeightDate=2021-08-13%2016%3A52%3A59&tareWeightDate=2021-08-13%2016%3A52%3A59&grossPathName=&grossPathId=&tarePathId=&goodsRemark=%E5%A4%87%E6%B3%A8&inGreeterName=%E9%80%9A%E7%94%A8%E6%B5%8B%E8%AF%95&inGreeterId=274&outGreeterId=&sumPrice=2000&shipperName=&shipperId=&shipperPhone=&feeDepId=0&correctDiscount=1&billItems=&billItemsDic=&billItemCheckIds=103&103=106&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%3A10600%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=63&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%3A6300%2C%22require%22%3A1%7D 124 +[2021-08-16 15:10:46] [INFO] : ======================================================================================
  125 +[2021-08-16 15:10:46] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action
  126 +{'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', 'startPayTime': '2021-08-16 15:10:44', 'endPayTime': '2021-08-16 15:10:44'}
32 {} 127 {}
33 128
testcase/test_HP/test_HP.py
@@ -38,12 +38,12 @@ class test_ZCCreate(unittest.TestCase): @@ -38,12 +38,12 @@ class test_ZCCreate(unittest.TestCase):
38 38
39 def test_hp(self): 39 def test_hp(self):
40 plate = f"川B{random.randint(10000,99999)}" 40 plate = f"川B{random.randint(10000,99999)}"
41 - goods="火龙果" 41 + goods = "雪莲果"
42 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods) 42 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
43 print(cre_res.json()) 43 print(cre_res.json())
44 number = cre_res.json()["data"]["number"] 44 number = cre_res.json()["data"]["number"]
45 aa = eFBL.do_freezeOrder(host=self.jmsfHost,attrValue=number) 45 aa = eFBL.do_freezeOrder(host=self.jmsfHost,attrValue=number)
46 - res = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number) 46 + res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
47 assert res.json()["code"]=="200","回皮失败" 47 assert res.json()["code"]=="200","回皮失败"
48 assert "data" in res.text,"回皮失败" 48 assert "data" in res.text,"回皮失败"
49 49
testcase/test_ZC/demo.py
@@ -14,12 +14,11 @@ import random @@ -14,12 +14,11 @@ import random
14 # a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId"] 14 # a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId"]
15 # b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","calcDepId","dep","regionName","regionId","productName","productId","productArea","parentId","levelType","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"] 15 # b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","calcDepId","dep","regionName","regionId","productName","productId","productArea","parentId","levelType","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
16 16
17 -""" 17 +
18 # a系统 18 # a系统
19 -a = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveTypeName","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","backSkinTwo","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","bskinWithGoods","goodsRemark","inGreeterName","inGreeterId","outGreeterName","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"] 19 +a =["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveTypeName","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","backSkinTwo","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","bskinWithGoods","goodsRemark","inGreeterName","inGreeterId","outGreeterName","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepName","calcFeeDepId","feeDepId"]
20 # b自己 20 # b自己
21 -b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems"]  
22 - 21 +b = ["protocolId","pwd","clientRedirectTag","viewType","optType","optUrl","correctInfo","weightType","id","goodsId","number","modified","status","source","updateFeeItems","correctDiscount","totalAmount","customerId","fundAccount","accountId","ic","customerName","customerPhone","payway","plate","autocomplete-cartype","carTypeName","carTypeCode","carTypeId","carTypeWeight","storeTareWeight","proveType","grossWeight","tareWeight","weight","goodsNum","itemWeight","productPrice","unitPrice","depName","dep","regionId","productName","productId","productArea","originId","tradeTypeId","chargeTotalAmount","chargeTotalAmountYuan","freezeMoneySymbol","comparisonFreezeAmount","created","remark","goodsTagIds","shareRatio","handlingTeam","steveTeamId","handlingRatio","handActualAmount","handManageAmount","handCollectionAmount","marketFlag","totalMoney","receivable","collectionPrice","discountAmount","handReceivableAmount","itemReceivableAmount","receivableAmount","categoryName","categoryId","driverTel","grossWeightDate","tareWeightDate","grossPathName","grossPathId","tarePathId","goodsRemark","inGreeterName","inGreeterId","outGreeterId","sumPrice","shipperName","shipperId","shipperPhone","feeDepId","correctDiscount","billItems","billItemsDic","billItemCheckIds","103","billItems","billItemDicCheckIds","billItemsDic","billItemCheckIds","106","billItems"]
23 c = list(set(a)^set(b)) 22 c = list(set(a)^set(b))
24 # print(c) 23 # print(c)
25 24
@@ -34,7 +33,7 @@ for i in c: @@ -34,7 +33,7 @@ for i in c:
34 33
35 print(aa) 34 print(aa)
36 print(bb) 35 print(bb)
37 -""" 36 +
38 37
39 from bs4 import BeautifulSoup 38 from bs4 import BeautifulSoup
40 import random 39 import random
@@ -49,5 +48,5 @@ import json @@ -49,5 +48,5 @@ import json
49 # print(selectDict) 48 # print(selectDict)
50 49
51 50
52 -a = "123"  
53 -print(a.isdigit())  
54 \ No newline at end of file 51 \ No newline at end of file
  52 +# a = "123"
  53 +# print(a.isdigit())
55 \ No newline at end of file 54 \ No newline at end of file
testcase/test_listPage/test_listPageOperation.py
@@ -13,6 +13,7 @@ import unittest @@ -13,6 +13,7 @@ import unittest
13 from commons.scripts.readConf import rC 13 from commons.scripts.readConf import rC
14 from commons.api import zcApi as zcA 14 from commons.api import zcApi as zcA
15 from commons.api import sjApi 15 from commons.api import sjApi
  16 +from commons.api import hpApi
16 from commons.api.entranceFeeBillList import operationUnfreeze as eOp 17 from commons.api.entranceFeeBillList import operationUnfreeze as eOp
17 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL 18 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
18 from commons.api.entranceFeeBillList import operationDoInvalid as oDI 19 from commons.api.entranceFeeBillList import operationDoInvalid as oDI
@@ -21,7 +22,7 @@ from commons.api.entranceFeeBillList import operationDoAmend as oDA @@ -21,7 +22,7 @@ from commons.api.entranceFeeBillList import operationDoAmend as oDA
21 import random 22 import random
22 23
23 class test_listPage(unittest.TestCase): 24 class test_listPage(unittest.TestCase):
24 - """进门单列表:attr进门单属性查询测试""" 25 + """进门单列表:进门但操作测试测试"""
25 def setUp(self) -> None: 26 def setUp(self) -> None:
26 pass 27 pass
27 28
@@ -39,6 +40,7 @@ class test_listPage(unittest.TestCase): @@ -39,6 +40,7 @@ class test_listPage(unittest.TestCase):
39 pass 40 pass
40 41
41 def test_orderView(self): 42 def test_orderView(self):
  43 + """进门单列表-操作:查看进门单详情测试"""
42 res = zcA.create_jmsf(host=self.gatewayHost) 44 res = zcA.create_jmsf(host=self.gatewayHost)
43 orderId = res.json()["data"]["id"] 45 orderId = res.json()["data"]["id"]
44 number = res.json()["data"]["number"] 46 number = res.json()["data"]["number"]
@@ -46,6 +48,7 @@ class test_listPage(unittest.TestCase): @@ -46,6 +48,7 @@ class test_listPage(unittest.TestCase):
46 assert str(number) in res.text,"获取订单详情查询失败" 48 assert str(number) in res.text,"获取订单详情查询失败"
47 49
48 def test_doPayCZ(self): 50 def test_doPayCZ(self):
  51 + """进门单列表-操作:整车进门交费测试"""
49 plate = f"川A{random.randint(10000,99999)}" 52 plate = f"川A{random.randint(10000,99999)}"
50 goods = "雪莲果" 53 goods = "雪莲果"
51 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods) 54 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
@@ -56,6 +59,7 @@ class test_listPage(unittest.TestCase): @@ -56,6 +59,7 @@ class test_listPage(unittest.TestCase):
56 assert res_pay.json()["message"] == "OK", "缴费失败" 59 assert res_pay.json()["message"] == "OK", "缴费失败"
57 60
58 def test_doPaySJ(self): 61 def test_doPaySJ(self):
  62 + """进门单列表-操作:散件进门交费测试"""
59 plate = f"川A{random.randint(10000,99999)}" 63 plate = f"川A{random.randint(10000,99999)}"
60 goods = "雪莲果" 64 goods = "雪莲果"
61 cre_res = sjApi.create_sj(host=self.gatewayHost,plate=plate,keyword=goods) 65 cre_res = sjApi.create_sj(host=self.gatewayHost,plate=plate,keyword=goods)
@@ -65,17 +69,27 @@ class test_listPage(unittest.TestCase): @@ -65,17 +69,27 @@ class test_listPage(unittest.TestCase):
65 assert res_pay.json()["code"]=="200","缴费失败" 69 assert res_pay.json()["code"]=="200","缴费失败"
66 assert res_pay.json()["message"] == "OK", "缴费失败" 70 assert res_pay.json()["message"] == "OK", "缴费失败"
67 71
68 - def test_doPaySJ(self): 72 + def test_unfreezeOrderInfo(self):
  73 + """进门单列表-操作:散件进门交费测试"""
69 plate = f"川A{random.randint(10000,99999)}" 74 plate = f"川A{random.randint(10000,99999)}"
70 goods = "雪莲果" 75 goods = "雪莲果"
71 - cre_res = sjApi.create_sj(host=self.gatewayHost,plate=plate,keyword=goods) 76 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
72 print(cre_res.json()) 77 print(cre_res.json())
73 number = cre_res.json()["data"]["number"] 78 number = cre_res.json()["data"]["number"]
74 - res_pay = eFBL.do_payOrder(host=self.jmsfHost,attrValue=number) 79 + res_pay = eFBL.do_freezeOrder(host=self.jmsfHost,attrValue=number)
75 assert res_pay.json()["code"]=="200","缴费失败" 80 assert res_pay.json()["code"]=="200","缴费失败"
76 assert res_pay.json()["message"] == "OK", "缴费失败" 81 assert res_pay.json()["message"] == "OK", "缴费失败"
  82 + res,tareWeight = hpApi.do_backSkinWeighSave(host=self.gatewayHost,number=number)
  83 + assert res.json()["code"]=="200","回皮失败"
  84 + assert "data" in res.text,"回皮失败"
  85 + resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
  86 + print(resListPage.json())
  87 + assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
  88 + assert resListPage.json()["rows"][0]["tareWeight"] == tareWeight,"按照收费单号查询失败"
  89 +
77 90
78 def test_freezeOrder(self): 91 def test_freezeOrder(self):
  92 + """进门单列表-操作:整车进门冻结测试"""
79 plate = f"川A{random.randint(10000,99999)}" 93 plate = f"川A{random.randint(10000,99999)}"
80 goods = "雪莲果" 94 goods = "雪莲果"
81 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods) 95 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
@@ -86,6 +100,7 @@ class test_listPage(unittest.TestCase): @@ -86,6 +100,7 @@ class test_listPage(unittest.TestCase):
86 assert res_pay.json()["message"] == "OK", "冻结失败" 100 assert res_pay.json()["message"] == "OK", "冻结失败"
87 101
88 def test_unfreezeOrder(self): 102 def test_unfreezeOrder(self):
  103 + """进门单列表-操作:整车进门解冻测试"""
89 plate = f"川A{random.randint(10000,99999)}" 104 plate = f"川A{random.randint(10000,99999)}"
90 goods = "雪莲果" 105 goods = "雪莲果"
91 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods) 106 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
@@ -97,6 +112,7 @@ class test_listPage(unittest.TestCase): @@ -97,6 +112,7 @@ class test_listPage(unittest.TestCase):
97 assert res_unfreezeOrder.json()["message"] == "OK", "解冻失败" 112 assert res_unfreezeOrder.json()["message"] == "OK", "解冻失败"
98 113
99 def test_invalidOrder(self): 114 def test_invalidOrder(self):
  115 + """进门单列表-操作:整车进门作废测试"""
100 plate = f"川A{random.randint(10000,99999)}" 116 plate = f"川A{random.randint(10000,99999)}"
101 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate) 117 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
102 print(cre_res.json()) 118 print(cre_res.json())
@@ -106,19 +122,25 @@ class test_listPage(unittest.TestCase): @@ -106,19 +122,25 @@ class test_listPage(unittest.TestCase):
106 assert res_unfreezeOrder.json()["message"] == "作废成功!", "作废测试失败" 122 assert res_unfreezeOrder.json()["message"] == "作废成功!", "作废测试失败"
107 123
108 def test_correctOrder(self): 124 def test_correctOrder(self):
  125 + """进门单列表-操作:整车进门更正测试"""
109 plate = f"川A{random.randint(10000,99999)}" 126 plate = f"川A{random.randint(10000,99999)}"
110 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate) 127 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
111 print(cre_res.json()) 128 print(cre_res.json())
112 number = cre_res.json()["data"]["number"] 129 number = cre_res.json()["data"]["number"]
113 - res_unfreezeOrder = oDC.do_correctOrder(host=self.jmsfHost,attrValue=number) 130 + res_unfreezeOrder,totalAmount = oDC.do_correctOrder(host=self.jmsfHost,attrValue=number)
114 assert res_unfreezeOrder.json()["success"]==True,"作废测试失败" 131 assert res_unfreezeOrder.json()["success"]==True,"作废测试失败"
115 assert res_unfreezeOrder.json()["msg"] == "操作成功", "作废测试失败" 132 assert res_unfreezeOrder.json()["msg"] == "操作成功", "作废测试失败"
  133 + resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
  134 + print(resListPage.json())
  135 + assert resListPage.json()["rows"][0]["number"] == number,"按照收费单号查询失败"
  136 + assert resListPage.json()["rows"][0]["$_totalPrice"] == totalAmount,"按照收费单号查询失败"
116 137
117 def test_amendOrder(self): 138 def test_amendOrder(self):
  139 + """进门单列表-操作:整车进门修正测试"""
118 plate = f"川A{random.randint(10000,99999)}" 140 plate = f"川A{random.randint(10000,99999)}"
119 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate) 141 cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate)
120 print(cre_res.json()) 142 print(cre_res.json())
121 number = cre_res.json()["data"]["number"] 143 number = cre_res.json()["data"]["number"]
122 res_unfreezeOrder = oDA.do_amendOrder(host=self.jmsfHost,attrValue=number) 144 res_unfreezeOrder = oDA.do_amendOrder(host=self.jmsfHost,attrValue=number)
123 - assert res_unfreezeOrder.json()["success"]==True,"作废测试失败"  
124 - assert res_unfreezeOrder.json()["message"] == "操作成功", "作废测试失败" 145 + assert res_unfreezeOrder.json()["success"]==True,"更正操作失败"
  146 + assert res_unfreezeOrder.json()["message"] == "操作成功", "更正操作失败"
testcase/test_listPage/test_searchByAttrName.py
@@ -40,9 +40,9 @@ class test_listPage(unittest.TestCase): @@ -40,9 +40,9 @@ class test_listPage(unittest.TestCase):
40 40
41 def test_searchByNumber(self): 41 def test_searchByNumber(self):
42 """进门单列表-查询:收费单号查询测试""" 42 """进门单列表-查询:收费单号查询测试"""
43 - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",  
44 - userName="ty_test",transactionName="沈阳2号",newWeight=20,  
45 - depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") 43 + plate = f"川A{random.randint(10000, 99999)}"
  44 + goods = "雪莲果"
  45 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
46 number = cre_res.json()["data"]["number"] 46 number = cre_res.json()["data"]["number"]
47 resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number) 47 resListPage = eFBL.listPage(host=self.jmsfHost,attrValue=number)
48 print(resListPage.json()) 48 print(resListPage.json())
@@ -51,11 +51,9 @@ class test_listPage(unittest.TestCase): @@ -51,11 +51,9 @@ class test_listPage(unittest.TestCase):
51 51
52 def test_searchByPlate(self): 52 def test_searchByPlate(self):
53 """进门单列表-查询:车牌号查询测试""" 53 """进门单列表-查询:车牌号查询测试"""
54 - plate = f"川A{random.randint(10000,99999)}"  
55 - print("create plate number: ",plate)  
56 - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate=plate,keyword="雪莲果",  
57 - userName="ty_test",transactionName="沈阳2号",newWeight=20,  
58 - depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") 54 + plate = f"川A{random.randint(10000, 99999)}"
  55 + goods = "雪莲果"
  56 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
59 resListPage = eFBL.listPage(host=self.jmsfHost,attrName="车号",attrValue=plate) 57 resListPage = eFBL.listPage(host=self.jmsfHost,attrName="车号",attrValue=plate)
60 print(resListPage.json()) 58 print(resListPage.json())
61 assert resListPage.json()["rows"][0]["plate"] == plate,"按照车牌号查询失败" 59 assert resListPage.json()["rows"][0]["plate"] == plate,"按照车牌号查询失败"
@@ -70,11 +68,11 @@ class test_listPage(unittest.TestCase): @@ -70,11 +68,11 @@ class test_listPage(unittest.TestCase):
70 68
71 def test_searchByTollman(self): 69 def test_searchByTollman(self):
72 """进门单列表-查询:收费员查询测试""" 70 """进门单列表-查询:收费员查询测试"""
73 - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",  
74 - userName="ty_test",transactionName="沈阳2号",newWeight=20,  
75 - depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") 71 + plate = f"川A{random.randint(10000, 99999)}"
  72 + goods = "雪莲果"
  73 + userName = "ty_test"
  74 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods,userName=userName)
76 number = cre_res.json()["data"]["number"] 75 number = cre_res.json()["data"]["number"]
77 -  
78 # 进门单缴费 76 # 进门单缴费
79 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number) 77 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number)
80 payUser = my.userInfo["data"]["user"]["realName"] 78 payUser = my.userInfo["data"]["user"]["realName"]
@@ -93,11 +91,10 @@ class test_listPage(unittest.TestCase): @@ -93,11 +91,10 @@ class test_listPage(unittest.TestCase):
93 ic = self.ic 91 ic = self.ic
94 cName = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"] 92 cName = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerName"]
95 # 创建进门单 93 # 创建进门单
96 - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",  
97 - userName="ty_test",transactionName="沈阳2号",newWeight=20,  
98 - depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") 94 + plate = f"川A{random.randint(10000, 99999)}"
  95 + goods = "雪莲果"
  96 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
99 number = cre_res.json()["data"]["number"] 97 number = cre_res.json()["data"]["number"]
100 -  
101 # 进门单缴费 98 # 进门单缴费
102 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic) 99 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
103 resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户姓名",attrValue=cName) 100 resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户姓名",attrValue=cName)
@@ -113,12 +110,10 @@ class test_listPage(unittest.TestCase): @@ -113,12 +110,10 @@ class test_listPage(unittest.TestCase):
113 """进门单列表-查询:客户卡号查询测试""" 110 """进门单列表-查询:客户卡号查询测试"""
114 ic = self.ic 111 ic = self.ic
115 # 创建进门单 112 # 创建进门单
116 - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",  
117 - userName="ty_test",transactionName="沈阳2号",newWeight=20,  
118 - depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") 113 + plate = f"川A{random.randint(10000, 99999)}"
  114 + goods = "雪莲果"
  115 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
119 number = cre_res.json()["data"]["number"] 116 number = cre_res.json()["data"]["number"]
120 -  
121 - # 进门单缴费  
122 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic) 117 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
123 resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户卡号",attrValue=ic) 118 resListPage = eFBL.listPage(host=self.jmsfHost,attrName="客户卡号",attrValue=ic)
124 print(resListPage.json()) 119 print(resListPage.json())
@@ -134,9 +129,9 @@ class test_listPage(unittest.TestCase): @@ -134,9 +129,9 @@ class test_listPage(unittest.TestCase):
134 ic = self.ic 129 ic = self.ic
135 cPhone = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerContactsPhone"] 130 cPhone = eFBL.get_icCheck(host=self.jmsfHost,ic=ic).json()["data"]["aInfo"]["customerContactsPhone"]
136 # 创建进门单并缴费 131 # 创建进门单并缴费
137 - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="板车",plate="川B00001",keyword="雪莲果",  
138 - userName="ty_test",transactionName="沈阳2号",newWeight=20,  
139 - depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") 132 + plate = f"川A{random.randint(10000, 99999)}"
  133 + goods = "雪莲果"
  134 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
140 number = cre_res.json()["data"]["number"] 135 number = cre_res.json()["data"]["number"]
141 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic) 136 eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
142 # 查询进门单 137 # 查询进门单
testcase/test_listPage/test_searchByOther.py
@@ -63,7 +63,7 @@ class test_listPage(unittest.TestCase): @@ -63,7 +63,7 @@ class test_listPage(unittest.TestCase):
63 assert self.carType["text"]==carTypeList[0],"车型查询失败查询失败" 63 assert self.carType["text"]==carTypeList[0],"车型查询失败查询失败"
64 64
65 def test_searchBycategory(self): 65 def test_searchBycategory(self):
66 - """进门单列表-查询:收费单号查询测试""" 66 + """进门单列表-查询:品类查询测试"""
67 goods="雪莲果" 67 goods="雪莲果"
68 categoryId = "14436" 68 categoryId = "14436"
69 cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=goods) 69 cre_res = zcA.create_jmsf(host=self.gatewayHost,keyword=goods)
@@ -73,7 +73,7 @@ class test_listPage(unittest.TestCase): @@ -73,7 +73,7 @@ class test_listPage(unittest.TestCase):
73 assert resListPage.json()["rows"][0]["number"] == number,"车型查询失败查询失败" 73 assert resListPage.json()["rows"][0]["number"] == number,"车型查询失败查询失败"
74 74
75 def test_searchByProductName(self): 75 def test_searchByProductName(self):
76 - """进门单列表-查询:收费单号查询测试""" 76 + """进门单列表-查询:商品查询测试"""
77 productName = "蔬菜" 77 productName = "蔬菜"
78 productId = gLL.get_product(self.jmsfHost,productName=productName).json()["data"][0]["id"] 78 productId = gLL.get_product(self.jmsfHost,productName=productName).json()["data"][0]["id"]
79 print(productId) 79 print(productId)
@@ -87,7 +87,7 @@ class test_listPage(unittest.TestCase): @@ -87,7 +87,7 @@ class test_listPage(unittest.TestCase):
87 assert productName==productNameList[0],"车型查询失败查询失败" 87 assert productName==productNameList[0],"车型查询失败查询失败"
88 88
89 def test_searchByDepartment(self): 89 def test_searchByDepartment(self):
90 - """进门单列表-查询:收费单号查询测试""" 90 + """进门单列表-查询:部门查询查询测试"""
91 print(self.authDepartment) 91 print(self.authDepartment)
92 print(self.authDepartment["name"]) 92 print(self.authDepartment["name"])
93 cre_res = zcA.create_jmsf(host=self.gatewayHost,depName=self.authDepartment["name"]) 93 cre_res = zcA.create_jmsf(host=self.gatewayHost,depName=self.authDepartment["name"])
@@ -100,7 +100,7 @@ class test_listPage(unittest.TestCase): @@ -100,7 +100,7 @@ class test_listPage(unittest.TestCase):
100 assert self.authDepartment["name"]==depNameList[0],"车型查询失败查询失败" 100 assert self.authDepartment["name"]==depNameList[0],"车型查询失败查询失败"
101 101
102 def test_searchByBillType(self): 102 def test_searchByBillType(self):
103 - """进门单列表-查询:收费单号查询测试""" 103 + """进门单列表-查询:交易类型查询测试"""
104 resListPage = eFBL.listPage(host=self.jmsfHost,type="1") 104 resListPage = eFBL.listPage(host=self.jmsfHost,type="1")
105 print(resListPage.json()) 105 print(resListPage.json())
106 resList=list(set([i["type"] for i in resListPage.json()["rows"]])) 106 resList=list(set([i["type"] for i in resListPage.json()["rows"]]))
@@ -108,7 +108,7 @@ class test_listPage(unittest.TestCase): @@ -108,7 +108,7 @@ class test_listPage(unittest.TestCase):
108 assert "整车"==resList[0],"车型查询失败查询失败" 108 assert "整车"==resList[0],"车型查询失败查询失败"
109 109
110 def test_searchByStatus(self): 110 def test_searchByStatus(self):
111 - """进门单列表-查询:收费单号查询测试""" 111 + """进门单列表-查询:交易状态查询测试"""
112 status = "4" 112 status = "4"
113 cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName=self.carType["text"]) 113 cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName=self.carType["text"])
114 number = cre_res.json()["data"]["number"] 114 number = cre_res.json()["data"]["number"]
@@ -120,7 +120,7 @@ class test_listPage(unittest.TestCase): @@ -120,7 +120,7 @@ class test_listPage(unittest.TestCase):
120 assert "已缴费"==statusList[0],"车型查询失败查询失败" 120 assert "已缴费"==statusList[0],"车型查询失败查询失败"
121 121
122 def test_searchByTradeType(self): 122 def test_searchByTradeType(self):
123 - """进门单列表-查询:收费单号查询测试""" 123 + """进门单列表-查询:交易类型查询测试"""
124 print(self.tradeType) 124 print(self.tradeType)
125 cre_res = zcA.create_jmsf(host=self.gatewayHost,transactionName=self.tradeType["text"]) 125 cre_res = zcA.create_jmsf(host=self.gatewayHost,transactionName=self.tradeType["text"])
126 number = cre_res.json()["data"]["number"] 126 number = cre_res.json()["data"]["number"]
@@ -131,6 +131,39 @@ class test_listPage(unittest.TestCase): @@ -131,6 +131,39 @@ class test_listPage(unittest.TestCase):
131 assert len(carTypeList) == 1,"车型查询失败查询失败" 131 assert len(carTypeList) == 1,"车型查询失败查询失败"
132 assert self.tradeType["text"]==carTypeList[0],"车型查询失败查询失败" 132 assert self.tradeType["text"]==carTypeList[0],"车型查询失败查询失败"
133 133
  134 + def test_searchByCreatedTime(self):
  135 + """进门单列表-查询:进场时间查询测试"""
  136 + ic = self.ic
  137 + plate = f"川A{random.randint(10000, 99999)}"
  138 + goods = "雪莲果"
  139 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
  140 + number = cre_res.json()["data"]["number"]
  141 + eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
  142 + createdTime = eFBL.listPage(host=self.jmsfHost,attrValue=number).json()["rows"][0]["created"]
  143 + resListPage = eFBL.listPage(host=self.jmsfHost,startTime=createdTime,endTime=createdTime)
  144 + print(resListPage.json())
  145 + createdTimeList = list(set([i["created"] for i in resListPage.json()["rows"]]))
  146 + assert len(createdTimeList) == 1,"进场时间查询失败"
  147 + assert createdTimeList[0]==createdTime,"进场时间查询失败"
  148 +
  149 + def test_searchByPaymentTime(self):
  150 + """进门单列表-查询:缴费时间查询测试"""
  151 + ic = self.ic
  152 + plate = f"川A{random.randint(10000, 99999)}"
  153 + goods = "雪莲果"
  154 + cre_res = zcA.create_jmsf(host=self.gatewayHost,plate=plate,keyword=goods)
  155 + number = cre_res.json()["data"]["number"]
  156 + eFBL.do_payOrder(host=self.jmsfHost,attrValue=number,ic=ic)
  157 + createdTime = eFBL.listPage(host=self.jmsfHost,attrValue=number).json()["rows"][0]["paymentTime"]
  158 + resListPage = eFBL.listPage(host=self.jmsfHost,startPayTime=createdTime,endPayTime=createdTime)
  159 + print(resListPage.json())
  160 + createdTimeList = list(set([i["paymentTime"] for i in resListPage.json()["rows"]]))
  161 + assert len(createdTimeList) == 1,"缴费时间查询测试失败"
  162 + assert createdTimeList[0]==createdTime,"缴费时间查询测试失败"
  163 +
  164 +
  165 +
  166 +
134 """ 167 """
135 三个时间查询暂不涉及 168 三个时间查询暂不涉及
136 """ 169 """
137 \ No newline at end of file 170 \ No newline at end of file