Commit 3e95e2a502684e7a8d92219c40005b8252059872
Merge remote-tracking branch 'origin/master'
# Conflicts: # testcase/FeedbackCustomerController/test_feedback_customer_disable.py # testcase/FeedbackCustomerController/test_feedback_customer_enable.py
Showing
5 changed files
with
124 additions
and
52 deletions
commons/api/entranceFeeBillList.py
@@ -249,7 +249,7 @@ def do_doPay(host="",autocompletecartype=None,fee_str="",**kwargs): | @@ -249,7 +249,7 @@ def do_doPay(host="",autocompletecartype=None,fee_str="",**kwargs): | ||
249 | 249 | ||
250 | 250 | ||
251 | 251 | ||
252 | -a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900012") | 252 | +a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108060900019") |
253 | print("listPage",a.json()) | 253 | print("listPage",a.json()) |
254 | orderId = a.json()["rows"][0]["id"] | 254 | orderId = a.json()["rows"][0]["id"] |
255 | number = a.json()["rows"][0]["number"] | 255 | number = a.json()["rows"][0]["number"] |
@@ -258,25 +258,25 @@ print(orderId) | @@ -258,25 +258,25 @@ print(orderId) | ||
258 | 258 | ||
259 | # # 订单详情获取 | 259 | # # 订单详情获取 |
260 | # orderId = 3674 | 260 | # orderId = 3674 |
261 | -res = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId) | 261 | +resOrderDetails = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId) |
262 | # print(res.text) | 262 | # print(res.text) |
263 | -unitPrice = re.findall('name="unitPrice" value="(.*?)" id',res.text)[0] | 263 | +unitPrice = re.findall('name="unitPrice" value="(.*?)" id',resOrderDetails.text)[0] |
264 | 264 | ||
265 | -goodsId = re.findall('id="goodsId" value="(.*?)">',res.text)[0] | ||
266 | -status = re.findall('"status" name="status" value="(.*?)">',res.text)[0] | ||
267 | -source = re.findall('id="source" name="source" value="(.*?)">',res.text)[0] | 265 | +goodsId = re.findall('id="goodsId" value="(.*?)">',resOrderDetails.text)[0] |
266 | +status = re.findall('"status" name="status" value="(.*?)">',resOrderDetails.text)[0] | ||
267 | +source = re.findall('id="source" name="source" value="(.*?)">',resOrderDetails.text)[0] | ||
268 | 268 | ||
269 | -optType = re.findall('id="optType" name="optType" value="(.*?)">',res.text)[0] | ||
270 | -correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">',res.text)[0] | ||
271 | -weightType = re.findall('name="weightType" id="weightType" value="(.*?)">',res.text)[0] | ||
272 | -correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">',res.text)[0] | ||
273 | -regionId = re.findall('<option value="(.*?)" bind-name="',res.text)[0] | ||
274 | -goodsTagIds = re.findall('<input name="goodsTagIds" type="radio" value="(.*?)" readonly checked>',res.text)[0] | ||
275 | -sumPrice = re.findall('<input type="hidden" name="sumPrice" value="(.*?)" id="sumPrice">',res.text)[0] | ||
276 | -calcFeeDepId = re.findall('<input type="hidden" name="calcFeeDepId" value="(.*?)">',res.text)[0] | ||
277 | -tradeTypeId = re.findall('input type="hidden" class="form-control" name="tradeTypeId" value="(.*?)" >',res.text)[0] | ||
278 | -shareRatio = re.findall('input type="hidden" id="shareRatioVal" name="shareRatio" value="(.*?)"',res.text)[0] | ||
279 | -regionName = re.findall('" bind-name="(.*?)"',res.text)[0] | 269 | +optType = re.findall('id="optType" name="optType" value="(.*?)">',resOrderDetails.text)[0] |
270 | +correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">',resOrderDetails.text)[0] | ||
271 | +weightType = re.findall('name="weightType" id="weightType" value="(.*?)">',resOrderDetails.text)[0] | ||
272 | +correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">',resOrderDetails.text)[0] | ||
273 | +regionId = re.findall('<option value="(.*?)" bind-name="',resOrderDetails.text)[0] | ||
274 | +goodsTagIds = re.findall('<input name="goodsTagIds" type="radio" value="(.*?)" readonly checked>',resOrderDetails.text)[0] | ||
275 | +sumPrice = re.findall('<input type="hidden" name="sumPrice" value="(.*?)" id="sumPrice">',resOrderDetails.text)[0] | ||
276 | +calcFeeDepId = re.findall('<input type="hidden" name="calcFeeDepId" value="(.*?)">',resOrderDetails.text)[0] | ||
277 | +tradeTypeId = re.findall('input type="hidden" class="form-control" name="tradeTypeId" value="(.*?)" >',resOrderDetails.text)[0] | ||
278 | +shareRatio = re.findall('input type="hidden" id="shareRatioVal" name="shareRatio" value="(.*?)"',resOrderDetails.text)[0] | ||
279 | +regionName = re.findall('" bind-name="(.*?)"',resOrderDetails.text)[0] | ||
280 | 280 | ||
281 | 281 | ||
282 | # 用户信息获取 | 282 | # 用户信息获取 |
@@ -299,23 +299,32 @@ value = res.json()["suggestions"][0]["value"] | @@ -299,23 +299,32 @@ value = res.json()["suggestions"][0]["value"] | ||
299 | plate="川B00001" | 299 | plate="川B00001" |
300 | host="http://test.jmsf.diligrp.com:8385" | 300 | host="http://test.jmsf.diligrp.com:8385" |
301 | modified=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) | 301 | modified=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) |
302 | -carTypeName="板车" | ||
303 | -carTypeCode = "003" | ||
304 | -carTypeId = "53" | 302 | +carTypeName= re.findall('name="carTypeName" id="carTypeName" value="(.*?)" ',resOrderDetails.text)[0] |
303 | +carTypeCode = re.findall('name="carTypeCode" id="carTypeCode" value="(.*?)" ',resOrderDetails.text)[0] | ||
304 | +carTypeId = re.findall('name="carTypeId" id="carTypeId" value="(.*?)" ',resOrderDetails.text)[0] | ||
305 | carTypeWeight = "333" | 305 | carTypeWeight = "333" |
306 | proveTypeCode = "1621" | 306 | proveTypeCode = "1621" |
307 | proveType = proveTypeCode | 307 | proveType = proveTypeCode |
308 | -grossWeight="353" | 308 | +# grossWeight="353" |
309 | +grossWeight = re.findall('name="grossWeight" id="grossWeight" value="(.*?)"',resOrderDetails.text)[0] | ||
309 | newWeight="20" | 310 | newWeight="20" |
310 | -tareWeight="333" | ||
311 | -depName="接车部" | ||
312 | -feeDepId="103" | ||
313 | -productName="雪莲果" | ||
314 | -productId="14158" | ||
315 | -grossWeightDate=created | ||
316 | -tareWeightDate=created | ||
317 | -weight=newWeight | ||
318 | -calcDepId=feeDepId | 311 | +# tareWeight="333" |
312 | +tareWeight=re.findall('name="tareWeight" id="tareWeight" value="(.*?)"',resOrderDetails.text)[0] | ||
313 | +# depName="接车部" | ||
314 | +depName = re.findall('id="depName" name="depName" value="(.*?)"',resOrderDetails.text)[0] | ||
315 | +# feeDepId="103" | ||
316 | +feeDepId = re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0] | ||
317 | +# productName="雪莲果" | ||
318 | +productName = re.findall('name="productName" value="(.*?)"',resOrderDetails.text)[0] | ||
319 | +# productId="14158" | ||
320 | +productId=re.findall('id="productId" value="(.*?)"',resOrderDetails.text)[0] | ||
321 | +# grossWeightDate=created | ||
322 | +grossWeightDate=re.findall('name="grossWeightDate" value="(.*?)"',resOrderDetails.text)[0] | ||
323 | +# tareWeightDate=created | ||
324 | +tareWeightDate = re.findall('name="tareWeightDate" value="(.*?)"',resOrderDetails.text)[0] | ||
325 | +# weight=newWeight | ||
326 | +weight = re.findall('name="weight" readonly value="(.*?)"',resOrderDetails.text)[0] | ||
327 | +calcDepId=re.findall('name="calcDepId" value="(.*?)"',resOrderDetails.text)[0] | ||
319 | categoryName="水果" | 328 | categoryName="水果" |
320 | categoryId="14436" | 329 | categoryId="14436" |
321 | inGreeterName="通用测试" | 330 | inGreeterName="通用测试" |
report/test.log
1 | -[2021-08-06 14:53:06] [INFO] : ====================================================================================== | ||
2 | -[2021-08-06 14:53:06] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb | ||
3 | -{'data': None, 'json': {'userName': 'sy_chen', 'password': 'djloMMZX09IFz9m3sReewWP43BrHo5ku+AEsuzLnnOqZCCFaSXs3QQKfGv2XdIoS5CSc7S16hd3NpON3tmsOfKQZea4iHg+fJpnRyJiYWDrqG3rK8XRmeVJD5qtRYs0AAzBPu9SINLc4A4fN2ZMlYPe5XqXxtQ0vqPkwYzuzkfU='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}} | 1 | +[2021-08-06 15:48:12] [INFO] : ====================================================================================== |
2 | +[2021-08-06 15:48:12] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb | ||
3 | +{'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'}} | ||
4 | 4 | ||
5 | -[2021-08-06 14:53:06] [INFO] : ====================================================================================== | ||
6 | -[2021-08-06 14:53:06] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb | ||
7 | -{'data': None, 'json': {'userName': 'sygangda', 'password': 'VeAwXLYVfhwK/3jlYU28b54m0S0NKkEL5hi4BzZSQozFewTZdI9LEqaE0Q+A21Dh6IlNcGX4Sr1gCGtcqMVY/RaH0VVLE9NVUrsIbxSPG4fCTeTBcOEF2sxAiA6Lurq7FBv3FIxSqi+FKDIrWBk30ALuLyIlZL6j8K5EWz/YK6Q='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}} | 5 | +[2021-08-06 15:48:13] [INFO] : ====================================================================================== |
6 | +[2021-08-06 15:48:13] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb | ||
7 | +{'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'}} | ||
8 | 8 | ||
9 | -[2021-08-06 14:53:07] [INFO] : ====================================================================================== | ||
10 | -[2021-08-06 14:53:07] [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': '202108060900012'} | 9 | +[2021-08-06 15:48:13] [INFO] : ====================================================================================== |
10 | +[2021-08-06 15:48:13] [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': '202108060900019'} | ||
12 | {} | 12 | {} |
13 | 13 | ||
14 | -[2021-08-06 14:53:07] [INFO] : ====================================================================================== | ||
15 | -[2021-08-06 14:53:07] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3738.action | 14 | +[2021-08-06 15:48:13] [INFO] : ====================================================================================== |
15 | +[2021-08-06 15:48:13] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3745.action | ||
16 | None | 16 | None |
17 | {} | 17 | {} |
18 | 18 | ||
19 | -[2021-08-06 14:53:08] [INFO] : ====================================================================================== | ||
20 | -[2021-08-06 14:53:08] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426 | 19 | +[2021-08-06 15:48:15] [INFO] : ====================================================================================== |
20 | +[2021-08-06 15:48:15] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426 | ||
21 | None | 21 | None |
22 | {} | 22 | {} |
23 | 23 | ||
24 | -[2021-08-06 14:53:09] [INFO] : ====================================================================================== | ||
25 | -[2021-08-06 14:53:09] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州 | 24 | +[2021-08-06 15:48:20] [INFO] : ====================================================================================== |
25 | +[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州 | ||
26 | None | 26 | None |
27 | {} | 27 | {} |
28 | 28 | ||
29 | -[2021-08-06 14:53:09] [INFO] : ====================================================================================== | ||
30 | -[2021-08-06 14:53:09] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action | ||
31 | -{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3738, 'goodsId': '3752', 'number': '202108060900012', 'modified': '2021-08-06 14:53:09', '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 14:52:55', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '水果', 'categoryId': '14436', 'driverTel': '', 'grossWeightDate': '2021-08-06 14:52:55', 'tareWeightDate': '2021-08-06 14:52:55', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '通用测试', 'inGreeterId': '274', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': ''} | 29 | +[2021-08-06 15:48:20] [INFO] : ====================================================================================== |
30 | +[2021-08-06 15:48:20] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action | ||
31 | +{'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': ''} | ||
32 | {} | 32 | {} |
33 | 33 | ||
34 | -[2021-08-06 14:53:10] [INFO] : ====================================================================================== | ||
35 | -[2021-08-06 14:53:10] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action | ||
36 | -protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3738&goodsId=3752&number=202108060900012&modified=2021-08-06%2014%3A52%3A55&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®ionName=A1%E5%8C%BA®ionId=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%2014%3A52%3A55&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%2014%3A52%3A55&tareWeightDate=2021-08-06%2014%3A52%3A55&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 | 34 | +[2021-08-06 15:48:21] [INFO] : ====================================================================================== |
35 | +[2021-08-06 15:48:21] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action | ||
36 | +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®ionName=A1%E5%8C%BA®ionId=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 | ||
37 | {} | 37 | {} |
38 | 38 |
testcase/FeedbackCustomerController/test_feedback_customer_disable.py
0 → 100644
1 | +import unittest | ||
2 | +import urllib3 | ||
3 | +from commons.MySession import sy1 | ||
4 | +from commons.api.feedback_customer_disable import feedback_customer_disable | ||
5 | +urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | ||
6 | +fcd = feedback_customer_disable() | ||
7 | +import commons.ConfigDB as db | ||
8 | + | ||
9 | +class test_feedback_customer_disable(unittest.TestCase): | ||
10 | + "返还人禁用" | ||
11 | + @classmethod | ||
12 | + def setUpClass(cls): | ||
13 | + pass | ||
14 | + | ||
15 | + def setUp(self): | ||
16 | + self.ids = db.mysql_selectOne("SELECT id FROM `dili_jmsf`.`feedback_customer` WHERE `status` = '1' ORDER BY `id` DESC LIMIT 1")[0] | ||
17 | + # print("查询出返还人id", self.id) | ||
18 | + | ||
19 | + def test_feedback_customer_disable_01(self): | ||
20 | + url = fcd.url.replace("44", str(self.ids)) | ||
21 | + re = sy1.post(url=url, headers=fcd.header) | ||
22 | + print(re.headers) | ||
23 | + print(re.json()) | ||
24 | + self.assertTrue("操作成功" in str(re.json())) | ||
25 | + | ||
26 | + @classmethod | ||
27 | + def tearDownClass(cls): | ||
28 | + pass | ||
29 | + | ||
30 | +if __name__ == '__main__': | ||
31 | + unittest.main() |
testcase/FeedbackCustomerController/test_feedback_customer_enable.py
0 → 100644
1 | +import unittest | ||
2 | +import urllib3 | ||
3 | +from commons.MySession import my,sy1 | ||
4 | +from commons.api.feedback_customer_enable import feedback_customer_enable | ||
5 | +from commons.api.feedback_customer_disable import feedback_customer_disable | ||
6 | +urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) | ||
7 | +fce = feedback_customer_enable() | ||
8 | +fcd = feedback_customer_disable | ||
9 | +import commons.ConfigDB as db | ||
10 | + | ||
11 | +class test_feedback_customer_enable(unittest.TestCase): | ||
12 | + "返还人启用" | ||
13 | + @classmethod | ||
14 | + def setUpClass(cls): | ||
15 | + pass | ||
16 | + | ||
17 | + def setUp(self): | ||
18 | + self.ids = db.mysql_selectOne("SELECT id FROM `dili_jmsf`.`feedback_customer` WHERE `status` = '2' ORDER BY `id` DESC LIMIT 1")[0] | ||
19 | + print(self.ids) | ||
20 | + def test_feedback_customer_enable_01(self): | ||
21 | + | ||
22 | + url = fce.url.replace("49",str(self.ids)) | ||
23 | + re = sy1.post(url = url, headers = fce.header) | ||
24 | + print(fce.url) | ||
25 | + print(re.headers) | ||
26 | + print(re.json()) | ||
27 | + self.assertTrue("操作成功" in str(re.json())) | ||
28 | + @classmethod | ||
29 | + def tearDownClass(cls): | ||
30 | + pass | ||
31 | + | ||
32 | +if __name__ == '__main__': | ||
33 | + unittest.main() |
testcase/FeedbackOrderController/test_feedback_order_settlement.py
@@ -31,7 +31,6 @@ class test_feedback_order_settlement(unittest.TestCase): | @@ -31,7 +31,6 @@ class test_feedback_order_settlement(unittest.TestCase): | ||
31 | replace("billIds=3621","billIds=3493").\ | 31 | replace("billIds=3621","billIds=3493").\ |
32 | replace("settledAmounts=2","settledAmounts=2") | 32 | replace("settledAmounts=2","settledAmounts=2") |
33 | 33 | ||
34 | - print(body) | ||
35 | re = sy1.post(url = fos.url, headers = fos.header, data = body.encode('utf-8')) | 34 | re = sy1.post(url = fos.url, headers = fos.header, data = body.encode('utf-8')) |
36 | print(re.headers) | 35 | print(re.headers) |
37 | 36 |