autotest / jmsf-re · Commits

Commit 68dd1fb0c705f3c447f9011d21ef2ac1bb0a42b1

Authored by lixi
2 parents ead97580 4841d618
build: skipped

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 7 changed files with 59 additions and 43 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 7 of 10 files are displayed.

commons/api/entranceFeeBillList/operationDoAmend.py
  View file @68dd1fb
@@ -240,11 +240,11 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费å•å @@ -240,11 +240,11 @@ def do_amendOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费å•å
240 # customerName = res.json()["data"]["aInfo"]["customerName"] 240 # customerName = res.json()["data"]["aInfo"]["customerName"]
241 # accountId = res.json()["data"]["aInfo"]["accountId"] 241 # accountId = res.json()["data"]["aInfo"]["accountId"]
242 # mobile = res.json()["data"]["aInfo"]["mobile"] 242 # mobile = res.json()["data"]["aInfo"]["mobile"]
243 -  
244 - customerId = ""  
245 - customerName = ""  
246 - accountId = ""  
247 - mobile = "" 243 + customerId = orderDetailsDict["customerId"]
  244 + customerName = orderDetailsDict["customerName"]
  245 + accountId = orderDetailsDict["accountId"]
  246 + mobile = orderDetailsDict["customerPhone"]
  247 + ic = orderDetailsDict["ic"]
248 248
249 # çœå¸‚åŒºèŽ·å– 249 # çœå¸‚区获å–
250 res = eFBL.get_city(host=host, name="万州") 250 res = eFBL.get_city(host=host, name="万州")
commons/api/entranceFeeBillList/operationDoCorrect.py
  View file @68dd1fb
@@ -246,11 +246,11 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -246,11 +246,11 @@ def do_correctOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
246 # customerName = res.json()["data"]["aInfo"]["customerName"] 246 # customerName = res.json()["data"]["aInfo"]["customerName"]
247 # accountId = res.json()["data"]["aInfo"]["accountId"] 247 # accountId = res.json()["data"]["aInfo"]["accountId"]
248 # mobile = res.json()["data"]["aInfo"]["mobile"] 248 # mobile = res.json()["data"]["aInfo"]["mobile"]
249 -  
250 - customerId = ""  
251 - customerName = ""  
252 - accountId = ""  
253 - mobile = "" 249 + customerId = orderDetailsDict["customerId"]
  250 + customerName = orderDetailsDict["customerName"]
  251 + accountId = orderDetailsDict["accountId"]
  252 + mobile = orderDetailsDict["customerPhone"]
  253 + ic = orderDetailsDict["ic"]
254 254
255 # 省市区获取 255 # 省市区获取
256 res = eFBL.get_city(host=host, name="万州") 256 res = eFBL.get_city(host=host, name="万州")
commons/api/entranceFeeBillList/operationDoInvalid.py
  View file @68dd1fb
@@ -224,13 +224,18 @@ def do_invalidOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单 @@ -224,13 +224,18 @@ def do_invalidOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单
224 productPrice = orderDetailsDict["productPrice"] 224 productPrice = orderDetailsDict["productPrice"]
225 225
226 226
227 - # 用户信息获取  
228 - res = eFBL.get_icCheck(host=host, ic=ic)  
229 - print(res.text)  
230 - customerId = res.json()["data"]["aInfo"]["customerId"]  
231 - customerName = res.json()["data"]["aInfo"]["customerName"]  
232 - accountId = res.json()["data"]["aInfo"]["accountId"]  
233 - mobile = res.json()["data"]["aInfo"]["mobile"] 227 + # # 用户信息获取
  228 + # res = eFBL.get_icCheck(host=host, ic=ic)
  229 + # print(res.text)
  230 + # customerId = res.json()["data"]["aInfo"]["customerId"]
  231 + # customerName = res.json()["data"]["aInfo"]["customerName"]
  232 + # accountId = res.json()["data"]["aInfo"]["accountId"]
  233 + # mobile = res.json()["data"]["aInfo"]["mobile"]
  234 + customerId = orderDetailsDict["customerId"]
  235 + customerName = orderDetailsDict["customerName"]
  236 + accountId = orderDetailsDict["accountId"]
  237 + mobile = orderDetailsDict["customerPhone"]
  238 + ic = orderDetailsDict["ic"]
234 239
235 # 省市区获取 240 # 省市区获取
236 res = eFBL.get_city(host=host, name="万州") 241 res = eFBL.get_city(host=host, name="万州")
commons/api/entranceFeeBillList/operationDoUndo.py
  View file @68dd1fb
@@ -149,17 +149,18 @@ def do_undoOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号 @@ -149,17 +149,18 @@ def do_undoOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号
149 modified = orderDetailsDict["modified"] 149 modified = orderDetailsDict["modified"]
150 150
151 151
152 - # 用户信息获取  
153 - res = eFBL.get_icCheck(host=host, ic=ic)  
154 - print(res.text)  
155 - customerId = res.json()["data"]["aInfo"]["customerId"]  
156 - customerName = res.json()["data"]["aInfo"]["customerName"]  
157 - accountId = res.json()["data"]["aInfo"]["accountId"]  
158 - mobile = res.json()["data"]["aInfo"]["mobile"]  
159 - # customerId = ""  
160 - # customerName = ""  
161 - # accountId = ""  
162 - # mobile = "" 152 + # # 用户信息获取
  153 + # res = eFBL.get_icCheck(host=host, ic=ic)
  154 + # print(res.text)
  155 + # customerId = res.json()["data"]["aInfo"]["customerId"]
  156 + # customerName = res.json()["data"]["aInfo"]["customerName"]
  157 + # accountId = res.json()["data"]["aInfo"]["accountId"]
  158 + # mobile = res.json()["data"]["aInfo"]["mobile"]
  159 + customerId = orderDetailsDict["customerId"]
  160 + customerName = orderDetailsDict["customerName"]
  161 + accountId = orderDetailsDict["accountId"]
  162 + mobile = orderDetailsDict["customerPhone"]
  163 + ic = orderDetailsDict["ic"]
163 164
164 # 省市区获取 165 # 省市区获取
165 res = eFBL.get_city(host=host, name="万州") 166 res = eFBL.get_city(host=host, name="万州")
commons/api/entranceFeeBillList/operationDoUpdate.py
  View file @68dd1fb
@@ -224,13 +224,18 @@ def do_updateOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费å•å @@ -224,13 +224,18 @@ def do_updateOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费å•å
224 productPrice = orderDetailsDict["productPrice"] 224 productPrice = orderDetailsDict["productPrice"]
225 225
226 226
227 - # 用户信æ¯èŽ·å–  
228 - res = eFBL.get_icCheck(host=host, ic=ic)  
229 - print(res.text)  
230 - customerId = res.json()["data"]["aInfo"]["customerId"]  
231 - customerName = res.json()["data"]["aInfo"]["customerName"]  
232 - accountId = res.json()["data"]["aInfo"]["accountId"]  
233 - mobile = res.json()["data"]["aInfo"]["mobile"] 227 + # # 用户信æ¯èŽ·å–
  228 + # res = eFBL.get_icCheck(host=host, ic=ic)
  229 + # print(res.text)
  230 + # customerId = res.json()["data"]["aInfo"]["customerId"]
  231 + # customerName = res.json()["data"]["aInfo"]["customerName"]
  232 + # accountId = res.json()["data"]["aInfo"]["accountId"]
  233 + # mobile = res.json()["data"]["aInfo"]["mobile"]
  234 + customerId = orderDetailsDict["customerId"]
  235 + customerName = orderDetailsDict["customerName"]
  236 + accountId = orderDetailsDict["accountId"]
  237 + mobile = orderDetailsDict["customerPhone"]
  238 + ic = orderDetailsDict["ic"]
234 239
235 # çœå¸‚åŒºèŽ·å– 240 # çœå¸‚区获å–
236 res = eFBL.get_city(host=host, name="万州") 241 res = eFBL.get_city(host=host, name="万州")
commons/api/entranceFeeBillList/operationUnfreeze.py
  View file @68dd1fb
@@ -215,13 +215,18 @@ def do_unfreezeOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费å @@ -215,13 +215,18 @@ def do_unfreezeOrder(host="http://test.jmsf.diligrp.com:8385",attrName="收费å
215 productPrice = orderDetailsDict["productPrice"] 215 productPrice = orderDetailsDict["productPrice"]
216 216
217 217
218 - # 用户信æ¯èŽ·å–  
219 - res = eFBL.get_icCheck(host=host, ic=ic)  
220 - print(res.text)  
221 - customerId = res.json()["data"]["aInfo"]["customerId"]  
222 - customerName = res.json()["data"]["aInfo"]["customerName"]  
223 - accountId = res.json()["data"]["aInfo"]["accountId"]  
224 - mobile = res.json()["data"]["aInfo"]["mobile"] 218 + # # 用户信æ¯èŽ·å–
  219 + # res = eFBL.get_icCheck(host=host, ic=ic)
  220 + # print(res.text)
  221 + # customerId = res.json()["data"]["aInfo"]["customerId"]
  222 + # customerName = res.json()["data"]["aInfo"]["customerName"]
  223 + # accountId = res.json()["data"]["aInfo"]["accountId"]
  224 + # mobile = res.json()["data"]["aInfo"]["mobile"]
  225 + customerId = orderDetailsDict["customerId"]
  226 + customerName = orderDetailsDict["customerName"]
  227 + accountId = orderDetailsDict["accountId"]
  228 + mobile = orderDetailsDict["customerPhone"]
  229 + ic = orderDetailsDict["ic"]
225 230
226 # çœå¸‚åŒºèŽ·å– 231 # çœå¸‚区获å–
227 res = eFBL.get_city(host=host, name="万州") 232 res = eFBL.get_city(host=host, name="万州")
config/marketConfig/test_config_hg.conf
  View file @68dd1fb
@@ -10,7 +10,7 @@ cCNumB=110101199903077593 @@ -10,7 +10,7 @@ cCNumB=110101199903077593
10 #入库未开卡的卡号 10 #入库未开卡的卡号
11 cardNum=210607113166 11 cardNum=210607113166
12 #已开卡的卡号 12 #已开卡的卡号
13 -cardNumRe=888810032426 13 +cardNumRe=888810033081
14 #密码设置 14 #密码设置
15 loginPwd=111111 15 loginPwd=111111
16 16