入库测试用例添加

liujiqiang
1 parent 4672200f
Showing 17 changed files with 912 additions and 31 deletions
commons/ConfigDB.py
commons/api/cardStock.py
commons/api/cardStorageIn.py
commons/api/cardStorageOut.py
commons/api/doLogin.py
commons/api/openCard.py
commons/clientSession.py
commons/readConf.py
commons/scripts/__init__.py
commons/scripts/dealContentType.py
config/global_data.conf
main.py
practice/__init__.py
practice/classA.py
practice/classB.py
report/test.log
testCase/test_addCard.py
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 import pymysql
 import time
-import src.commons.common as ca
+import commons.common as ca
 import json
 from commons.Logging import Logger
 # import chardet
+#coding=utf-8
+
+# @Time    : 2021/7/16 14:09
+# @Author  : Ljq
+# @File    : cardStock.py
+# @Software: PyCharm
+
+
+"""
+    卡片库存接口
+"""
+
+import requests
+import json
+from commons.readConf import readConfig
+
+print("cS")
+
+def cardVoid(cardHost,webHeaders,cardNo):
+    url = cardHost+"/cardStorage/cardVoid.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded; charset=UTF-8"
+    data = {"cardNo":cardNo}
+    res = requests.post(url=url,headers=webHeaders,data=data)
+    return res
+
+def queryCardStorageList(cardHost,webHeaders,**kwargs):
+    """
+    卡片库存查询
+    :param cardHost:
+    :param webHeaders:
+    :param kwargs: {"rows":"10","page":"1","sort":"create_time","order":"desc","type":"10","cardFace":"buyer","state":"1","cardNo":"210524153943","startDate":"2021-05-24","endDate":"2021-05-24"}
+    :return:
+    """
+    url = cardHost+"/cardStorage/queryCardStorageList.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded; charset=UTF-8"
+    data = {"rows":"10","page":"1","sort":"create_time","order":"desc"}
+    data = dict(data,**kwargs)
+    res = requests.post(url=url,headers=webHeaders,data=data)
+    return res
+
+#coding=utf-8
+
+# @Time    : 2021/7/16 14:09
+# @Author  : Ljq
+# @File    : cardStorageIn.py
+# @Software: PyCharm
+
+
+"""
+    入库列表相关接口
+"""
+
+import requests
+import json
+from commons.readConf import readConfig
+
+print("cSI")
+
+# rC = readConfig()
+# cardHost = rC.returnOptionsItems("host","cardHost")
+
+def getCardType(cardHost,webHeaders):
+    """
+    获取卡片类型列表
+    :param cardHost:
+    :param webHeaders:
+    :return:
+    """
+    url = cardHost+"/provider/getLookupList.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded"
+    data={"provider":"cardTypeProvider","queryParams":'{"emptyText":"-- 全部 --"}'}
+    res = requests.post(url=url,headers=webHeaders,data=data)
+    return res
+
+def getCardFace(cardHost,webHeaders):
+    """
+    获取卡面信息列表
+    :param cardHost:
+    :param webHeaders:
+    :return:
+    """
+    url = cardHost+"/provider/getLookupList.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded"
+    data={"provider":"cardFaceProvider","queryParams":'{emptyText:"-- 请选择 --"}'}
+    res = requests.post(url=url,headers=webHeaders,data=data)
+    return res
+
+def returnFaceValue(resCardFace,faceNum):
+    """
+    根据faceNum获取对应卡面的value，目前卡面faceNum值为1-4
+    :param resCardFace:
+    :param faceNum:
+    :return:
+    """
+    # print("resCardFace",type(resCardFace))
+    if resCardFace.json()[0]["text"] == "-- 无--":
+        # 业务需求当存在 卡面 “--无--”  时，入库不需要传递cardFace
+        cardFace = None
+    else:
+        cardFace = resCardFace.json()[faceNum]["value"]
+    return cardFace
+
+
+def savaCard(cardHost,webHeaders,startCardNo,endCardNo,cardType=10,cardFace=None):
+    """
+    卡片入库接口
+    :param cardHost:
+    :param webHeaders:
+    :param startCardNo:
+    :param endCardNo:
+    :param cardType:
+    :param cardFace:
+    :return:
+    """
+    amount = int(endCardNo)-int(startCardNo)+1
+    url = cardHost + "/cardStorageIn/save.action"
+    if cardFace == None:
+        # 当卡面类型为无时，创建入库时，不能传faceNum
+        data = {"cardType": str(cardType), "startCardNo": str(startCardNo), "endCardNo": str(endCardNo), "amount": amount}
+    else:
+        data = {"cardType": str(cardType), "cardFace": cardFace, "startCardNo": str(startCardNo), "endCardNo": str(endCardNo), "amount": amount}
+    webHeaders["Content-Type"] = "application/json; charset=UTF-8"
+    print("savaCard data ---->  ",data)
+    res = requests.post(url=url, headers=webHeaders, data=json.dumps(data))
+    return res
+
+def queryList(cardHost=None,webHeaders=None,**searshData):
+    """
+    入库列表查询
+    :param cardHost:
+    :param webHeaders:
+    :param searshData:
+    :return:
+    """
+    storageInListUrl = cardHost + "/cardStorageIn/queryList.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded"
+    storageInSearshData = {"rows": "10", "page": "1", "sort": "create_time", "order": "desc", "startDate": None,
+                           "endDate": None}
+    storageInSearshData = dict(storageInSearshData,**searshData)
+    # print("storageInSearshData[i]---->",storageInSearshData)
+    res = requests.post(url=storageInListUrl, headers=webHeaders, data=storageInSearshData)
+    return res
+
+def delCard(cardHost=None,webHeaders=None,ids=None):
+    """
+    删除入库记录
+    :param cardHost:
+    :param webHeaders:
+    :param ids:
+    :return:
+    """
+    storageInListUrl = cardHost + "/cardStorageIn/del.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded"
+    delCardData = {"ids":ids}
+    res = requests.post(url=storageInListUrl, headers=webHeaders, data=delCardData)
+    return res
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/5/20 17:41
+# @Author  : Ljq
+# @File    : cardStorageOut.py
+# @Software: PyCharm
+
+
+"""
+    卡片出库接口
+"""
+
+import requests
+import json
+import re
+import time
+from commons.scripts import dealContentType as dCT
+
+def cardAddOut(cardHost=None,webHeaders=None,**kwargs):
+    """
+    卡片出库接口
+    :param cardHost:
+    :param webHeaders:
+    :param kwargs:
+    :return:
+    """
+    url = cardHost+"/cardStorage/addOut.action"
+    webHeaders["Content-Type"] = "application/json; charset=UTF-8"
+    data={"applyUserName":"沈阳长歌","applyUserId":"230","applyUserCode":"scgy","amount":"1","cardNos":"210520174412"}
+    data = dict(data,**kwargs)
+    # print("data---->",data)
+    res = requests.post(url=url,headers=webHeaders,data=json.dumps(data))
+    return res
+
+def getOutPage(cardHost=None,webHeaders=None,**kwargs):
+    """
+    出库列表查询
+    :param cardHost:
+    :param webHeaders:
+    :param kwargs:{"rows":"10","page":"1","sort":"apply_time","order":"desc","cardNo":"210524144001","applyUserName":"长歌","applyUserId":"93","startDate":"2021-05-24 00:00:00","endDate":"2021-05-24 23:59:59"}
+    :return:
+    """
+    url = cardHost+"/cardStorage/outPage.action"
+    webHeaders["Content-Type"] = "application/x-www-form-urlencoded"
+    data = {"rows": "10", "page": "1", "sort": "apply_time", "order": "desc"}
+    data = dict(data,**kwargs)
+    # print("data---->",data)
+    res = requests.post(url=url, headers=webHeaders, data=data)
+    return res
+
+def getCardType(cardHost=None,webHeaders=None,**kwargs):
+    """
+    获取卡片类别
+    :param cardHost:
+    :param webHeaders:
+    :param kwargs:
+    :return:
+    """
+    url = cardHost+"/provider/getLookupList.action"
+    webHeaders = dCT.urlCode(webHeaders)
+    data = {'provider':'cardTypeProvider','queryParams':'{"emptyText":"-- 请选择 --"}'}
+    res = requests.post(url=url,headers=webHeaders,data=data)
+    return res
+
+def getCardFace(cardHost=None,webHeaders=None,**kwargs):
+    """
+    获取卡面信息
+    :param cardHost:
+    :param webHeaders:
+    :param kwargs:
+    :return:
+    """
+    url = cardHost + "/provider/getLookupList.action"
+    webHeaders = dCT.urlCode(webHeaders)
+    data = {'provider':'cardFaceProvider','queryParams':'{emptyText:"-- 请选择 --"}'}
+    res = requests.post(url=url, headers=webHeaders, data=data)
+    return res
+
+def checkCardForOut(cardHost=None,webHeaders=None,**kwargs):
+    """
+    检验当前卡片选择的卡面是否正确
+    :param cardHost:
+    :param webHeaders:
+    :param kwargs:
+    :return:
+    """
+    url = cardHost+"/cardStorage/checkCardForOut.action"
+    webHeaders= dCT.urlCode(webHeaders)
+    data = {"cardNo":"","cardType":"10","cardFace":""}
+    data=dict(data,**kwargs)
+    res = requests.get(url=url,headers=webHeaders,params=data)
+    return res
+
+def getUserInfo(cardHost=None,webHeaders=None,**kwargs):
+    url = cardHost+"/user/listByKeyword.action"
+    webHeaders=dCT.urlCode(webHeaders)
+    data={"name":"scgy","keyword":"scgy"}
+    data=dict(data,**kwargs)
+    res = requests.post(url=url,headers=webHeaders,data=data)
+    return res
+
+def getOutListDetail(cardHost=None,webHeaders=None,id=None):
+    url = cardHost+"/cardStorage/outDetail.html"
+    webHeaders = dCT.urlCode(webHeaders)
+    data = {"id":str(id)}
+    res = requests.get(url=url,headers=webHeaders,params=data)
+    return res
+
+def getOutCardDetail(cardHost=None,webHeaders=None,**kwargs):
+    listRes = getOutPage(cardHost=cardHost, webHeaders=webHeaders,**kwargs)
+    firstId = listRes.json()["rows"][0]["id"]
+    # 查询出库详情
+    resDetail = getOutListDetail(cardHost=cardHost, webHeaders=webHeaders, id=firstId)
+    outCardDetail = re.findall("<ul><li>(.*?)</li></ul>", resDetail.text)
+    return sorted(outCardDetail)
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 14:45
+# @Author  : Ljq
+# @File    : doLogin.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+import requests
+import json
+from commons.readConf import readConfig
+
+class doLogin():
+    def __init__(self):
+        rC = readConfig()
+        self.userName = rC.returnOptionsItems("loginInfo","userName")
+        self.password = rC.returnOptionsItems("loginInfo","password")
+        self.loginUrl = rC.returnOptionsItems("host","uapHost")+"/api/authenticationApi/loginWeb"
+        self.loginData = {"userName":self.userName,"password":self.password}
+        self.webHeaders = {"X-Requested-With":"XMLHttpRequest",
+                           "Content-Type":"application/x-www-form-urlencoded",
+                           "Cookie":"UAP_accessToken=${UAP_accessToken}; UAP_refreshToken=${UAP_refreshToken};UAP_firmId=${UAP_firmId}"}
+
+        self.clientHeaders={"UAP_accessToken":"${UAP_accessToken}",
+                            "UAP_refreshToken":"${UAP_refreshToken}",
+                            "UAP_firmId":"${UAP_firmId}",
+                            "Cookie":"UAP_accessToken=${UAP_accessToken}; UAP_refreshToken=${UAP_refreshToken}",
+                            "Content-Type":"application/json"}
+
+    def loginUser(self):
+        """
+
+        :return:
+        """
+        # 返回登录信息，以及可用headers，clientHeaders用户客户端操作header，webHeaders用于web页面使用headers
+        res = requests.post(url=self.loginUrl,data=json.dumps(self.loginData))
+        UAP_accessToken,UAP_refreshToken,UAP_firmId=res.json()["data"]["accessToken"],res.json()["data"]["refreshToken"],res.json()["data"]["user"]["firmId"]
+        webHeadersCookie = "UAP_accessToken="+UAP_accessToken+"; UAP_refreshToken="+UAP_refreshToken+";UAP_firmId="+str(UAP_firmId)
+        clientHeadersCookie = "UAP_accessToken="+UAP_accessToken+"; UAP_refreshToken="+UAP_refreshToken
+        self.webHeaders["Cookie"] = webHeadersCookie
+        self.clientHeaders["UAP_accessToken"] = UAP_accessToken
+        self.clientHeaders["UAP_refreshToken"]= UAP_refreshToken
+        self.clientHeaders["UAP_firmId"] = str(UAP_firmId)
+        self.clientHeaders["Cookie"] = clientHeadersCookie
+        return self.webHeaders,self.clientHeaders,res.json()
+
+# a = doLogin()
+# c,v,b = a.loginUser()
+# print(b)
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/7/16 14:09
+# @Author  : Ljq
+# @File    : openMasterCard.py
+# @Software: PyCharm
+
+
+"""
+    主卡开卡页面接口
+"""
+
+import requests
+import json
+import re
+import time
+from interface.scripts import dealContentType as dCT
+
+def getCustomerInfo(gatewayHost=None,clientHeaders=None,cCNum=360101199301010275):
+    """
+    查询输入的证件号是否有匹配客户信息
+    :param cardHost:
+    :param clientHeaders:
+    :param cCNum:
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/getCustomerInfo.action"
+    clientHeaders = dCT.jsonCT(clientHeaders)
+    data = {"customerCertificateNumber":str(cCNum)}
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def getSubTypeName(gatewayHost=None,clientHeaders=None,customerId=131176):
+    """
+    查询客户身份类型名称
+    :param gatewayHost:
+    :param clientHeaders:
+    :param customerId:
+    :return:
+    """
+    url = gatewayHost+f"/card-web/customer/getSubTypeName.action?customerId={customerId}"
+    res = requests.post(url=url,headers=clientHeaders)
+    return res
+
+def checkNewCardNo(gatewayHost=None,clientHeaders=None,**kwargs):
+    """
+    校验卡与当前客户类型状态是否匹配
+    :param gatewayHost:
+    :param clientHeaders:
+    :param kwargs: 主卡：{"cardNo":"888810032426","cardType":10,"customerType":"in_province","customerId":131167}
+                副卡：{"cardNo":"888800001130","cardType":20}
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/checkNewCardNo.action"
+    clientHeaders = dCT.jsonCT(clientHeaders)
+    print("kwargs ------------->",kwargs)
+    if "cardType" not in kwargs or kwargs["cardType"]==10:
+        data={"cardNo":"888810032426","cardType":10,"customerType":"in_province","customerId":131167}
+    # elif kwargs["cardType"]==10:
+    #     data = {"cardNo": "888810032426", "cardType": 10, "customerType": "in_province", "customerId": 131167}
+    else:
+        data={}
+    data = dict(data,**kwargs)
+    print(data)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def getOpenCardFee(gatewayHost=None,clientHeaders=None):
+    url = gatewayHost+"/card-web/card/getOpenCardFee.action"
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+def openMasterCard(gatewayHost=None,clientHeaders=None,**kwargs):
+    """
+    开卡接口
+    :param gatewayHost:
+    :param clientHeaders:
+    :param kwargs: {"customerName":"长歌园外买家自动化用户不要动","customerType":"outside_buyer","customerId":131183,
+                    "customerOrganizationType":"individual","customerCredentialType":"ID","customerContactsPhone":"18080001015",
+                    "loginPwd":"111111","cardNo":"888810005703","customerCertificateNumber":"230681202105267887","cardType":10,
+                    "costFee":888,"customerCode":"00130892","name":"长歌",
+                    "createSource":1,"holdName":"长歌园外买家自动化用户不要动","holdContactsPhone":"18080001015","customerSyncModifyHoldinfo":1}
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/openMasterCard.action"
+    clientHeaders = dCT.jsonCT(clientHeaders)
+    data={"customerName":"","customerType":"","customerId":None,"customerOrganizationType":"","customerCredentialType":"","customerContactsPhone":"","loginPwd":"","cardNo":"","customerCertificateNumber":"","cardType":None,"costFee":None,"customerCode":"","name":"","createSource":1,"holdName":"","holdContactsPhone":"","customerSyncModifyHoldinfo":1}
+    data=dict(data,**kwargs)
+    print("openMasterCard   data ---->  ",data)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def openMasterCardDef(gatewayHost=None,clientHeaders=None,cCNum=None,cardNo=None,loginPwd=111111,applyUserName=None):
+
+    # 获取手续费
+    costFee = getOpenCardFee(gatewayHost=gatewayHost, clientHeaders=clientHeaders).json()["data"]
+    print(costFee)
+    # 获取客户信息
+    resCusInfo = getCustomerInfo(gatewayHost=gatewayHost, clientHeaders=clientHeaders,
+                                     cCNum=cCNum).json()["data"]
+    print(resCusInfo)
+    # 客户信息准备
+    customerName = resCusInfo["name"]
+    customerType = resCusInfo["customerType"]
+    customerId = resCusInfo["id"]
+    customerOrganizationType = resCusInfo["organizationType"]
+    customerCredentialType = resCusInfo["certificateType"]
+    customerContactsPhone = resCusInfo["customerContactsPhone"]
+    customerCertificateNumber = resCusInfo["certificateNumber"]
+    customerCode = resCusInfo["code"]
+    name = applyUserName
+    holdName = resCusInfo["name"]
+    holdContactsPhone = resCusInfo["customerContactsPhone"]
+
+    # 卡片状态校验
+    resCheck = checkNewCardNo(gatewayHost=gatewayHost, clientHeaders=clientHeaders,
+                                  cardNo=cardNo,
+                                  customerId=customerId,
+                                  customerType=customerType)
+    print(resCheck.json())
+    # assert "200" == resCheck.json()["code"], "卡片校验失败"
+
+    # 开卡
+    print("开始开卡")
+    resOpenCard = openMasterCard(gatewayHost=gatewayHost, clientHeaders=clientHeaders,
+                                     cardNo=cardNo,
+                                     costFee=costFee, customerName=customerName, customerType=customerType,
+                                     customerId=customerId, loginPwd=loginPwd,
+                                     customerOrganizationType=customerOrganizationType,
+                                     customerCredentialType=customerCredentialType,
+                                     customerContactsPhone=customerContactsPhone,
+                                     customerCertificateNumber=customerCertificateNumber, customerCode=customerCode,
+                                     name=name, holdName=holdName, holdContactsPhone=holdContactsPhone, cardType=10)
+    print("resOpenCard.json()", resOpenCard.json())
+    return resOpenCard
+
+def getAccountInfo(gatewayHost=None,clientHeaders=None,cardNo=None):
+    url = gatewayHost+"/card-web/card/getAccountInfo.action"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    data = {"cardNo":str(cardNo)}
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def openSlaveCard(gatewayHost=None,clientHeaders=None,**kwargs):
+    """
+
+    :param gatewayHost:
+    :param clientHeaders:
+    :param kwargs:{"customerName":"长歌一","customerType":null,"customerId":131136,"customerOrganizationType":"individual",
+            "customerCredentialType":"ID","customerContactsPhone":"18050005001","loginPwd":"111111","cardNo":"800000020435",
+                "customerCertificateNumber":"110101200803075932","cardType":20,"costFee":999,"customerCode":"00130845",
+                "name":"沈阳长歌","parentAccountId":104547,"createSource":1,"parentLoginPwd":"111111","holdName":"长歌一",
+                "holdContactsPhone":"18050005001","customerSyncModifyHoldinfo":1}
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/openSlaveCard.action"
+    clientHeaders = dCT.jsonCT(clientHeaders)
+    data={"customerName":"长歌一","customerType":None,"customerId":131136,"customerOrganizationType":"individual","customerCredentialType":"ID","customerContactsPhone":"18050005001","loginPwd":"111111","cardNo":"800000020435","customerCertificateNumber":"110101200803075932","cardType":20,"costFee":999,"customerCode":"00130845","name":"沈阳长歌","parentAccountId":104547,"createSource":1,"parentLoginPwd":"111111","holdName":"长歌一","holdContactsPhone":"18050005001","customerSyncModifyHoldinfo":1}
+    data = dict(data,**kwargs)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def openSlaveCardDef(gatewayHost=None,clientHeaders=None,cardNo=None,slaveCardNo=None,loginPwd=None,applyUserName=None,parentLoginPwd=None):
+    costFee = getOpenCardFee(gatewayHost=gatewayHost, clientHeaders=clientHeaders).json()["data"]
+    print(costFee)
+    resGet = getAccountInfo(gatewayHost=gatewayHost, clientHeaders=clientHeaders, cardNo=cardNo).json()["data"]
+    print("resGet    --->   ", resGet)
+    customerName = resGet["customerName"]
+    customerId = resGet["customerId"]
+    customerCredentialType = resGet["customerCertificateType"]
+    customerContactsPhone = resGet["customerContactsPhone"]
+    customerCertificateNumber = resGet["customerCertificateNumber"]
+    cardType = 20
+    customerCode = resGet["customerCode"]
+    name = applyUserName
+    parentAccountId = resGet["accountId"]
+    holdName = customerName
+    holdContactsPhone = customerContactsPhone
+    resOpenSlaveCard = openSlaveCard(gatewayHost=gatewayHost, clientHeaders=clientHeaders,
+                                         customerName=customerName,
+                                         customerId=customerId, customerContactsPhone=customerContactsPhone,
+                                         loginPwd=loginPwd, cardNo=slaveCardNo,
+                                         customerCertificateNumber=customerCertificateNumber, cardType=cardType,
+                                         costFee=costFee, customerCode=customerCode,
+                                         name=name, parentAccountId=parentAccountId, parentLoginPwd=parentLoginPwd,
+                                         holdName=holdName,
+                                         holdContactsPhone=holdContactsPhone,
+                                         customerCredentialType=customerCredentialType
+                                         )
+    return resOpenSlaveCard
 \ No newline at end of file
@@ -11,7 +11,7 @@
 import requests
 import json
-from src.commons.readConf import readConfig
+from commons.readConf import readConfig
 class cliSession(object):
     def __init__(self):
@@ -22,9 +22,10 @@ class readConfig(object):
         self.file_name = r'test_config_hg'
         if self.evn_name == 'nt':
             self.relative_path = r'/config/marketConfig/'
-            self.file_path = os.path.abspath(os.path.join(os.getcwd(), "../..")) + self.relative_path+self.file_name
+            self.file_path = os.path.abspath(os.path.join(os.getcwd())) + self.relative_path+self.file_name
+            # self.file_path = os.path.abspath(os.path.join(os.getcwd(), "../")) + self.relative_path+self.file_name
         elif self.evn_name == 'posix':
-            self.relative_path = r'/src/config/marketConfig/'
+            self.relative_path = r'/config/marketConfig/'
             self.file_path = os.path.abspath(os.path.join(os.getcwd())) + self.relative_path + self.file_name
             # self.file_path = os.getcwd()
         print(self.file_path)
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 14:50
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 14:51
+# @Author  : Ljq
+# @File    : dealContentType.py
+# @Software: PyCharm
+
+"""
+    用于hearders中Content-Type格式处理
+"""
+
+def jsonCT(headers=None):
+    headers["Content-Type"] = "application/json; charset=UTF-8"
+    return headers
+
+def urlCode(headers=None):
+    headers["Content-Type"] = "application/x-www-form-urlencoded"
+    return headers
 \ No newline at end of file
@@ -11,8 +11,8 @@ user02=87
 user03=256
 [email]
-list=["lixi@diligrp.com","175930106@qq.com"]
-list11=["tg@diligrp.com","175930106@qq.com"]
+list=["liujiqiang@diligrp.com"]
+list11=["tg@diligrp.com"]
 [mark]
 list=["test"]
-# This is a sample Python script.
+# -*- coding: utf-8 -*-
-# Press Shift+F10 to execute it or replace it with your code.
-# Press Double Shift to search everywhere for classes, files, tool windows, actions, and settings.
+# @Time    : 2021/7/16 15:11
+# @Author  : Ljq
+# @File    : main.py
+# @Software: PyCharm
+"""
-def print_hi(name):
-    # Use a breakpoint in the code line below to debug your script.
-    print(f'Hi, {name}')  # Press Ctrl+F8 to toggle the breakpoint.
+"""
+import os, time
+import sys
+import unittest
+import re
+import HTMLTestRunner_cn
+import commons.ConfigDB as db
+from discover import DiscoveringTestLoader
+from commons import SendEmail as em
+from commons import common as com
+from commons.MySession import my
-# Press the green button in the gutter to run the script.
-if __name__ == '__main__':
-    print_hi('PyCharm')
-# See PyCharm help at https://www.jetbrains.com/help/pycharm/
+def Create_Testcase_suite():
+    '''创建测试套件'''
+    testunit = unittest.TestSuite()
+    test_Loader = DiscoveringTestLoader()
+    discover = test_Loader.discover("./testcase/", pattern='test_*.py', top_level_dir=None)
+    print(discover)
+    for test_suite in discover:
+        testunit.addTests(test_suite)
+    #     print(testunit)
+    return testunit
+
+
+def Run_Testcase(testsuit):
+    '''运行测试用例并生成报告'''
+    now = time.strftime("%Y-%m-%d %H_%M_%S", time.localtime())
+    path = os.path.dirname(os.path.abspath(sys.argv[0]))
+    report_file = path + "/report/" + now + "_result.html"
+    # 创建报告文件
+    fp = open(report_file, 'wb')
+
+    runner = HTMLTestRunner_cn.HTMLTestRunner(
+        stream=fp,
+        title=u'重构项目接口测试报告',
+        description=u'用例简要执行情况如下：(注:报告详细信息需要下载report.html并用浏览器打开)',
+        verbosity=2)
+    # 执行用例
+    runner.run(testsuit)
+    # 关闭文件
+    fp.close()
+    return report_file
+
+
+def Send_email(filename):
+    '''判断邮件发送逻辑'''
+    l = eval(com.get_global_config("global_data", "email", "list").lower())
+    if type(l) != type([]):
+        raise Exception("error,pls input list type send-email address")
+    elif len(l) == 0:
+        print("\n list of send-email is null,won't send email!")
+    elif len(l) != 0:
+        for i in l:
+            print("\n check send-email format : {}".format(i))
+            if re.match(r'^[0-9a-zA-Z_]{1,19}@[0-9a-zA-Z]{1,13}\.[com,cn,net]{1,3}$', i):
+                pass
+            else:
+                raise Exception("error,pls check your send-email format")
+        # 发送邮件
+        em.send_email(filename, l)
+    else:
+        print("\n Haven't sent the email,pls check send-email address!")
+
+
+if __name__ == "__main__":
+    # 检测数据库
+    db.mysql_conn_test()
+    # 检测登录接口
+    my.check_login("user01")
+    # 创建测试套,运行测试用例,生成报告
+    report = Run_Testcase(Create_Testcase_suite())
+    # 发送邮件
+    Send_email(report)
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 15:31
+# @Author  : Ljq
+# @File    : __init__.py.py
+# @Software: PyCharm
+
+"""
+
+"""
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 15:31
+# @Author  : Ljq
+# @File    : classA.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+import sys
+import traceback
+
+class classA(object):
+    def __init__(self):
+        pass
+
+    def doSomeThing(self):
+        print("classA.doSomeThing")
+        print(traceback.extract_stack())
+        print(traceback.extract_stack()[-2])
+        print(traceback.extract_stack()[-2][2])
 \ No newline at end of file
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 15:31
+# @Author  : Ljq
+# @File    : classB.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+from practice.classA import classA
+
+class classB(object):
+    def __init__(self):
+        pass
+
+    def cbDoThing(self):
+        classA().doSomeThing()
+
+if __name__=="__main__":
+    classB().cbDoThing()
 \ No newline at end of file
-[2021-07-16 13:26:19] [INFO] : ======================================================================================
-[2021-07-16 13:26:19] [INFO] : http://test.trace.diligrp.com:8393/fieldConfig/doUpdate.action
-None
-{'moduleType': '1', 'marketId': '8', 'fieldConfigDetailList': [{'fieldName': 'unitPrice', 'jsonPath': '$.unitPrice', 'defaultId': '3', 'displayed': '1', 'required': '0'}, {'fieldName': 'arrivalTallynos', 'jsonPath': '$.arrivalTallynos', 'defaultId': '10', 'displayed': '1', 'required': '0'}, {'fieldName': 'brandName', 'jsonPath': '$.brandName', 'defaultId': '5', 'displayed': '1', 'required': '0'}, {'fieldName': 'truckTareWeight', 'jsonPath': '$.truckTareWeight', 'defaultId': '1', 'displayed': '1', 'required': '0'}, {'fieldName': 'originId', 'jsonPath': '$.originId', 'defaultId': '7', 'displayed': '1', 'required': '0'}, {'fieldName': 'specName', 'jsonPath': '$.specName', 'defaultId': '4', 'displayed': '1', 'required': '0'}, {'fieldName': 'truckType', 'jsonPath': '$.truckType', 'defaultId': '2', 'displayed': '1', 'required': '1', 'availableValueList': ['10', '20']}, {'fieldName': 'imageCertList', 'jsonPath': '$.imageCertList[*]certType', 'defaultId': '11', 'displayed': '1', 'required': '0', 'availableValueList': ['2', '3']}, {'fieldName': 'arrivalDatetime', 'jsonPath': '$.arrivalDatetime', 'defaultId': '9', 'displayed': '1', 'required': '0'}, {'fieldName': 'remark', 'jsonPath': '$.remark', 'defaultId': '8', 'displayed': '1', 'required': '0'}, {'fieldName': 'remark', 'jsonPath': '$.remark', 'defaultId': '6', 'displayed': '1', 'required': '0'}, {'fieldName': 'measureType', 'jsonPath': '$.measureType', 'defaultId': '12', 'displayed': '1', 'required': '1', 'availableValueList': ['10', '20']}]}
-{'headers': {'Host': 'test.trace.diligrp.com:8393', 'Connection': 'keep-alive', 'Content-Length': '1378', 'Accept': 'application/json,text/javascript,*/*;q=0.01', 'X-Requested-With': 'XMLHttpRequest', 'User-Agent': 'Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/91.0.4472.77Safari/537.36', 'Content-Type': 'application/json', 'Origin': 'http://test.trace.diligrp.com:8393', 'Referer': 'http://test.trace.diligrp.com:8393/fieldConfig/bill.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7'}}
-[2021-07-16 13:26:19] [INFO] : ======================================================================================
-[2021-07-16 13:26:19] [INFO] : http://test.trace.diligrp.com:8393/newRegisterBill/doAdd.action
-{"registerHeadWeight": "0", "registerHeadRemainWeight": "0", "imageCertList": [], "measureType": 20, "registType": 10, "userId": 516, "arrivalTallynos": [], "arrivalDatetime": "", "truckType": 10, "weight": "111", "weightUnit": 1, "productName": "\u5927\u767d\u83dc", "productId": 2190, "originName": "", "originId": "", "unitPrice": "", "truckTareWeight": "", "remark": "", "specName": "", "brandName": "", "plate": "\u5dddA123456"}
-{}
-
-[2021-07-16 13:26:20] [INFO] : ======================================================================================
-[2021-07-16 13:26:20] [INFO] : http://test.trace.diligrp.com:8393/newRegisterBill/doAdd.action
-{"registerHeadWeight": "0", "registerHeadRemainWeight": "0", "imageCertList": [], "measureType": 20, "registType": 10, "userId": 516, "arrivalTallynos": [], "arrivalDatetime": "", "truckType": 10, "weight": "111", "weightUnit": 1, "productName": "\u5927\u767d\u83dc", "productId": 2190, "originName": "", "originId": "", "unitPrice": "", "truckTareWeight": "", "remark": "", "specName": "", "brandName": "", "plate": "\u5dddA123456"}
-{}
-
+[2021-07-16 15:59:34] [INFO] : 发送邮件
+[2021-07-16 15:59:36] [INFO] : 邮件发送完毕
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/7/16 14:44
+# @Author  : Ljq
+# @File    : test_addCard.py
+# @Software: PyCharm
+
+"""
+卡片入库测试
+"""
+
+import unittest
+import requests
+import time
+import json
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.cardStock as cS
+import commons.api.cardStorageOut as cSO
+from commons.readConf import readConfig
+from commons.api.doLogin import doLogin
+from commons.MySession import mysession
+
+class test_addCard(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        # 获取登录信息和可用headers
+        rC = readConfig()
+        cls.cardHost = rC.returnOptionsItems("host", "cardHost")
+        cls.webHeaders,cls.clientHeaders,cls.userInfo = doLogin().loginUser()
+        cls.applyUserName = cls.userInfo["data"]["user"]["realName"]
+        cls.applyUserId = cls.userInfo["data"]["user"]["id"]
+        cls.applyUserCode = cls.userInfo["data"]["user"]["userName"]
+        # print("self.webHeaders", cls.webHeaders)
+        # print("self.clientHeaders", cls.clientHeaders)
+        # print("self.userInfo", cls.userInfo)
+
+    def setUp(self) -> None:
+        time.sleep(2)
+
+    def test_cardType(self):
+        """
+        卡类型校验
+        :return:
+        """
+        resCardType = cSI.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        preRes = [{"text":"-- 全部 --","value":""},{"text":"主卡","value":10},{"text":"副卡","value":20}]
+        assert resCardType.json()==preRes,"卡类型信息错误"
+
+    def test_cardFaceCheck(self):
+        """
+        市场卡面信息校验
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        print(resCardFace.json())
+        if self.userInfo["data"]["user"]["firmId"] == 8:
+            # 预期结果定义
+            preRes = [{'text': '-- 请选择 --', 'value': ''}, {'text': '买方卡', 'value': 'buyer'}, {'text': 'VIP买方卡', 'value': 'buyer_vip'}, {'text': '卖方卡', 'value': 'seller'}, {'text': '司机卡', 'value': 'driver'}]
+            assert resCardFace.json()==preRes,"当 firmId = 8 时卡面信息错误"
+        else:
+            preRes = [{"text":"-- 无--","value":""}]
+            assert resCardFace.json() == preRes, "当 firmId != 8 时卡面信息错误"
+
+    def test_doCardStorageIn(self):
+        """
+        卡片入库测试，新添加的卡片能正常的入库
+        :return:
+        """
+        # 获取卡面信息
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        # 执行入库
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        # print(resSavaCard.json())
+        assert resSavaCard.json()["message"]=="OK","入库失败"
+        resQueryList = cSI.queryList(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        # 入库卡片号段校验
+        assert resQueryList.json()["rows"][0]["cardNoRange"]==str(startCardNo)+"-"+str(endCardNo),"入库的卡片在入库列表不能被查询到"
+        # 入库数量校验
+        assert resQueryList.json()["rows"][0]["amount"]==2,"入库数量错误"
+        # 入库角色校验
+        assert resQueryList.json()["rows"][0]["creator"]==self.userInfo["data"]["user"]["realName"],"入库角色记录正确"
+        assert resQueryList.json()["rows"][0]["creatorId"] == self.userInfo["data"]["user"]["id"], "入库角色记录正确"
+        # resQueryList.json()["rows"][0]["cardFaceText"]
+        if self.userInfo["data"]["user"]["firmId"] == 8:
+            assert cardFace==resQueryList.json()["rows"][0]["cardFace"],"记录的卡面信息与实际卡面不一致"
+        else:
+            assert "cardFaceText" not in resQueryList.text,"记录的卡面信息与实际卡面不一致"
+
+    def test_duplicateStorageIn(self):
+        """
+        测试卡片不能被重复入库
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        assert resSavaCard.json()["message"]=="OK","入库失败"
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        assert resSavaCard.json()["message"]=="入库失败，包含重复卡号%s~%s"%(startCardNo,endCardNo),"卡片不能重复入库验证失败"
+
+    def test_openCardStorageIn(self):
+        """
+        入库列表查询测试
+        :return:
+        """
+        # 全列表查询
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # print(resQueryList.json()["total"])
+        assert resQueryList.json()["total"]>200,"页数小于10，查询结果可能存在错误"
+
+        # 查询当天入库的入库记录，判断所得的查询记录的日期都是当天的为测试通过
+        startDate = str(time.strftime("%Y-%m-%d 00:00:00", time.localtime()))
+        endDate = str(time.strftime("%Y-%m-%d 23:59:59", time.localtime()))
+        resQueryLista = cSI.queryList(cardHost=self.cardHost,webHeaders=self.webHeaders,startDate=startDate,endDate=endDate)
+        dateList=[]
+        pageNums = math.ceil(resQueryLista.json()["total"]/10)
+        for pageNum in range(pageNums):
+            resQueryLista = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders, startDate=startDate,
+                                          endDate=endDate,page=str(pageNum+1))
+            dateList = dateList+[i["createTime"] for i in resQueryLista.json()["rows"]]
+        assert [] == [i for i in dateList if i<startDate or i>endDate],"查询结果错误，查询出非当天的入库信息"
+
+    def test_addMasterCard(self):
+        """
+        添加主卡
+        :return:
+        """
+        resCardType = cSI.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        assert resQueryList.json()["rows"][0]["cardType"]==10,"卡片类型错误"
+
+
+    def test_addSlaveCard(self):
+        """
+        添加副卡
+        :return:
+        """
+        resCardType = cSI.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardType=20)
+        print(resSavaCard.json())
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        assert resQueryList.json()["rows"][0]["cardType"] == 20, "卡片类型错误"
+        assert resQueryList.json()["rows"][0]["cardTypeText"] == "副卡", "卡片类型错误"
+        assert "cardFaceText" not in str(resQueryList.json()["rows"][0]),"副卡不应该存在卡面"
+
+
+    def test_delStorageInRecord(self):
+        """
+        正常删除卡片记录
+        :return:
+        """
+        # 新增加一条入库记录用于删除
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        assert resSavaCard.json()["message"]=="OK","入库失败"
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        ida = resQueryList.json()['rows'][0]['id']
+        resDel = cSI.delCard(cardHost=self.cardHost,webHeaders=self.webHeaders,ids=ida)
+        assert resDel.json()["message"]=="OK","删除失败，入库记录未被成功删除"
+        resQueryListB = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        idb = resQueryListB.json()['rows'][0]['id']
+        print(ida,"----------------",idb)
+        assert ida!=idb,"删除功能异常，记录未被删除"
+
+    def test_delStorageInRecordFail_delCard(self):
+        """
+        已作废的卡片不能被删除
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace,faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+        # 卡片作废
+        cS.cardVoid(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNo=startCardNo)
+        # 删除入库记录
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        ida = resQueryList.json()['rows'][0]['id']
+        resDel = cSI.delCard(cardHost=self.cardHost, webHeaders=self.webHeaders, ids=ida)
+        print(resDel.json())
+        assert resDel.json()["message"]=="有部分卡片已出库或作废，删除失败","已作废的卡片不能被删除"
+
+    def test_delStorageInRecordFail_cardOut(self):
+        """
+        存在出库卡片的入库记录，不能进行删除
+        :return:
+        """
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=3)
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        # 卡片出库
+        acc = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=str(startCardNo),applyUserName=self.applyUserName,applyUserCode=self.applyUserCode,applyUserId=self.applyUserId)
+        # print(acc.json())
+        # 删除入库记录
+        resQueryList = cSI.queryList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        ida = resQueryList.json()['rows'][0]['id']
+        resDel = cSI.delCard(cardHost=self.cardHost, webHeaders=self.webHeaders, ids=ida)
+        # print(resDel.json())
+        assert resDel.json()["message"] == "有部分卡片已出库或作废，删除失败", "已出库的卡片不能被删除"
+
+    @classmethod
+    def tearDownClass(cls):
+        print("tearDown")
+
+    def tearDown(self) -> None:
+        pass
+
+if __name__== "__main__":
+    unittest.main()
 \ No newline at end of file