Merge remote-tracking branch 'origin/master'

lixi
2 parents 2635b8d3 bb414ba8
Showing 6 changed files with 166 additions and 113 deletions
commons/api/entranceFeeBillList.py
commons/api/zcApi.py
config/marketConfig/test_config_hg.conf
report/test.log
testcase/test_ZC/demo.py
testcase/test_ZC/test_ZC.py
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/29 16:48
+# @Author  : Ljq
+# @File    : entranceFeeBillList.py
+# @Software: PyCharm
+
+"""
+进门单列表接口封装
+"""
+
+import json,time,random
+from commons.scripts import dealContentType as dct
+from commons.MySession import my
+import urllib3
+
+def listPage(host="",attrName="收费单号",attrValue=None,**kwargs):
+    """
+    进门单列表查询接口
+    :param kwargs:
+                rows=10
+                page=1
+                sort=et.created
+                order=desc
+                attr=number
+                attrValue=11
+                carTypeId=53
+                categoryId=14152
+                productName=1
+                status=2
+                tradeTypeId=70
+                tareOperatorName=11
+                startTime=2021-07-29 00:00:00
+                endTime=2021-07-29 23:59:59
+                startPayTime=2021-07-29 00:00:00
+                endPayTime=2021-07-29 23:59:59
+                startRefundTime=2021-07-29 00:00:00
+                endRefundTime=2021-07-29 23:59:59
+    """
+
+    headers = dct.urlCode()
+    url = host + "/entranceFeeBill/listPage.action"
+    attr_list = {"收费单号": "number", "车号": "likePlate", "商品": "goods", "收费员": "pay", "客户姓名": "cname",
+            "客户卡号": "ic", "手机号码": "phone"}
+    data = {"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"}
+
+    # 查询类型处理
+    attr = attr_list[attrName]
+    data["attr"] = attr
+    if attrValue != None:
+        data["attrValue"]=attrValue
+
+    # 参数替换与部分参数数据格式处理
+    data = dict(data, **kwargs)
+    data["metadata[created]"] = json.dumps(data["metadata[created]"])
+    data["metadata[totalPrice]"] = json.dumps(data["metadata[totalPrice]"])
+    data["metadata[paymentTime]"] = json.dumps(data["metadata[paymentTime]"])
+    data["metadata[type]"] = json.dumps(data["metadata[type]"])
+    data["metadata[status]"] = json.dumps(data["metadata[status]"])
+
+    # 请求接口
+    res = my.useHeadersRequests(method="POST", url=url, data=data, headers=headers)
+    return res
+
+def get_OrderDetails(host="",orderId=None):
+    """获取订单详情"""
+    headers = dct.urlCode()
+    url = host + f"/entranceFeeBill/pay/{orderId}.action"
+    res = my.useHeadersRequests("get", url=url, headers=headers)
+    return res
+
+def get_icCheck(host="",ic=None):
+    """进门缴费单详情页面刷卡刷卡"""
+    headers = dct.urlCode()
+    url = host + f"/api/jmsf/ajax/icCheck?ic={ic}"
+    res = my.useHeadersRequests("get", url=url,headers=headers)
+    return res
+
+def get_city(host="",name=None):
+    """进门缴费单详情页面获取产地信息"""
+    headers = dct.urlCode()
+    url = host + f"/api/jmsf/ajax/city/?name={name}&query={name}"
+    res = my.useHeadersRequests("get", url=url,headers=headers)
+    return res
+
+# a = listPage(host="http://test.jmsf.diligrp.com:8385",attrName="收费单号",attrValue="202107290900021")
+# print(a.json())
+# orderId = a.json()["rows"][0]["id"]
+# print(orderId)
+# res = getOrderDetails(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)
+# res = get_city(host="http://test.jmsf.diligrp.com:8385",name="万州")
+# print(res.text)
 \ No newline at end of file
@@ -9,9 +9,8 @@
 整车进门相关接口
 """
  
-import json
+import json,time,random
 from commons.scripts import dealContentType as dct
-from commons import common
 from commons.MySession import my
  
  
@@ -191,7 +190,7 @@ 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="蔬菜",**kwargs):
+def create_jmsf(host=None,keyword="蔬菜",newWeight=99,plate="川A12345"):
     """
  
     """
@@ -212,7 +211,7 @@ def create_jmsf(host=None,keyword=&quot;蔬菜&quot;,**kwargs):
     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"]
@@ -255,9 +254,21 @@ def create_jmsf(host=None,keyword=&quot;蔬菜&quot;,**kwargs):
     duplicateToken = duplicateTokenRes.json()["data"]
  
     # 创建生成进门单
-    plate = "川A12323"
+    plate = plate
     productState = "1"
     trailerNumber = plate
+
+    # 重量信息准备
+    newWeight = newWeight
+    tareWeight = carTypeWeight
+    weighmanRecord = {"grossWeight": None, "grossWeightDate": "", "newWeight": None, "tareWeight": None,
+                      "tareWeightDate": None, "weighImgs": []}
+    weighmanRecord["grossWeight"] = carTypeWeight+newWeight
+    weighmanRecord["tareWeight"] = carTypeWeight
+    weighmanRecord["newWeight"] = newWeight
+    weighmanRecord["grossWeightDate"] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+    # 创建进门单
     cre_res = create_wholeCarWeighSave(host=host, duplicateToken=duplicateToken,
                                            carTypeCode=carTypeCode, carTypeId=carTypeId,
                                            carTypeName=carTypeName, carTypeWeight=carTypeWeight, plate=plate,
@@ -266,5 +277,6 @@ def create_jmsf(host=None,keyword=&quot;蔬菜&quot;,**kwargs):
                                            cateId=cateId, originId=originId, origin=origin, originCode=originCode,
                                            tradeType=tradeType, tradeTypeName=tradeTypeName, productState=productState,
                                            tradeTypeId=tradeTypeId, goodsTagId=goodsTagId, inGreeterId=inGreeterId,
-                                           inGreeterName=inGreeterName, dep=feeDepId)
-    print(cre_res.json())
 \ No newline at end of file
+                                           inGreeterName=inGreeterName, dep=feeDepId, weighmanRecord=weighmanRecord)
+    print(cre_res.json())
+    return cre_res
 \ No newline at end of file
@@ -17,4 +17,5 @@ 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
+gatewayHost=http://test.gateway.diligrp.com:8285
+jmsfHost=http://test.jmsf.diligrp.com:8385
 \ No newline at end of file
-[2021-07-29 14:16:42] [INFO] : ======================================================================================
-[2021-07-29 14:16:42] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
-{"businessCode": "jmsf"}
-{}
-
-[2021-07-29 14:16:43] [INFO] : ======================================================================================
-[2021-07-29 14:16:43] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
-{"marketId": 9, "state": 1, "keyword": "\u5c71\u836f"}
-{}
-
-[2021-07-29 14:16:43] [INFO] : ======================================================================================
-[2021-07-29 14:16:43] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
-{"firmCode": "sy", "departmentId": 58, "keyword": ""}
-{}
-
-[2021-07-29 14:16:44] [INFO] : ======================================================================================
-[2021-07-29 14:16:44] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
-{"pageNum": 100, "pageSize": 100, "marketId": 9}
-{}
-
-[2021-07-29 14:16:44] [INFO] : ======================================================================================
-[2021-07-29 14:16:44] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'goods_tag'}}
-
-[2021-07-29 14:16:49] [INFO] : ======================================================================================
-[2021-07-29 14:16:49] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
-{"province": "C", "city": null, "area": null}
-{}
-
-[2021-07-29 14:16:50] [INFO] : ======================================================================================
-[2021-07-29 14:16:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
-{"keyword": ""}
-{}
-
-[2021-07-29 14:16:50] [INFO] : ======================================================================================
-[2021-07-29 14:16:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'prove_type'}}
-
-[2021-07-29 14:16:51] [INFO] : ======================================================================================
-[2021-07-29 14:16:51] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
+[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
 {}
  
-[2021-07-29 14:16:51] [INFO] : ======================================================================================
-[2021-07-29 14:16:51] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
-{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA12323", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14156, "productName": "\u5c71\u836f", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 3.0, "grossWeightDate": "2021-07-28 16:28:24", "newWeight": 2.0, "tareWeight": 1.0, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA12323", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14156, "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}
-{}
-
-[2021-07-29 14:16:53] [INFO] : ======================================================================================
-[2021-07-29 14:16:53] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
-{"businessCode": "jmsf"}
-{}
-
-[2021-07-29 14:16:54] [INFO] : ======================================================================================
-[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
-{"marketId": 9, "state": 1, "keyword": "\u852c\u83dc"}
-{}
-
-[2021-07-29 14:16:54] [INFO] : ======================================================================================
-[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
-{"firmCode": "sy", "departmentId": 58, "keyword": ""}
-{}
-
-[2021-07-29 14:16:54] [INFO] : ======================================================================================
-[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
-{"pageNum": 100, "pageSize": 100, "marketId": 9}
-{}
-
-[2021-07-29 14:16:54] [INFO] : ======================================================================================
-[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'goods_tag'}}
-
-[2021-07-29 14:16:55] [INFO] : ======================================================================================
-[2021-07-29 14:16:55] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
-{"province": "C", "city": null, "area": null}
-{}
-
-[2021-07-29 14:16:55] [INFO] : ======================================================================================
-[2021-07-29 14:16:55] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
-{"keyword": ""}
-{}
-
-[2021-07-29 14:16:55] [INFO] : ======================================================================================
-[2021-07-29 14:16:55] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
-None
-{'params': {'pid': 'prove_type'}}
-
-[2021-07-29 14:16:56] [INFO] : ======================================================================================
-[2021-07-29 14:16:56] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
-None
-{}
-
-[2021-07-29 14:16:56] [INFO] : ======================================================================================
-[2021-07-29 14:16:56] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
-{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA12323", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14152, "productName": "\u852c\u83dc", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 3.0, "grossWeightDate": "2021-07-28 16:28:24", "newWeight": 2.0, "tareWeight": 1.0, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA12323", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14152, "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}
-{}
-
@@ -10,9 +10,27 @@
 """
  
 import json
+import datetime,time
+import urllib
+
+# print(time.localtime())
+import urllib3
+
+print(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
+
+# a = {"aa":"阿三大苏打","bb":"bb","cc":{"cc1":"啊实打","cc2":"ad"}}
+# print(a)
+# data = {"cc":{"cc1":"2"}}
+# b = dict(a,**data)
+# print(b)
+
+# def doDcit(**kwargs):
+#     a = {"aa": "阿三大苏打", "bb": "bb", "cc": {"cc1": "啊实打","cc2":"ad"}}
+#     print(a)
+#     b = dict(a,**kwargs)
+#     print(b)
+
+a = {"收费单号":"number","车号":"likePlate","商品":"goods","收费员":"pay","客户姓名":"cname","客户卡号":"ic","手机号码":"phone"}
+print(a["收费单号"])
+urllib3
  
-a = {"aa":"阿三大苏打","bb":"bb","cc":{"cc1":"啊实打"}}
-print(a)
-data = {"cc":{"cc1":"2"}}
-b = json.dumps(a,ensure_ascii=False)
-print(b)
 \ No newline at end of file
@@ -13,6 +13,7 @@ import json
 import unittest
 from commons.scripts.readConf import rC
 from commons.api import zcApi as zcA
+import time,random
  
 class test_demo(unittest.TestCase):
     """整车-整车进门单创建"""
@@ -26,11 +27,13 @@ class test_demo(unittest.TestCase):
     @classmethod
     def setUpClass(cls) -> None:
         cls.gatewayHost = rC.returnOptionsItems("host", "gatewayHost")
+        cls.jmsfHost = rC.returnOptionsItems("host", "jmsfHost")
  
     @classmethod
     def tearDownClass(cls) -> None:
         pass
  
+    @unittest.skip
     def test_get_carType(self):
         """整车-整车创建:获取车型接口调用测试"""
         # 获取车型
@@ -96,6 +99,17 @@ class test_demo(unittest.TestCase):
         plate = "川A12323"
         productState = "1"
         trailerNumber = plate
+
+        # 重量信息准备
+        grossWeight = random.randint(carTypeWeight,carTypeWeight+100)
+        tareWeight = carTypeWeight
+        weighmanRecord = {"grossWeight":None, "grossWeightDate": "", "newWeight": None,"tareWeight":None, "tareWeightDate": None, "weighImgs": []}
+        weighmanRecord["grossWeight"] = grossWeight
+        weighmanRecord["tareWeight"] = carTypeWeight
+        weighmanRecord["newWeight"] = grossWeight-carTypeWeight
+        weighmanRecord["grossWeightDate"]= time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+        # 创建进门单
         cre_res = zcA.create_wholeCarWeighSave(host=self.gatewayHost,duplicateToken=duplicateToken,carTypeCode=carTypeCode,carTypeId=carTypeId,
                                                carTypeName=carTypeName,carTypeWeight=carTypeWeight,plate=plate,
                                                productId=productId,productName=productName,proveTypeCode=proveTypeCode,
@@ -103,12 +117,14 @@ class test_demo(unittest.TestCase):
                                                cateId=cateId,originId=originId,origin=origin,originCode=originCode,
                                                tradeType=tradeType,tradeTypeName=tradeTypeName,productState=productState,
                                                tradeTypeId=tradeTypeId,goodsTagId=goodsTagId,inGreeterId=inGreeterId,
-                                               inGreeterName=inGreeterName,dep=feeDepId)
+                                               inGreeterName=inGreeterName,dep=feeDepId,weighmanRecord=weighmanRecord)
         print(cre_res.json())
  
     def test_cre(self):
         """调用方法1"""
-        zcA.create_jmsf(host=self.gatewayHost,keyword="山药")
+        cre_res = zcA.create_jmsf(host=self.gatewayHost,plate="川B00001",keyword="山药",newWeight=20)
+        print(cre_res.json())
+
  
  
  
@@ -116,4 +132,4 @@ class test_demo(unittest.TestCase):
  
 # if __name__ == "__main__":
 #     unittest.main()
-# 啊实打
 \ No newline at end of file
+#
 \ No newline at end of file