Commit 6133c42542b71fafee31f0cca7025cd61ef3051e
1 parent
8bca5483
进门缴费
Showing
6 changed files
with
361 additions
and
15 deletions
commons/api/entranceFeeBillList.py
@@ -9,10 +9,11 @@ | @@ -9,10 +9,11 @@ | ||
9 | 进门单列表接口封装 | 9 | 进门单列表接口封装 |
10 | """ | 10 | """ |
11 | 11 | ||
12 | -import json,time,random | 12 | +import json,time,random,re |
13 | from commons.scripts import dealContentType as dct | 13 | from commons.scripts import dealContentType as dct |
14 | +from commons.scripts import jsonToUrlcode | ||
14 | from commons.MySession import my | 15 | from commons.MySession import my |
15 | -import urllib3 | 16 | +from bs4 import BeautifulSoup |
16 | 17 | ||
17 | def listPage(host="",attrName="收费单号",attrValue=None,**kwargs): | 18 | def listPage(host="",attrName="收费单号",attrValue=None,**kwargs): |
18 | """ | 19 | """ |
@@ -83,19 +84,307 @@ def get_icCheck(host="",ic=None): | @@ -83,19 +84,307 @@ def get_icCheck(host="",ic=None): | ||
83 | return res | 84 | return res |
84 | 85 | ||
85 | def get_city(host="",name=None): | 86 | def get_city(host="",name=None): |
86 | - """进门缴费单详情页面获取产地信息""" | 87 | + """进门缴费单缴费金额计算""" |
87 | headers = dct.urlCode() | 88 | headers = dct.urlCode() |
88 | url = host + f"/api/jmsf/ajax/city/?name={name}&query={name}" | 89 | url = host + f"/api/jmsf/ajax/city/?name={name}&query={name}" |
89 | res = my.useHeadersRequests("get", url=url,headers=headers) | 90 | res = my.useHeadersRequests("get", url=url,headers=headers) |
90 | return res | 91 | return res |
91 | 92 | ||
92 | -# a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202107290900021") | ||
93 | -# print(a.json()) | ||
94 | -# orderId = a.json()["rows"][0]["id"] | ||
95 | -# print(orderId) | ||
96 | -# res = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId) | 93 | +def get_calculateRes(host="",autocompletecartype=None,**kwargs): |
94 | + """缴费金额获取 | ||
95 | + :params kwargs: | ||
96 | + protocolId: | ||
97 | +pwd: | ||
98 | +clientRedirectTag: | ||
99 | +viewType:pay | ||
100 | +optType:${optType} | ||
101 | +optUrl: | ||
102 | +correctInfo:${correctInfo} | ||
103 | +weightType:${weightType} | ||
104 | +id:${orderId} | ||
105 | +goodsId:${goodsId} | ||
106 | +number:${number} | ||
107 | +modified:${__time(yyyy-MM-dd HH:mm:ss,)} | ||
108 | +status:${status} | ||
109 | +source:${source} | ||
110 | +updateFeeItems: | ||
111 | +correctDiscount:${correctDiscount} | ||
112 | +totalAmount: | ||
113 | +customerId:0 | ||
114 | +fundAccount: | ||
115 | +ic: | ||
116 | +customerName: | ||
117 | +customerPhone: | ||
118 | +payway:刷卡 | ||
119 | +plate:${plate} | ||
120 | +autocomplete-cartype:${carTypeCode}(${carTypeName}) | ||
121 | +carTypeName:${carTypeName} | ||
122 | +carTypeCode:${carTypeCode} | ||
123 | +carTypeId:${carTypeId} | ||
124 | +carTypeWeight:${carTypeWeight} | ||
125 | +storeTareWeight: | ||
126 | +proveType:${proveTypeCode} | ||
127 | +grossWeight:${grossWeight} | ||
128 | +tareWeight:${tareWeight} | ||
129 | +weight:${grossWeight} | ||
130 | +goodsNum: | ||
131 | +itemWeight: | ||
132 | +productPrice:1 | ||
133 | +unitPrice:${unitPrice} | ||
134 | +depName:${feeDepName} | ||
135 | +calcDepId:${feeDepId} | ||
136 | +regionName: | ||
137 | +regionId:0 | ||
138 | +productName:${productName} | ||
139 | +productId:${productId} | ||
140 | +productArea:万州区 | ||
141 | +parentId: | ||
142 | +levelType: | ||
143 | +originId:${originId} | ||
144 | +tradeTypeId:${tradeTypeId} | ||
145 | +chargeTotalAmount: | ||
146 | +chargeTotalAmountYuan: | ||
147 | +freezeMoneySymbol: | ||
148 | +comparisonFreezeAmount: | ||
149 | +created:${created} | ||
150 | +remark: | ||
151 | +goodsTagIds:${goodsTagIds} | ||
152 | +shareRatio:${shareRatio} | ||
153 | +handlingTeam: | ||
154 | +handlingRatio: | ||
155 | +handActualAmount: | ||
156 | +handManageAmount: | ||
157 | +handCollectionAmount: | ||
158 | +receivableAmount: | ||
159 | +categoryName:${productName} | ||
160 | +categoryId:${productId} | ||
161 | +driverTel: | ||
162 | +grossWeightDate:${grossWeightDate} | ||
163 | +tareWeightDate:${tareWeightDate} | ||
164 | +grossPathName: | ||
165 | +grossPathId: | ||
166 | +tarePathId: | ||
167 | +goodsRemark: | ||
168 | +inGreeterName: | ||
169 | +inGreeterId:0 | ||
170 | +outGreeterId: | ||
171 | +sumPrice:${sumPrice} | ||
172 | +shipperName: | ||
173 | +shipperId: | ||
174 | +shipperPhone: | ||
175 | +feeDepName: | ||
176 | +calcFeeDepId: | ||
177 | + """ | ||
178 | + url = host + "/calculate/index.action" | ||
179 | + headers = dct.urlCode() | ||
180 | + | ||
181 | + data = {"protocolId": "", "pwd": "", "clientRedirectTag": "", "viewType": "pay", "optType": "optType", "optUrl": "", | ||
182 | + "correctInfo": "correctInfo", "weightType": "weightType", "id": "orderId", "goodsId": "goodsId", | ||
183 | + "number": "number", "modified": "time", "status": "status", "source": "source", "updateFeeItems": "", | ||
184 | + "correctDiscount": "correctDiscount", "totalAmount": "", "customerId": "0", "fundAccount": "", "ic": "", | ||
185 | + "customerName": "", "customerPhone": "", "payway": "刷卡", "plate": "plate", | ||
186 | + "autocomplete-cartype": "carTypeCode(carTypeName)", "carTypeName": "carTypeName", | ||
187 | + "carTypeCode": "carTypeCode", "carTypeId": "carTypeId", "carTypeWeight": "carTypeWeight", | ||
188 | + "storeTareWeight": "", "proveType": "proveTypeCode", "grossWeight": "grossWeight", | ||
189 | + "tareWeight": "tareWeight", "weight": "grossWeight", "goodsNum": "", "itemWeight": "", | ||
190 | + "productPrice": "1.00000", "unitPrice": "unitPrice", "depName": "feeDepName", "calcDepId": "feeDepId", | ||
191 | + "regionName": "", "regionId": "0", "productName": "productName", "productId": "productId", | ||
192 | + "productArea": "万州区", "parentId": "", "levelType": "", "originId": "originId", "tradeTypeId": "tradeTypeId", | ||
193 | + "chargeTotalAmount": "", "chargeTotalAmountYuan": "", "freezeMoneySymbol": "", "comparisonFreezeAmount": "", | ||
194 | + "created": "created", "remark": "false", "goodsTagIds": "goodsTagIds", "shareRatio": "shareRatio", | ||
195 | + "handlingTeam": "", "handlingRatio": "", "handActualAmount": "", "handManageAmount": "", | ||
196 | + "handCollectionAmount": "", "receivableAmount": "", "categoryName": "productName", | ||
197 | + "categoryId": "productId", "driverTel": "", "grossWeightDate": "grossWeightDate", | ||
198 | + "tareWeightDate": "tareWeightDate", "grossPathName": "", "grossPathId": "", "tarePathId": "", | ||
199 | + "goodsRemark": "", "inGreeterName": "", "inGreeterId": "0", "outGreeterId": "", "sumPrice": "sumPrice", | ||
200 | + "shipperName": "", "shipperId": "", "shipperPhone": "", "feeDepName": "", "calcFeeDepId": ""} | ||
201 | + data["autocomplete-cartype"]=autocompletecartype | ||
202 | + data = dict(data,**kwargs) | ||
203 | + print("get_calculateRes",data) | ||
204 | + res = my.useHeadersRequests("post", url=url,data=data,headers=headers) | ||
205 | + return res | ||
206 | + | ||
207 | +def do_doPay(host="",autocompletecartype=None,fee_str="",**kwargs): | ||
208 | + """进门单缴费""" | ||
209 | + url = host + "/entranceTrade/doPay.action" | ||
210 | + headers = dct.urlCode() | ||
211 | + | ||
212 | + data = {"protocolId": "", "pwd": "{pwd}", "clientRedirectTag": "", "viewType": "pay", "optType": "{optType}", | ||
213 | + "optUrl": "", "correctInfo": "{correctInfo}", "weightType": "{weightType}", "id": "{orderId}", | ||
214 | + "goodsId": "{goodsId}", "number": "{number}", "modified": "{created}", "status": "{status}", | ||
215 | + "source": "{source}", "updateFeeItems": "", "correctDiscount": "{correctDiscount}", | ||
216 | + "totalAmount": "{totalMoney}", "customerId": "{customerId}", "fundAccount": "{accountId}", "ic": "{ic}", | ||
217 | + "customerName": "{customerName}", "customerPhone": "{mobile}", "payway": "刷卡", "plate": "{plate}", | ||
218 | + "autocomplete-cartype": "{carTypeCode}({carTypeName})", "carTypeName": "{carTypeName}", | ||
219 | + "carTypeCode": "{carTypeCode}", "carTypeId": "{carTypeId}", "carTypeWeight": "{carTypeWeight}", | ||
220 | + "storeTareWeight": "", "proveType": "{proveTypeCode}", "grossWeight": "{grossWeight}", | ||
221 | + "tareWeight": "{tareWeight}", "weight": "{newWeight}", "goodsNum": "", "itemWeight": "", | ||
222 | + "productPrice": "{productPrice}", "unitPrice": "{unitPrice}", "depName": "{feeDepName}", | ||
223 | + "calcDepId": "{feeDepId}", "dep": "{feeDepId}", "regionName": "{regionName}", "regionId": "{regionId}", | ||
224 | + "productName": "{productName}", "productId": "{productId}", "productArea": "{origin}", "parentId": "", | ||
225 | + "levelType": "", "originId": "{originId}", "tradeTypeId": "{tradeTypeId}", | ||
226 | + "chargeTotalAmount": "{totalMoney}", "chargeTotalAmountYuan": "{chargeTotalAmountYuan}", | ||
227 | + "freezeMoneySymbol": "{chargeTotalAmountYuan}", "comparisonFreezeAmount": "{chargeTotalAmountYuan}", | ||
228 | + "created": "{created}", "remark": "", "goodsTagIds": "{goodsTagIds}", "marketFlag": "{firmCode}", | ||
229 | + "totalMoney": "{totalMoney}", "receivable": "{receivable}", "collectionPrice": "{discountAmount}", | ||
230 | + "discountAmount": "{discountAmount}", "handReceivableAmount": "{handReceivableAmount}", | ||
231 | + "itemReceivableAmount": "{receivable}", "correctDiscount": "{correctDiscount}", "shareRatio": "0", | ||
232 | + "handlingTeam": "", "handActualAmount": "0", "handManageAmount": "0", "handCollectionAmount": "0", | ||
233 | + "receivableAmount": "{receivable}", "categoryName": "{productName}", "categoryId": "{productId}", | ||
234 | + "driverTel": "", "grossWeightDate": "{grossWeightDate}", "tareWeightDate": "{tareWeightDate}", | ||
235 | + "grossPathName": "", "grossPathId": "", "tarePathId": "", "goodsRemark": "", "inGreeterName": "", | ||
236 | + "inGreeterId": "0", "outGreeterId": "", "sumPrice": "{sumPrice}", "shipperName": "", "shipperId": "", | ||
237 | + "shipperPhone": "", "feeDepName": "", "calcFeeDepId": "", "feeDepId": "","accountId":""} | ||
238 | + data["autocomplete-cartype"] = autocompletecartype | ||
239 | + data = dict(data, **kwargs) | ||
240 | + print("get_calculateRes", data) | ||
241 | + data_uc = jsonToUrlcode.jsonToUrlcode(data_json=data)+fee_str | ||
242 | + print(data_uc) | ||
243 | + print("================开始请求================") | ||
244 | + res = my.useHeadersRequests("post", url=url, data=data_uc, headers=headers) | ||
245 | + return res | ||
246 | + | ||
247 | + | ||
248 | + | ||
249 | +a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202108040900002") | ||
250 | +print("listPage",a.json()) | ||
251 | +orderId = a.json()["rows"][0]["id"] | ||
252 | +number = a.json()["rows"][0]["number"] | ||
253 | +created = a.json()["rows"][0]["created"] | ||
254 | +print(orderId) | ||
255 | + | ||
256 | +# # 订单详情获取 | ||
257 | +# orderId = 3674 | ||
258 | +res = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId) | ||
97 | # print(res.text) | 259 | # print(res.text) |
98 | -# res = get_icCheck(host="http://test.jmsf.diligrp.com:8385",ic=888810032426) | 260 | +unitPrice = re.findall('name="unitPrice" value="(.*?)" id',res.text)[0] |
261 | + | ||
262 | +goodsId = re.findall('id="goodsId" value="(.*?)">',res.text)[0] | ||
263 | +status = re.findall('"status" name="status" value="(.*?)">',res.text)[0] | ||
264 | +source = re.findall('id="source" name="source" value="(.*?)">',res.text)[0] | ||
265 | + | ||
266 | +optType = re.findall('id="optType" name="optType" value="(.*?)">',res.text)[0] | ||
267 | +correctInfo = re.findall('d="correctInfo" name="correctInfo" value="(.*?)">',res.text)[0] | ||
268 | +weightType = re.findall('name="weightType" id="weightType" value="(.*?)">',res.text)[0] | ||
269 | +correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">',res.text)[0] | ||
270 | +regionId = re.findall('<option value="(.*?)" bind-name="',res.text)[0] | ||
271 | +goodsTagIds = re.findall('<input name="goodsTagIds" type="radio" value="(.*?)" readonly checked>',res.text)[0] | ||
272 | +sumPrice = re.findall('<input type="hidden" name="sumPrice" value="(.*?)" id="sumPrice">',res.text)[0] | ||
273 | +calcFeeDepId = re.findall('<input type="hidden" name="calcFeeDepId" value="(.*?)">',res.text)[0] | ||
274 | +tradeTypeId = re.findall('input type="hidden" class="form-control" name="tradeTypeId" value="(.*?)" >',res.text)[0] | ||
275 | +shareRatio = re.findall('input type="hidden" id="shareRatioVal" name="shareRatio" value="(.*?)"',res.text)[0] | ||
276 | +regionName = re.findall('" bind-name="(.*?)"',res.text)[0] | ||
277 | + | ||
278 | +# 用户信息获取 | ||
279 | +ic=888810032426 | ||
280 | +res = get_icCheck(host="http://test.jmsf.diligrp.com:8385",ic=ic) | ||
281 | +print(res.text) | ||
282 | +customerId = res.json()["data"]["aInfo"]["customerId"] | ||
283 | +customerName = res.json()["data"]["aInfo"]["customerName"] | ||
284 | +accountId = res.json()["data"]["aInfo"]["accountId"] | ||
285 | +mobile = res.json()["data"]["aInfo"]["mobile"] | ||
286 | + | ||
287 | +# 省市区获取 | ||
288 | +res = get_city(host="http://test.jmsf.diligrp.com:8385",name="万州") | ||
289 | +print(res.text) | ||
290 | +originId = res.json()["suggestions"][0]["id"] | ||
291 | +parentId = res.json()["suggestions"][0]["parentId"] | ||
292 | +value = res.json()["suggestions"][0]["value"] | ||
293 | + | ||
294 | +# 获取缴费金额 | ||
295 | +plate="川B00002" | ||
296 | +host="http://test.jmsf.diligrp.com:8385" | ||
297 | +modified=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) | ||
298 | +carTypeName="板车" | ||
299 | +carTypeCode = "003" | ||
300 | +carTypeId = "53" | ||
301 | +carTypeWeight = "333" | ||
302 | +proveTypeCode = "665" | ||
303 | +proveType = proveTypeCode | ||
304 | +grossWeight="353" | ||
305 | +newWeight="20" | ||
306 | +tareWeight="333" | ||
307 | +depName="水果部" | ||
308 | +feeDepId="53" | ||
309 | +productName="蔬菜" | ||
310 | +productId="14152" | ||
311 | +grossWeightDate=created | ||
312 | +tareWeightDate=created | ||
313 | +weight=grossWeight | ||
314 | +weight=weight | ||
315 | +calcDepId=feeDepId | ||
316 | +categoryName=productName | ||
317 | +categoryId=productId | ||
318 | + | ||
319 | +autocompletecartype = f"{carTypeCode}({carTypeName})" | ||
320 | +print(autocompletecartype) | ||
321 | + | ||
322 | +res = get_calculateRes(host=host,autocompletecartype=autocompletecartype,optType=optType,correctInfo=correctInfo, | ||
323 | + weightType=weightType,id=orderId,goodsId=goodsId,number=number,modified=modified,status=status, | ||
324 | + source=source,correctDiscount=correctDiscount,plate=plate,carTypeName=carTypeName,carTypeCode=carTypeCode, | ||
325 | + carTypeId=carTypeId,carTypeWeight=carTypeWeight,proveType=proveType,grossWeight=grossWeight, | ||
326 | + newWeight=newWeight,tareWeight=tareWeight,unitPrice=unitPrice,depName=depName,productName=productName, | ||
327 | + productId=productId,originId=originId,tradeTypeId=tradeTypeId,created=created,goodsTagIds=goodsTagIds, | ||
328 | + shareRatio=shareRatio,categoryName=categoryName,categoryId=categoryId,grossWeightDate=grossWeightDate, | ||
329 | + tareWeightDate=tareWeightDate,sumPrice=sumPrice,calcDepId=calcDepId,weight=weight) | ||
99 | # print(res.text) | 330 | # print(res.text) |
100 | -# res = get_city(host="http://test.jmsf.diligrp.com:8385",name="万州") | ||
101 | -# print(res.text) | ||
102 | \ No newline at end of file | 331 | \ No newline at end of file |
332 | +# backSkinTwo = re.findall('name="backSkinTwo" value="(.*?)" >',res.text)[0] | ||
333 | +# 缴费信息 | ||
334 | +totalMoney = re.findall('name="totalMoney" value="(.*?)">',res.text)[0] | ||
335 | +discountAmount = re.findall('name="discountAmount" value="(.*?)">',res.text)[0] | ||
336 | +collectionPrice = re.findall('" name="collectionPrice" value="(.*?)">',res.text)[0] | ||
337 | +handReceivableAmount = re.findall('name="handReceivableAmount" value="(.*?)">',res.text)[0] | ||
338 | +correctDiscount = re.findall('id="correctDiscount" name="correctDiscount" value="(.*?)">',res.text)[0] | ||
339 | +billItemCheckIds = re.findall('" name="billItemCheckIds" value="(.*?)" ',res.text)[0] | ||
340 | +billItemCheckIdsV = re.findall('" maxlength="15" data-old="(.*?)"',res.text)[0] | ||
341 | +receivable = re.findall('id="creceivableLong" name="receivable" value="(.*?)">',res.text)[0] | ||
342 | + | ||
343 | + | ||
344 | +soup = BeautifulSoup(res.text, "html.parser") | ||
345 | +# 查找dl标签class为包含'ui-font-'字符的所有dl标签 | ||
346 | +fee_str = "correctDiscount=1&billItems=&billItemsDic=" | ||
347 | +for tag in soup.findAll("div", class_="d-flex align-items-center"): | ||
348 | + print("=============================================") | ||
349 | + c = tag.findAll("input") | ||
350 | + for i in c: | ||
351 | + print(i) | ||
352 | + print(i.get("name")) | ||
353 | + if i.get("name") != None: | ||
354 | + fee_str = fee_str + "&" + i.get("name") + "=" + i.get("value") | ||
355 | +print(fee_str) | ||
356 | + | ||
357 | +pwd = "111111" | ||
358 | +id = orderId | ||
359 | +totalAmount = totalMoney | ||
360 | +customerPhone=mobile | ||
361 | +productPrice="1.00000" | ||
362 | +dep=feeDepId | ||
363 | +productArea = "重庆,重庆市,万州区" | ||
364 | +chargeTotalAmount = totalMoney | ||
365 | +chargeTotalAmountYuan = "9" | ||
366 | +chargeTotalAmountYuan= chargeTotalAmountYuan | ||
367 | +freezeMoneySymbol =chargeTotalAmountYuan | ||
368 | +comparisonFreezeAmount = chargeTotalAmountYuan | ||
369 | +modified = created | ||
370 | +firmCode = "9" | ||
371 | +marketFlag=firmCode | ||
372 | +collectionPrice=discountAmount | ||
373 | +itemReceivableAmount=receivable | ||
374 | +receivableAmount=receivable | ||
375 | +tareWeightDate=tareWeightDate | ||
376 | +aa = do_doPay(host=host,autocompletecartype=autocompletecartype,fee_str=fee_str,pwd=pwd,optType=optType, | ||
377 | + weightType=weightType,id=id,goodsId=goodsId,number=number,created=created,status=status,source=source, | ||
378 | + correctDiscount=correctDiscount,totalAmount=totalAmount,customerId=customerId,fundAccount=accountId, | ||
379 | + accountId=accountId,ic=ic,customerName=customerName,customerPhone=customerPhone,plate=plate, | ||
380 | + carTypeName=carTypeName,carTypeCode=carTypeCode,carTypeId=carTypeId,carTypeWeight=carTypeWeight, | ||
381 | + proveType=proveType,grossWeight=grossWeight,tareWeight=tareWeight,weight=weight,productPrice=productPrice, | ||
382 | + unitPrice=unitPrice,depName=depName,calcDepId=calcDepId,dep=dep,regionName=regionName,regionId=regionId, | ||
383 | + productName=productName,productId=productId,productArea=productArea,originId=originId, | ||
384 | + tradeTypeId=tradeTypeId,correctInfo=correctInfo,chargeTotalAmount=chargeTotalAmount, | ||
385 | + freezeMoneySymbol=freezeMoneySymbol,comparisonFreezeAmount=comparisonFreezeAmount,modified=modified, | ||
386 | + goodsTagIds=goodsTagIds,marketFlag=marketFlag,totalMoney=totalMoney,receivable=receivable, | ||
387 | + collectionPrice=collectionPrice,discountAmount=discountAmount,handReceivableAmount=handReceivableAmount, | ||
388 | + itemReceivableAmount=itemReceivableAmount,receivableAmount=receivableAmount,categoryName=categoryName, | ||
389 | + categoryId=carTypeId,grossWeightDate=grossWeightDate,tareWeightDate=tareWeightDate,sumPrice=sumPrice) | ||
390 | + | ||
391 | +print(res.text) | ||
103 | \ No newline at end of file | 392 | \ No newline at end of file |
commons/api/zcApi.py
@@ -280,6 +280,8 @@ def create_jmsf(host=None,carTypeName=None,keyword="蔬菜",userName=None,transa | @@ -280,6 +280,8 @@ def create_jmsf(host=None,carTypeName=None,keyword="蔬菜",userName=None,transa | ||
280 | [i for i in proveType.json()["data"] if i["name"] == proveName][0]) | 280 | [i for i in proveType.json()["data"] if i["name"] == proveName][0]) |
281 | proveTypeCode = proveType.json()["data"][proveTypeIndex]["id"] | 281 | proveTypeCode = proveType.json()["data"][proveTypeIndex]["id"] |
282 | proveTypeName = proveType.json()["data"][proveTypeIndex]["name"] | 282 | proveTypeName = proveType.json()["data"][proveTypeIndex]["name"] |
283 | + print("proveTypeCode", proveTypeCode) | ||
284 | + print("proveTypeName", proveTypeName) | ||
283 | 285 | ||
284 | # 获取防重token | 286 | # 获取防重token |
285 | duplicateTokenRes = get_duplicateToken(host=host) | 287 | duplicateTokenRes = get_duplicateToken(host=host) |
@@ -299,6 +301,7 @@ def create_jmsf(host=None,carTypeName=None,keyword="蔬菜",userName=None,transa | @@ -299,6 +301,7 @@ def create_jmsf(host=None,carTypeName=None,keyword="蔬菜",userName=None,transa | ||
299 | weighmanRecord["grossWeight"] = carTypeWeight+newWeight | 301 | weighmanRecord["grossWeight"] = carTypeWeight+newWeight |
300 | weighmanRecord["tareWeight"] = carTypeWeight | 302 | weighmanRecord["tareWeight"] = carTypeWeight |
301 | weighmanRecord["newWeight"] = newWeight | 303 | weighmanRecord["newWeight"] = newWeight |
304 | + print("weighmanRecord",weighmanRecord) | ||
302 | weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) | 305 | weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) |
303 | 306 | ||
304 | # 创建进门单 | 307 | # 创建进门单 |
commons/scripts/jsonToUrlcode.py
0 → 100644
1 | +# -*- coding: utf-8 -*- | ||
2 | + | ||
3 | +# @Time : 2021/8/4 14:33 | ||
4 | +# @Author : Ljq | ||
5 | +# @File : jsonToUrlcode.py | ||
6 | +# @Software: PyCharm | ||
7 | + | ||
8 | +""" | ||
9 | + | ||
10 | +""" | ||
11 | + | ||
12 | +def jsonToUrlcode(data_json={}): | ||
13 | + """json格式数据转换未urlcode格式数据""" | ||
14 | + data_uc = "" | ||
15 | + for k, v in data_json.items(): | ||
16 | + data_uc = data_uc + str(k) + "=" + str(v) + "&" | ||
17 | + print(data_uc) | ||
18 | + return data_uc | ||
19 | + | ||
20 | +# data_json = {"a": "a1", "b": "b1"} | ||
21 | +# print(jsonToUrlcode(data_json)) | ||
0 | \ No newline at end of file | 22 | \ No newline at end of file |
report/test.log
1 | +[2021-08-04 17:04:36] [INFO] : ====================================================================================== | ||
2 | +[2021-08-04 17:04:36] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/listPage.action | ||
3 | +{'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': '202108040900002'} | ||
4 | +{} | ||
5 | + | ||
6 | +[2021-08-04 17:04:37] [INFO] : ====================================================================================== | ||
7 | +[2021-08-04 17:04:37] [INFO] : http://test.jmsf.diligrp.com:8385/entranceFeeBill/pay/3710.action | ||
8 | +None | ||
9 | +{} | ||
10 | + | ||
11 | +[2021-08-04 17:04:38] [INFO] : ====================================================================================== | ||
12 | +[2021-08-04 17:04:38] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/icCheck?ic=888810032426 | ||
13 | +None | ||
14 | +{} | ||
15 | + | ||
16 | +[2021-08-04 17:04:39] [INFO] : ====================================================================================== | ||
17 | +[2021-08-04 17:04:39] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州 | ||
18 | +None | ||
19 | +{} | ||
20 | + | ||
21 | +[2021-08-04 17:04:39] [INFO] : ====================================================================================== | ||
22 | +[2021-08-04 17:04:39] [INFO] : http://test.jmsf.diligrp.com:8385/calculate/index.action | ||
23 | +{'protocolId': '', 'pwd': '', 'clientRedirectTag': '', 'viewType': 'pay', 'optType': '0', 'optUrl': '', 'correctInfo': '1', 'weightType': '1', 'id': 3710, 'goodsId': '3724', 'number': '202108040900002', 'modified': '2021-08-04 17:04:39', 'status': '2', 'source': '1', 'updateFeeItems': '', 'correctDiscount': '1', 'totalAmount': '', 'customerId': '0', 'fundAccount': '', 'ic': '', 'customerName': '', 'customerPhone': '', 'payway': '刷卡', 'plate': '川B00002', 'autocomplete-cartype': '003(板车)', 'carTypeName': '板车', 'carTypeCode': '003', 'carTypeId': '53', 'carTypeWeight': '333', 'storeTareWeight': '', 'proveType': '665', 'grossWeight': '353', 'tareWeight': '333', 'weight': '353', 'goodsNum': '', 'itemWeight': '', 'productPrice': '1.00000', 'unitPrice': '100.0', 'depName': '水果部', 'calcDepId': '53', 'regionName': '', 'regionId': '0', 'productName': '蔬菜', 'productId': '14152', 'productArea': '万州区', 'parentId': '', 'levelType': '', 'originId': 500101, 'tradeTypeId': '71', 'chargeTotalAmount': '', 'chargeTotalAmountYuan': '', 'freezeMoneySymbol': '', 'comparisonFreezeAmount': '', 'created': '2021-08-04 10:11:31', 'remark': 'false', 'goodsTagIds': '1900', 'shareRatio': '0', 'handlingTeam': '', 'handlingRatio': '', 'handActualAmount': '', 'handManageAmount': '', 'handCollectionAmount': '', 'receivableAmount': '', 'categoryName': '蔬菜', 'categoryId': '14152', 'driverTel': '', 'grossWeightDate': '2021-08-04 10:11:31', 'tareWeightDate': '2021-08-04 10:11:31', 'grossPathName': '', 'grossPathId': '', 'tarePathId': '', 'goodsRemark': '', 'inGreeterName': '', 'inGreeterId': '0', 'outGreeterId': '', 'sumPrice': '2000', 'shipperName': '', 'shipperId': '', 'shipperPhone': '', 'feeDepName': '', 'calcFeeDepId': '', 'newWeight': '20'} | ||
24 | +{} | ||
25 | + | ||
26 | +[2021-08-04 17:04:40] [INFO] : ====================================================================================== | ||
27 | +[2021-08-04 17:04:40] [INFO] : http://test.jmsf.diligrp.com:8385/entranceTrade/doPay.action | ||
28 | +protocolId=&pwd=111111&clientRedirectTag=&viewType=pay&optType=0&optUrl=&correctInfo=1&weightType=1&id=3710&goodsId=3724&number=202108040900002&modified=2021-08-04 10:11:31&status=2&source=1&updateFeeItems=&correctDiscount=1&totalAmount=600&customerId=389&fundAccount=105847&ic=888810032426&customerName=长歌买家省内啊啊啊嘿&customerPhone=18011501258&payway=刷卡&plate=川B00002&autocomplete-cartype=003(板车)&carTypeName=板车&carTypeCode=003&carTypeId=53&carTypeWeight=333&storeTareWeight=&proveType=665&grossWeight=353&tareWeight=333&weight=353&goodsNum=&itemWeight=&productPrice=1.00000&unitPrice=100.0&depName=水果部&calcDepId=53&dep=53®ionName=A1区®ionId=72&productName=蔬菜&productId=14152&productArea=重庆,重庆市,万州区&parentId=&levelType=&originId=500101&tradeTypeId=71&chargeTotalAmount=600&chargeTotalAmountYuan={chargeTotalAmountYuan}&freezeMoneySymbol=9&comparisonFreezeAmount=9&created=2021-08-04 10:11:31&remark=&goodsTagIds=1900&marketFlag=9&totalMoney=600&receivable=1300&collectionPrice=500&discountAmount=500&handReceivableAmount=10000&itemReceivableAmount=1300&shareRatio=0&handlingTeam=&handActualAmount=0&handManageAmount=0&handCollectionAmount=0&receivableAmount=1300&categoryName=蔬菜&categoryId=53&driverTel=&grossWeightDate=2021-08-04 10:11:31&tareWeightDate=2021-08-04 10:11:31&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={"discount":500,"id":103,"name":"交易管理费","receivable":1000,"require":1}&billItemDicCheckIds=105&billItemsDic={"discount":0,"id":105,"name":"优惠收费","receivable":500,"require":0}&billItemCheckIds=106&106=3.00&billItems={"discount":0,"id":106,"name":"检测费","receivable":300,"require":1} | ||
29 | +{} | ||
30 | + |
testcase/test_ZC/demo.py
testcase/test_ZC/test_ZC.py
@@ -122,12 +122,12 @@ class test_demo(unittest.TestCase): | @@ -122,12 +122,12 @@ class test_demo(unittest.TestCase): | ||
122 | 122 | ||
123 | def test_cre(self): | 123 | def test_cre(self): |
124 | """调用方法1""" | 124 | """调用方法1""" |
125 | - cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="挂车",plate="川B00001",keyword="山药", | 125 | + cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="挂车",plate="川B00001",keyword="雪莲果", |
126 | userName="ty_test",transactionName="沈阳2号",newWeight=20, | 126 | userName="ty_test",transactionName="沈阳2号",newWeight=20, |
127 | depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") | 127 | depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜") |
128 | print(cre_res.json()) | 128 | print(cre_res.json()) |
129 | - cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00002",newWeight=20) | ||
130 | - print(cre_res.json()) | 129 | + # cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00002",newWeight=20) |
130 | + # print(cre_res.json()) | ||
131 | 131 | ||
132 | 132 | ||
133 | 133 |