Merge remote-tracking branch 'origin/master'

wenleiming
2 parents cf70498e d6d67624
Showing 11 changed files with 72 additions and 54 deletions
commons/Faker.py
commons/api/entranceFeeBillList.py
commons/api/weighingServiceSave.py
commons/api/zcApi.py
commons/api/duplicateToken.py → commons/basic/duplicateToken.py
commons/basic/listCarType.py
config/marketConfig/test_config_hg2.conf
report/test.log
testcase/test_ZC/demo.py
testcase/test_ZC/test_ZC.py
testcase/weightBizBill/test_weighingServiceSave.py
@@ -18,7 +18,7 @@ class random_data():
             return self.fake.name()
         def identity_card(self):
-            "随机姓名"
+            "随机证件"
             return self.fake.ssn(min_age=18, max_age=90)
         def plate(self):
@@ -26,6 +26,7 @@ class random_data():
             return self.fake.license_plate()
         def plate_cn(self,plate_len=6):
+            "随机车牌号"
             char0='京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽赣粤青藏川宁琼'
             char1='ABCDEFGHJKLMNPQRSTUVWXYZ'#车牌号中没有I和O，可自行百度
             char2='1234567890'
@@ -93,7 +93,7 @@ def get_city(host=&quot;&quot;,name=None):
 # print(a.json())
 # orderId = a.json()["rows"][0]["id"]
 # print(orderId)
-# res = getOrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId)
+# res = get_OrderDetails(host="http://test.jmsf.diligrp.com:8385",orderId=orderId)
 # print(res.text)
 # res = get_icCheck(host="http://test.jmsf.diligrp.com:8385",ic=888810032426)
 # print(res.text)
@@ -2,8 +2,8 @@
 # -*- coding: UTF-8 -*-
 import urllib3
 from commons import common as com
-from commons.MySession import my,sy1,sy2
-from commons.api.duplicateToken import duplicateToken
+from commons.MySession import sy1
+from commons.basic.duplicateToken import duplicateToken
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 du=duplicateToken()
@@ -7,6 +7,8 @@
 """
 整车进门相关接口
+1.整车进门基础接口封装
+2.整车进门create_jmsf进门单一步创建接口封装
 """
 import json,time,random
@@ -190,18 +192,23 @@ def create_wholeCarWeighSave(host=&quot;&quot;,duplicateToken=None,**kwargs):
     res = my.useHeadersRequests(method="POST", url=url, data=json.dumps(data), headers=headers)
     return res
-def create_jmsf(host=None,keyword="蔬菜",newWeight=99,plate="川A12345"):
+def create_jmsf(host=None,carTypeName=None,keyword="蔬菜",userName=None,transactionName=None,
+                newWeight=99,plate="川A12345",goodsTagName=None,depName=None,proveName=None):
     """
     """
     # 获取车型
     carType = get_carType(host=host)
     print(carType.text)
-    print(carType.json()["data"][0])
-    carTypeCode = carType.json()["data"][0]["code"]
-    carTypeId = carType.json()["data"][0]["id"]
-    carTypeName = carType.json()["data"][0]["carTypeName"]
-    carTypeWeight = carType.json()["data"][0]["weight"]
+    if carTypeName ==None:
+        carTypeIndex = 0
+    else:
+        carTypeIndex = carType.json()["data"].index(
+            [i for i in carType.json()["data"] if i["carTypeName"] == carTypeName][0])
+    carTypeCode = carType.json()["data"][carTypeIndex]["code"]
+    carTypeId = carType.json()["data"][carTypeIndex]["id"]
+    carTypeName = carType.json()["data"][carTypeIndex]["carTypeName"]
+    carTypeWeight = carType.json()["data"][carTypeIndex]["weight"]
     # 获取商品
     categoryByCondition = get_listCategoryByCondition(host=host,keyword=keyword)
@@ -211,23 +218,39 @@ def create_jmsf(host=None,keyword=&quot;蔬菜&quot;,newWeight=99,plate=&quot;川A12345&quot;):
     productName = categoryByCondition.json()["data"][0]["name"]
     productCode = categoryByCondition.json()["data"][0]["keycode"]
-    # 获取商品
+    # 获取接车员信息
     listByExample = get_listByExample(host=host)
     print(listByExample.json())
-    inGreeterId = listByExample.json()["data"][0]["id"]
-    inGreeterName = listByExample.json()["data"][0]["realName"]
+    if userName ==None:
+        listByExampleIndex = 0
+    else:
+        listByExampleIndex = listByExample.json()["data"].index(
+            [i for i in listByExample.json()["data"] if i["userName"] == userName][0])
+    inGreeterId = listByExample.json()["data"][listByExampleIndex]["id"]
+    inGreeterName = listByExample.json()["data"][listByExampleIndex]["realName"]
     # 获取交易类型
     transactionType = query_transactionType(host=host)
     print(transactionType.json())
-    tradeType = transactionType.json()["rows"][0]["code"]
-    tradeTypeId = transactionType.json()["rows"][0]["id"]
-    tradeTypeName = transactionType.json()["rows"][0]["name"]
+    print("交易类型")
+    if transactionName ==None:
+        transactionTypeIndex = 0
+    else:
+        transactionTypeIndex = transactionType.json()["rows"].index(
+            [i for i in transactionType.json()["rows"] if i["name"] == transactionName][0])
+    tradeType = transactionType.json()["rows"][transactionTypeIndex]["code"]
+    tradeTypeId = transactionType.json()["rows"][transactionTypeIndex]["id"]
+    tradeTypeName = transactionType.json()["rows"][transactionTypeIndex]["name"]
     # 获取货物标签
     goodsTag = get_goodsTag(host=host)
     print(goodsTag.json())
-    goodsTagId = goodsTag.json()["data"][0]["id"]
+    if goodsTagName ==None:
+        transactionTypeIndex = 0
+    else:
+        transactionTypeIndex = goodsTag.json()["data"].index(
+            [i for i in goodsTag.json()["data"] if i["name"] == goodsTagName][0])
+    goodsTagId = goodsTag.json()["data"][transactionTypeIndex]["id"]
     # 产地信息获取
     address = get_address(host=host)
@@ -239,14 +262,24 @@ def create_jmsf(host=None,keyword=&quot;蔬菜&quot;,newWeight=99,plate=&quot;川A12345&quot;):
     # 查询部门信息
     depRes = get_dep(host=host)
     print(depRes.json())
-    feeDepId = depRes.json()["data"][0]["id"]
-    feeDepName = depRes.json()["data"][0]["name"]
+    if depName ==None:
+        depResIndex = 0
+    else:
+        depResIndex = depRes.json()["data"].index(
+            [i for i in depRes.json()["data"] if i["name"] == depName][0])
+    feeDepId = depRes.json()["data"][depResIndex]["id"]
+    feeDepName = depRes.json()["data"][depResIndex]["name"]
     # 获取证明类型
     proveType = get_proveType(host=host)
     print(proveType.json())
-    proveTypeCode = proveType.json()["data"][0]["id"]
-    proveTypeName = proveType.json()["data"][0]["name"]
+    if depName ==None:
+        proveTypeIndex = 0
+    else:
+        proveTypeIndex = proveType.json()["data"].index(
+            [i for i in proveType.json()["data"] if i["name"] == proveName][0])
+    proveTypeCode = proveType.json()["data"][proveTypeIndex]["id"]
+    proveTypeName = proveType.json()["data"][proveTypeIndex]["name"]
     # 获取防重token
     duplicateTokenRes = get_duplicateToken(host=host)
@@ -278,5 +311,5 @@ def create_jmsf(host=None,keyword=&quot;蔬菜&quot;,newWeight=99,plate=&quot;川A12345&quot;):
                                            tradeType=tradeType, tradeTypeName=tradeTypeName, productState=productState,
                                            tradeTypeId=tradeTypeId, goodsTagId=goodsTagId, inGreeterId=inGreeterId,
                                            inGreeterName=inGreeterName, dep=feeDepId, weighmanRecord=weighmanRecord)
-    print(cre_res.json())
+    # print(cre_res.json())
     return cre_res
 \ No newline at end of file
@@ -7,6 +7,7 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 class duplicateToken():
+    "称重防重接口，返回唯一的commit_token"
     url = "http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action"
     header = {
             "UAP_accessToken": "demo",
@@ -7,6 +7,7 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 class listCarType():
+    "返回车型的接口"
     url = "http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType"
     header = {
             "UAP_accessToken": "demo",
-#沈阳市场信息
-[loginInfo]
-userName=scgy
-password=DYdgRcAyx2bPboAmu0tgIYBM1kMxFAuDty7IQk4162Zh+8KKa8jtu6xIjG9W4yauTfPiuP1sqxDatskXFqCOz76ea14AqRCYEBz53xVr+vLfcz9zOB2d1T3aIlJbEk8yi2c21pd/MFkBw+Fhd0tky/6eN8kJA8mtsj3uDwSb9qo=
-
-[testInfo]
-#已添加的身份证号
-cCNum=11010119990307865X
-cCNumB=110101199903077593
-#入库未开卡的卡号
-cardNum=210607113166
-#已开卡的卡号
-cardNumRe=888800001207
-#密码设置
-loginPwd=111111
-
-[host]
-cardHost=http://test.card.diligrp.com:8386
-uapHost=http://test.uap.diligrp.com
-gatewayHost=http://test.gateway.diligrp.com:8285
 \ No newline at end of file
-[2021-07-29 18:13:25] [INFO] : ======================================================================================
-[2021-07-29 18:13:25] [INFO] : http://test.jmsf.diligrp.com:8385/api/jmsf/ajax/city/?name=万州&query=万州
-None
-{}
-
@@ -16,7 +16,7 @@ import urllib
 # print(time.localtime())
 import urllib3
-print(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
+# print(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
 # a = {"aa":"阿三大苏打","bb":"bb","cc":{"cc1":"啊实打","cc2":"ad"}}
 # print(a)
@@ -30,7 +30,10 @@ print(time.strftime(&quot;%Y-%m-%d %H:%M:%S&quot;, time.localtime()))
 #     b = dict(a,**kwargs)
 #     print(b)
-a = {"收费单号":"number","车号":"likePlate","商品":"goods","收费员":"pay","客户姓名":"cname","客户卡号":"ic","手机号码":"phone"}
-print(a["收费单号"])
-urllib3
-
+a = {"code":"200","data":[{"autoPass":2,"autoSave":1,"carTypeName":"板车","code":"003","id":53,"number":"0007","remark":"","status":1,"tag":"jmsf","weight":333},{"autoPass":1,"autoSave":1,"carTypeName":"挂车","code":"gc","id":59,"number":"0030","remark":"","status":1,"tag":"jmsf","weight":1},{"autoPass":2,"carTypeName":"柜车","code":"23","id":60,"number":"0031","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":1,"autoSave":1,"carTypeName":"地排车","code":"008","id":87,"number":"0001","remark":"","status":1,"tag":"jmsf","weight":2},{"autoPass":2,"autoSave":1,"carTypeName":"玉玺","code":"888","id":128,"number":"0042","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":2,"carTypeName":"军车","code":"555","id":61,"number":"0013","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":2,"carTypeName":"小面包","code":"","id":142,"number":"0008","remark":"","status":1,"tag":"jmsf","weight":22},{"autoPass":1,"autoSave":1,"carTypeName":"小轿车","code":"001","id":51,"number":"0002","remark":"","status":1,"tag":"jmsf","weight":0},{"autoPass":2,"carTypeName":"123456789012345","code":"1245","id":160,"number":"0044","remark":"","status":1,"tag":"jmsf","weight":11},{"autoPass":2,"carTypeName":"111111111222222","code":"6432","id":161,"number":"0045","remark":"","status":1,"tag":"jmsf","weight":22},{"autoPass":2,"autoSave":1,"carTypeName":"test0731","code":"12345","id":162,"number":"0047","remark":"asdf g hgsaf","status":1,"tag":"jmsf","weight":11}],"message":"OK","result":"OK","success":True}
+print(a["data"])
+# lambda file_name: os.path.getmtime(report_path + file_name)
+b = a["data"].index([i for i in a["data"] if i["carTypeName"]=="地排车"][0])
+print(b)
+# c ="2" if b !=None else "1"
+# print(c)
 \ No newline at end of file
@@ -122,7 +122,11 @@ class test_demo(unittest.TestCase):
     def test_cre(self):
         """调用方法1"""
-        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00001",keyword="山药",newWeight=20)
+        cre_res = zcA.create_jmsf(host=self.gatewayHost,carTypeName="挂车",plate="川B00001",keyword="山药",
+                                  userName="ty_test",transactionName="沈阳2号",newWeight=20,
+                                  depName="接车部",goodsTagName="货物标签测试",proveName="绿色蔬菜")
+        print(cre_res.json())
+        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00002",newWeight=20)
         print(cre_res.json())
@@ -16,7 +16,7 @@ class test_weighingServiceSave(unittest.TestCase):
     @unittest.case_mark(my.mark())
     def test_weighingServiceSave_01(self):
-        "称重服务-称重服务：成功新增一条称重服务单"
+        "称重服务：成功新增一条称重服务单"
         body=we.body.copy()
         body["carTypeId"]=li.car_list()["data"][0]["id"]
         body["carTypeName"]=li.car_list()["data"][0]["carTypeName"]