测试用例添加

liujiqiang
1 parent 2257f5d6
Showing 22 changed files with 2927 additions and 16 deletions
.idea/card-app.iml
.idea/modules.xml
.idea/vcs.xml
commons/api/cardLostAndUnLost.py
commons/api/changeCard.py
commons/api/operatePwd.py
commons/api/returnCard.py
commons/readConf.py
config/marketConfig/test_config_hg
practice/classA.py
report/test.log
testCase/openCard/__init__.py → testCase/cardSystem/__init__.py
testCase/test_addCard.py → testCase/cardSystem/test_addCard.py
testCase/cardSystem/test_cardStorage.py
testCase/cardSystem/test_changeCard.py
testCase/cardSystem/test_lossCard.py
testCase/cardSystem/test_openMasterCard.py
testCase/cardSystem/test_openSlaveCard.py
testCase/cardSystem/test_outCard.py
testCase/cardSystem/test_pwdModify.py
@@ -4,5 +4,6 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="cardApp" />
   </component>
 </module>
 \ No newline at end of file
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/card-app.iml" filepath="$PROJECT_DIR$/.idea/card-app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../../../08自动化项目/09AutoTest/cardApp/.idea/cardApp.iml" filepath="$PROJECT_DIR$/../../../../08自动化项目/09AutoTest/cardApp/.idea/cardApp.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/5/27 10:23
+# @Author  : Ljq
+# @File    : cardLostAndUnLost.py
+# @Software: PyCharm
+
+
+"""
+    卡片挂失解挂
+"""
+
+import requests
+import json
+from commons.readConf import readConfig
+from commons.scripts import dealContentType as dCT
+
+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 lossCard(gatewayHost=None,clientHeaders=None,**kwargs):
+    """
+    卡片挂失
+    :param gatewayHost:
+    :param clientHeaders:
+    :param kwargs:{"cardNo":"888810010670","accountId":104547,"loginPwd":"111111","customerId":131136}
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/reportLossCard.action"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    data = {"cardNo":"888810010670","accountId":104547,"loginPwd":"111111","customerId":131136}
+    data = dict(data,**kwargs)
+    # print(data)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def getByCardForUnLost(gatewayHost=None,clientHeaders=None,cardNo=None):
+    """
+    获取挂失卡信息
+    :param gatewayHost:
+    :param clientHeaders:
+    :param cardNo:
+    :return:
+    """
+    url = gatewayHost+f"/card-web/card/getByCardForUnLost.action?cardNo={cardNo}"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+def unLostCard(gatewayHost=None,clientHeaders=None,**kwargs):
+    """获取卡片信息"""
+    url = gatewayHost+"/card-web/card/unLostCard.action"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    data = {"cardNo":"888810010670","accountId":104547,"loginPwd":"111111","customerId":131136}
+    data = dict(data,**kwargs)
+    # print(data)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/6/1 9:54
+# @Author  : Ljq
+# @File    : changeCard.py
+# @Software: PyCharm
+
+
+"""
+    卡片换卡接口
+"""
+
+import requests
+import json
+import re
+import time
+from commons.scripts import dealContentType as dCT
+
+def getSimpleInfo(gatewayHost=None,clientHeaders=None,cardNo=None):
+    """获取卡片信息"""
+    url = gatewayHost+f"/account-service/api/account/simpleInfo?cardNo={cardNo}"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+
+def getChangeCardFee(gatewayHost=None,clientHeaders=None):
+    """获取卡片信息"""
+    url = gatewayHost+"/card-web/card/getChangeCardFee.action"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+def checkCard(gatewayHost=None,clientHeaders=None,cardNo=None,cardType=10,customerId=None):
+    """校验卡状态"""
+    url = gatewayHost+f"/card-web/cardStorage/checkCard.action?cardNo={cardNo}&cardType={cardType}&customerId={customerId}"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+def changeCard(gatewayHost=None,clientHeaders=None,**kwargs):
+    """
+
+    :param gatewayHost:
+    :param clientHeaders:
+    :param kwargs: {"newCardNo":"888810026057","serviceFee":1000,"loginPwd":"111111",
+                        "cardNo":"888810032426","accountId":104921,"customerId":131136}
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/changeCard.action"
+    data={"newCardNo":"888810026057","serviceFee":1000,"loginPwd":"111111","cardNo":"888810032426","accountId":104921,"customerId":131136}
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    data = dict(data,**kwargs)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/6/11 14:29
+# @Author  : Ljq
+# @File    : operatePwd.py
+# @Software: PyCharm
+
+
+"""
+    修改密码，重置密码业务相关接口封装
+"""
+
+import requests
+import json
+import re
+import time
+from commons.scripts import dealContentType as dCT
+
+def getSimpleInfo(gatewayHost=None,clientHeaders=None,cardNo=None):
+    """获取卡片信息"""
+    url = gatewayHost+f"/account-service/api/account/simpleInfo?cardNo={cardNo}"
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+def modifyLoginPwd(gatewayHost=None,clientHeaders=None,**kwargs):
+    """获取卡片信息"""
+    url = gatewayHost+r"/card-web/card/modifyLoginPwd.action"
+    data={"oldLoginPwd":"111111","loginPwd":"111111","secondLoginPwd":"111111","cardNo":"888810032426","accountId":105339,"customerId":131136}
+    data = dict(data,**kwargs)
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def resetLoginPwd(gatewayHost=None,clientHeaders=None,**kwargs):
+    """获取卡片信息"""
+    url = gatewayHost+r"/card-web/card/resetLoginPwd.action"
+    data={"loginPwd":"111111","secondLoginPwd":"111111","cardNo":"888810032426","accountId":105339,"customerId":131136}
+    data = dict(data,**kwargs)
+    clientHeaders=dCT.jsonCT(clientHeaders)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/5/26 16:39
+# @Author  : Ljq
+# @File    : returnCard.py
+# @Software: PyCharm
+
+
+"""
+   退还卡接口
+"""
+
+import requests
+import json
+import re
+import time
+from commons.scripts import dealContentType as dCT
+
+def getSimpleInfo(gatewayHost=None,clientHeaders=None,cardNo=None):
+    """
+    获取卡信息
+    :param gatewayHost:
+    :param clientHeaders:
+    :param cardNo:
+    :return:
+    """
+    url = gatewayHost+f"/account-service/api/account/simpleInfo?cardNo={cardNo}"
+    res = requests.get(url=url,headers=clientHeaders)
+    return res
+
+def returnCard(gatewayHost=None,clientHeaders=None,**kwargs):
+    """
+    退卡
+    :param gatewayHost:
+    :param clientHeaders:
+    :param kwargs:{"loginPwd":"111111","cardNo":"888810005703","accountId":104707,"customerId":131183}
+    :return:
+    """
+    url = gatewayHost+"/card-web/card/returnCard.action"
+    clientHeaders = dCT.jsonCT(clientHeaders)
+    data={"loginPwd":"111111","cardNo":"888810005703","accountId":104707,"customerId":131183}
+    data=dict(data,**kwargs)
+    # print("returnCard --- data --->  ",data)
+    res = requests.post(url=url,headers=clientHeaders,data=json.dumps(data))
+    return res
+
+def returnCardDef(gatewayHost=None,clientHeaders=None,cardNo=None,loginPwd="111111"):
+    """
+    退卡不走封装
+    :param gatewayHost:
+    :param clientHeaders:
+    :param cardNo:
+    :return:
+    """
+    # 获取卡片信息
+    cardInfo = getSimpleInfo(gatewayHost=gatewayHost, clientHeaders=clientHeaders, cardNo=cardNo)
+    # print("returnCardDef -- > cardInfo.json()",cardInfo.json())
+    customerId = cardInfo.json()["data"]["accountInfo"]["customerId"]
+    accountId = cardInfo.json()["data"]["accountInfo"]["accountId"]
+    # 退卡
+    resReturnCard = returnCard(gatewayHost=gatewayHost, clientHeaders=clientHeaders, cardNo=cardNo,
+                                   accountId=accountId, customerId=customerId,loginPwd=loginPwd)
+    print(resReturnCard.json())
+    return resReturnCard
 \ No newline at end of file
@@ -22,8 +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
+            # 本地main方法执行路径
+            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'/config/marketConfig/'
             self.file_path = os.path.abspath(os.path.join(os.getcwd())) + self.relative_path + self.file_name
 #沈阳市场信息
 [loginInfo]
-userName=sg_wenze
-password=mEVEUpWSthCXdmiXetK5TKkBEGr6kxMD0ZeFwinI/cpwC4FGk+TD6GWdKefb062UK69rGzKyLlLTxCzdFpRi1gcrG0m6erXZ+tV1I0GcvCbmQPJfn0Ha828rnbWbXS5eqKa6qOYTgZGO5tOVo0DSKMh9b/cReL7IGJ4/WF2Th8A=
+userName=scgy
+password=DYdgRcAyx2bPboAmu0tgIYBM1kMxFAuDty7IQk4162Zh+8KKa8jtu6xIjG9W4yauTfPiuP1sqxDatskXFqCOz76ea14AqRCYEBz53xVr+vLfcz9zOB2d1T3aIlJbEk8yi2c21pd/MFkBw+Fhd0tky/6eN8kJA8mtsj3uDwSb9qo=
  
 [testInfo]
 #已添加的身份证号
-cCNum=
-cCNumB=
+cCNum=11010119990307865X
+cCNumB=110101199903077593
 #入库未开卡的卡号
-cardNum=
+cardNum=210607113166
 #已开卡的卡号
-cardNumRe=
+cardNumRe=888800001207
 #密码设置
 loginPwd=111111
  
@@ -17,7 +17,6 @@ class classA(object):
         pass
  
     def doSomeThing(self):
+        num = 1
         print("classA.doSomeThing")
-        print(traceback.extract_stack())
-        print(traceback.extract_stack()[-2])
-        print(traceback.extract_stack()[-2][2])
 \ No newline at end of file
+        print(locals())
 \ No newline at end of file
-[2021-07-16 16:00:54] [INFO] : 发送邮件
-[2021-07-16 16:00:56] [INFO] : 邮件发送完毕
+[2021-07-19 10:43:38] [INFO] : 发送邮件
+[2021-07-19 10:43:41] [INFO] : 邮件发送完毕
+#coding=utf-8
+
+# @Time    : 2021/5/24 15:41
+# @Author  : Ljq
+# @File    : test_cardStorage.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
+
+class test_cardStorage(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"]
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+    def setUp(self):
+        time.sleep(2)
+        # pass
+
+    def tearDown(self):
+        pass
+
+    def test_queryCardStorageList(self):
+        """
+        库存列表测试
+        :return:
+        """
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        print(resQuery.json())
+        assert "200" == resQuery.json()["code"],"查询失败"
+        # 列表翻页
+        pageNum = math.ceil(resQuery.json()["total"]/10)
+        print(pageNum)
+        for num in range(pageNum):
+            resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders,page=num+1)
+            assert "200" == resQuery.json()["code"], "查询失败"
+            if num >5:
+                break
+            elif num>0:
+                sTime = resQuery.json()["rows"][0]["createTime"]
+                # print(str(num)+"        sTime       "+sTime)
+                # print(str(num) + "        eTime       " + eTime)
+                assert sTime <= eTime,"当前页第一列数据的创建时间应该小于上一页的最后一条数据的结束时间"
+            eTime = resQuery.json()["rows"][9]["createTime"]
+
+    def test_cardVoid(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)
+        # 新入库卡片作废
+        resVoid = cS.cardVoid(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNo=startCardNo)
+        print(resVoid.json())
+        assert resVoid.json()["code"]=="200","新入库卡片作废测试失败"
+
+        # 新出库的卡片可以作废
+        cardNos = str(endCardNo)
+        amount = 1
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resVoid = cS.cardVoid(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=cardNos)
+        print(resVoid.json())
+        assert resVoid.json()["code"] == "200", "新出库卡片作废测试失败"
+
+        # 已开卡的卡片不能进行作废
+
+    def test_searchAllOptions(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+6
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+
+        # 新入库卡片作废
+        resVoid = cS.cardVoid(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNo=startCardNo)
+        print(resVoid.json())
+        assert resVoid.json()["code"]=="200","新入库卡片作废测试失败"
+        # 卡片库存作废状态查询
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders,cardNo=startCardNo)
+        assert "200" == resQuery.json()["code"], "查询失败"
+        assert "3" == str(resQuery.json()["rows"][0]["state"]),"状态查询成功"
+        # 卡片库存激活状态查询
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=startCardNo+1,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=1)
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=startCardNo+1)
+        assert "200" == resQuery.json()["code"], "查询失败"
+        assert "2" == str(resQuery.json()["rows"][0]["state"]), "状态查询成功"
+
+        # 查询主卡
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders, type=10)
+        assert "200" == resQuery.json()["code"], "查询失败"
+        assert 10 == list(set([i["type"] for i in resQuery.json()["rows"]]))[0], "查库存中的主卡失败"
+        # 查询副卡
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders, type=20)
+        assert "200" == resQuery.json()["code"], "查询失败"
+        assert 20 == list(set([i["type"] for i in resQuery.json()["rows"]]))[0], "查库存中的副卡失败"
+
+        # 查询卡面
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        if len(resCardFace.json())>1:
+            cardFaceList = [i["value"] for i in resCardFace.json()][1:]
+            print(cardFaceList)
+            for cardFaceItem in cardFaceList:
+                print("1----------------------")
+                resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders,
+                                                   cardFace=cardFaceItem)
+                assert 1 == len(list(set([i["cardFace"] for i in resQuery.json()["rows"]]))), "失败"
+                assert cardFaceItem == list(set([i["cardFace"] for i in resQuery.json()["rows"]]))[0], "卡面查询校验失败"
+        else:
+            print("2----------------------")
+            resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders)
+            assert "cardFace" not in resQuery.text, "卡面查询校验失败"
+
+        # 卡号
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=startCardNo)
+        # print(len(resQuery.json()["rows"]))
+        assert 1 == len(resQuery.json()["rows"]),"卡号查询失败"
+        assert str(startCardNo) == resQuery.json()["rows"][0]["cardNo"], "卡号查询失败"
+
+        # 入库时间查询
+        startDate = str(time.strftime("%Y-%m-%d 00:00:00", time.localtime()))
+        endDate = str(time.strftime("%Y-%m-%d 23:59:59", time.localtime()))
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders,startDate=startDate,endDate=endDate)
+        pageNums = math.ceil(resQuery.json()["total"]/10)
+        dateList = []
+        for pageNum in range(pageNums):
+            resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders,startDate=startDate,endDate=endDate,page=pageNum)
+            dateList = dateList+[i["createTime"] for i in resQuery.json()["rows"]]
+        assert [] == [i for i in dateList if i<startDate or i>endDate],"查询结果错误，查询出非当天的入库信息"
+#coding=utf-8
+
+# @Time    : 2021/6/1 10:02
+# @Author  : Ljq
+# @File    : test_changeCard.py
+# @Software: PyCharm
+
+
+"""
+    
+"""
+
+import unittest
+import requests
+import time
+import json
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.returnCard as reC
+import commons.api.cardStorageOut as cSO
+import commons.api.openCard as oMC
+import commons.api.cardStock as cS
+import commons.api.changeCard as cC
+from commons.readConf import readConfig
+from interface.scripts.createIdNum import cIN
+from commons.api.doLogin import doLogin
+
+class tset_changeCard(unittest.TestCase):
+    def setUp(self) -> None:
+        time.sleep(3)
+
+    def tearDown(self) -> None:
+        pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # 配置信息获取
+        readC = readConfig()
+        cls.cardHost = readC.returnOptionsItems("host", "cardHost")
+        cls.gatewayHost = readC.returnOptionsItems("host", "gatewayHost")
+        cls.cCNum = readC.returnOptionsItems("testInfo","cCNum")
+        cls.cCNumB = readC.returnOptionsItems("testInfo", "cCNumB")
+        cls.cardNum = readC.returnOptionsItems("testInfo", "cardNum")
+        cls.cardNumRe = readC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.loginPwd = readC.returnOptionsItems("testInfo", "loginPwd")
+        # 登录信息获取
+        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"]
+        cls.firmId = cls.userInfo["data"]["user"]["firmId"]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_getSimpleInfo(self):
+        """用户信息获取"""
+        # 未入库的卡片进行客户信息获取
+        notInCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        res = cC.getSimpleInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=notInCardNo)
+        print(res.json())
+        assert "10001" == res.json()["code"], "未入库的卡片进行信息获取，测试不通过"
+        assert "卡账户不存在" == res.json()["message"], "未入库的卡片进行信息获取，测试不通过"
+
+        # 入库未开卡的卡片进行信息获取
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        res = cC.getSimpleInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startCardNo)
+        print(res.json())
+        assert "10001" == res.json()["code"], "未出库的卡片进行信息获取，测试不通过"
+        assert "卡账户不存在" == res.json()["message"], "未出库的卡片进行信息获取，测试不通过"
+
+        # 出库未开卡的卡片进行信息获取
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = len([i for i in range(startCardNo, endCardNo)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        res = cC.getSimpleInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startCardNo)
+        print(res.json())
+        assert "10001" == res.json()["code"], "出库未开卡的卡片进行信息获取，测试不通过"
+        assert "卡账户不存在" == res.json()["message"], "出库未开卡的卡片进行信息获取，测试不通过"
+
+        # 正常的主卡获取客户信息
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        res = cC.getSimpleInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startCardNo)
+        print(res.json())
+        assert "200" == res.json()["code"], "正常获取客户信息获取失败"
+        assert "OK" == res.json()["message"], "正常获取客户信息获取失败"
+
+        # 使用副卡进行信息获取
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = len([i for i in range(startSlaveCardNo, endSlaveCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 以上为测试准备
+        res = cC.getSimpleInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startSlaveCardNo)
+        print(res.json())
+        assert "200" == res.json()["code"], "正常获取客户信息获取失败"
+        assert "OK" == res.json()["message"], "正常获取客户信息获取失败"
+
+        # 已挂失的卡片进行信息获取
+
+        # 已锁定的卡片进行信息获取
+
+        # 已冻结的卡片进行信息获取
+
+
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+
+    def test_getChangeCardFee(self):
+        """换卡工本费信息获取"""
+        res = cC.getChangeCardFee(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders)
+        print(res.json())
+        assert "200" == res.json()["code"], "正常获取客户信息获取失败"
+        assert "OK" == res.json()["message"], "正常获取客户信息获取失败"
+
+    def test_checkCorrectCard(self):
+        """新卡卡状态校验"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = len([i for i in range(startCardNo, endCardNo)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = len([i for i in range(startSlaveCardNo, endSlaveCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 以上为测试数据准备
+
+        # 主卡校验
+        customerId = cC.getSimpleInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo).json()["data"]["accountInfo"]["customerId"]
+        print("customerId",customerId)
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=endCardNo,customerId=customerId)
+        print(resCheckCard.json())
+        assert "200" == resCheckCard.json()["code"], "正常新主卡校验测试不通过"
+        assert "OK" == resCheckCard.json()["message"], "正常新主卡校验测试不通过"
+        assert str(endCardNo) in resCheckCard.text, "正常新主卡校验测试不通过"
+
+        # 副卡校验
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=endSlaveCardNo,cardType=20,customerId=customerId)
+        print(resCheckCard.json())
+        assert "200" == resCheckCard.json()["code"], "正常新副卡校验测试不通过"
+        assert "OK" == resCheckCard.json()["message"], "正常新副卡校验测试不通过"
+        assert str(endSlaveCardNo) in resCheckCard.text, "正常新副卡校验测试不通过"
+
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+    def test_checkErrorCard(self):
+        """使用错误状态的卡片进行新卡校验"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束
+
+        customerId = cC.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo).json()["data"]["accountInfo"]["customerId"]
+        print("customerId", customerId)
+        # 以上为测试数据准备
+
+        """开始测试"""
+        # 使用未出库的卡片进行校验
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=999999999999,
+                                    customerId=customerId)
+        print("resCheckCard",resCheckCard.json())
+        assert "10000" == resCheckCard.json()["code"], "未入库卡片校验测试不通过"
+        assert "该卡未入库!" == resCheckCard.json()["message"], "未入库卡片校验测试不通过"
+
+        # 使用已作废的卡片进行校验
+        voidCardNo = startCardNo+1
+        resVoid = cS.cardVoid(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=voidCardNo)
+        assert resVoid.json()["code"] == "200", "新入库卡片作废测试失败"
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=voidCardNo,
+                                    customerId=customerId)
+        print("resCheckCard",resCheckCard.json())
+        assert "20000" == resCheckCard.json()["code"], "[作废]卡片校验测试不通过"
+        assert "该卡状态为[作废],不能开卡!" == resCheckCard.json()["message"], "[作废]卡片校验测试不通过"
+
+        # 使用不匹配的卡面进行校验 -- 寿光市场
+        if self.firmId == 8:
+            pass
+
+        # 使用已开卡的主卡进行校验
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=endCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endCardNo,
+                                    customerId=customerId)
+        # print("resCheckCard",resCheckCard.json())
+        assert "20000" == resCheckCard.json()["code"], "正常新主卡校验测试不通过"
+        assert "该卡状态为[在用],不能开卡!" == resCheckCard.json()["message"], "正常新主卡校验测试不通过"
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endCardNo) #退卡
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endCardNo,
+                                    customerId=customerId)
+
+        # 使用已退还的卡片可以进行换卡操作校验成功
+        # print("resCheckCard",resCheckCard.json())
+        assert "200" == resCheckCard.json()["code"], "已退还的主卡校验测试不通过"
+        assert "OK" == resCheckCard.json()["message"], "已退还的主卡校验测试不通过"
+        assert str(endCardNo) in resCheckCard.text, "已退还的主卡校验测试不通过"
+
+        # 主卡换卡时使用副卡校验
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardType=10,cardNo=endSlaveCardNo,
+                                    customerId=customerId)
+        print("resCheckCard",resCheckCard.json())
+        assert "20000" == resCheckCard.json()["code"], "使用副卡对主卡进行换卡校验测试不通过"
+        assert "请使用主卡办理当前业务!" == resCheckCard.json()["message"], "使用副卡对主卡进行换卡校验测试不通过"
+
+        # 副卡换卡时使用主卡进行校验
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardType=20,cardNo=endCardNo,
+                                    customerId=customerId)
+        print("resCheckCard",resCheckCard.json())
+        assert "20000" == resCheckCard.json()["code"], "副卡换卡时使用主卡进行校验测试不通过"
+        assert "请使用副卡办理当前业务!" == resCheckCard.json()["message"], "副卡换卡时使用主卡进行校验测试不通过"
+
+        # 使用未出库的副卡进行校验
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                    cardNo=999999999999, cardType=20, customerId=customerId)
+        print(resCheckCard.json())
+        assert "10000" == resCheckCard.json()["code"], "未入库卡片校验测试不通过"
+        assert "该卡未入库!" == resCheckCard.json()["message"], "未入库卡片校验测试不通过"
+
+        # 使用已开卡的副卡进行校验
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=endSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        resCheckCard = cC.checkCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                    cardNo=endSlaveCardNo, cardType=20, customerId=customerId)
+        print(resCheckCard.json())
+        assert "20000" == resCheckCard.json()["code"], "已开卡的卡片进行状态校验测试不通过"
+        assert "该卡状态为[在用],不能开卡!" == resCheckCard.json()["message"], "已开卡的卡片进行状态校验测试不通过"
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endSlaveCardNo)
+
+        """测试完成"""
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+    def test_changeCard(self):
+        """换卡正向流程测试"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束 --- > 获取卡账户信息,换卡工本费
+        serviceFee = cC.getChangeCardFee(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders).json()["data"]
+        # 以上为测试数据准备
+        """开始测试"""
+
+        # 主卡换卡正常换卡测试 ---> 换卡成功后原卡片变为激活状态
+        resSimpleInfo = cC.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startCardNo,
+                                      newCardNo=endCardNo,serviceFee=serviceFee,loginPwd=self.loginPwd,accountId=accountId,customerId=customerId)
+        assert "200" == resChangeCard.json()["code"],"主卡换卡测试不通过"
+        assert "OK" == resChangeCard.json()["message"],"主卡换卡测试不通过"
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders,cardNo=startCardNo)
+        assert "200" == resQuery.json()["code"], "查询失败"
+        assert "2" == str(resQuery.json()["rows"][0]["state"]),"状态查询成功"
+
+        # 副卡换卡正常换卡测试，换卡成功后原卡片变为激活状态
+        resSimpleInfo = cC.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startSlaveCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startSlaveCardNo,
+                                      newCardNo=endSlaveCardNo, serviceFee=serviceFee, loginPwd=self.loginPwd,
+                                      accountId=accountId, customerId=customerId)
+        assert "200" == resChangeCard.json()["code"], "主卡换卡测试不通过"
+        assert "OK" == resChangeCard.json()["message"], "主卡换卡测试不通过"
+        resQuery = cS.queryCardStorageList(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=startSlaveCardNo)
+        assert "200" == resQuery.json()["code"], "查询失败"
+        assert "2" == str(resQuery.json()["rows"][0]["state"]), "状态查询成功"
+
+
+        """测试完成"""
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endCardNo)
+
+    def test_changeCardError(self):
+        """换卡正向流程测试"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=endCardNo, applyUserName=self.applyUserName)
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=endSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束 --- > 获取卡账户信息,换卡工本费
+        serviceFee = cC.getChangeCardFee(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders).json()["data"]
+        resSimpleInfo = cC.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resSimpleInfo = cC.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startSlaveCardNo)
+        customerIdSlaveCard,accountIdSlaveCard = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        # 以上为测试数据准备
+        """开始测试"""
+
+        # 使用未入库的主卡卡片和副卡进行换卡
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startCardNo,
+                                      newCardNo=999999999999,serviceFee=serviceFee,loginPwd=self.loginPwd,accountId=accountId,customerId=customerId)
+        assert "10000" == resChangeCard.json()["code"],"主卡换卡测试不通过"
+        assert "该卡未入库!" == resChangeCard.json()["message"],"主卡换卡测试不通过"
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startSlaveCardNo,
+                                      newCardNo=999999999999,serviceFee=serviceFee,loginPwd=self.loginPwd,
+                                      accountId=accountIdSlaveCard,customerId=customerIdSlaveCard)
+        assert "10000" == resChangeCard.json()["code"],"副卡换卡测试不通过"
+        assert "该卡未入库!" == resChangeCard.json()["message"],"副卡换卡测试不通过"
+
+        # 使用未出库的主卡卡片和副卡进行换卡
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startCardNo,
+                                      newCardNo=startCardNo+1,serviceFee=serviceFee,loginPwd=self.loginPwd,accountId=accountId,customerId=customerId)
+        print(resChangeCard.json())
+        assert "20000" == resChangeCard.json()["code"],"使用未出库的主卡换卡测试不通过"
+        assert "该卡状态为[未激活],不能开卡!" == resChangeCard.json()["message"],"使用未出库的主卡换卡测试不通过"
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cardNo=startSlaveCardNo,
+                                      newCardNo=startSlaveCardNo+1,serviceFee=serviceFee,loginPwd=self.loginPwd,
+                                      accountId=accountIdSlaveCard,customerId=customerIdSlaveCard)
+        print(resChangeCard.json())
+        assert "20000" == resChangeCard.json()["code"],"使用未出库的副卡换卡测试不通过"
+        assert "该卡状态为[未激活],不能开卡!" == resChangeCard.json()["message"],"使用未出库的副卡换卡测试不通过"
+
+        # 使用已开卡的主卡卡片和副卡进行换卡
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo,
+                                      newCardNo=endCardNo, serviceFee=serviceFee, loginPwd=self.loginPwd,
+                                      accountId=accountId, customerId=customerId)
+        print(resChangeCard.json())
+        assert "20000" == resChangeCard.json()["code"], "主卡换卡测试不通过"
+        assert "该卡状态为[在用],不能开卡!" == resChangeCard.json()["message"], " 使用已开卡的主卡换卡测试不通过"
+        resChangeCard = cC.changeCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startSlaveCardNo,
+                                      newCardNo=endSlaveCardNo, serviceFee=serviceFee, loginPwd=self.loginPwd,
+                                      accountId=accountIdSlaveCard, customerId=customerIdSlaveCard)
+        print(resChangeCard.json())
+        assert "20000" == resChangeCard.json()["code"], "副卡换卡测试不通过"
+        assert "该卡状态为[在用],不能开卡!" == resChangeCard.json()["message"], " 使用已开卡的副卡换卡测试不通过"
+
+        """测试完成"""
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endSlaveCardNo)
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=endCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+#coding=utf-8
+
+# @Time    : 2021/6/17 15:56
+# @Author  : Ljq
+# @File    : test_lossCard.py
+# @Software: PyCharm
+
+
+"""
+    
+"""
+
+import unittest
+import requests
+import time
+import json
+import math
+import commons.api.cardStorageIn as cardStorageIn
+import commons.api.returnCard as returnCard
+import commons.api.cardStorageOut as cardStorageOut
+import commons.api.openCard as openCard
+import commons.api.cardLostAndUnLost as cardLostAndUnLost
+from commons.readConf import readConfig
+from commons.api.doLogin import doLogin
+
+class test_lossCardAndUn(unittest.TestCase):
+    """卡片挂失，解挂测试"""
+    def setUp(self) -> None:
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        self.startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        self.endCardNo = self.startCardNo + 2
+        resCardFace = cardStorageIn.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cardStorageIn.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cardStorageIn.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders,
+                                             startCardNo=self.startCardNo,
+                                             endCardNo=self.endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(self.startCardNo) + "," + str(self.endCardNo)
+        print(cardNos)
+        amount = 2
+        outCardRes = cardStorageOut.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                               applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                               applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = openCard.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                  cCNum=self.cCNum, cardNo=self.startCardNo,
+                                                  applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        self.startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        self.endSlaveCardNo = self.startSlaveCardNo + 2
+        resSavaCard = cardStorageIn.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders,
+                                             startCardNo=self.startSlaveCardNo,
+                                             endCardNo=self.endSlaveCardNo, cardType=20)
+        res = openCard.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=self.startSlaveCardNo,
+                                      cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(self.startSlaveCardNo) + "," + str(self.endSlaveCardNo)
+        amount = 2
+        outCardRes = cardStorageOut.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                               applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                               applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = openCard.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                     cardNo=self.startCardNo, slaveCardNo=self.startSlaveCardNo,
+                                                     loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                     parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束-获取卡片客户信息
+
+    def tearDown(self) -> None:
+        # 副卡退卡,主卡退卡
+        returnCard.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=self.startSlaveCardNo)
+        returnCard.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=self.startCardNo)
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # 配置信息获取
+        readC = readConfig()
+        cls.cardHost = readC.returnOptionsItems("host", "cardHost")
+        cls.gatewayHost = readC.returnOptionsItems("host", "gatewayHost")
+        cls.cCNum = readC.returnOptionsItems("testInfo","cCNum")
+        cls.cCNumB = readC.returnOptionsItems("testInfo", "cCNumB")
+        cls.cardNum = readC.returnOptionsItems("testInfo", "cardNum")
+        cls.cardNumRe = readC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.loginPwd = readC.returnOptionsItems("testInfo", "loginPwd")
+        # 登录信息获取
+        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"]
+        cls.firmId = cls.userInfo["data"]["user"]["firmId"]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_getAccountInfo(self):
+        """
+        获取卡片信息测试
+        :return:
+        """
+        # 使用未入库的卡片进行获取
+        resGet = openCard.getAccountInfo(gatewayHost=self.gatewayHost,clientHeaders =self.clientHeaders,cardNo=999999999999)
+        print(resGet.json())
+        assert "10001" == resGet.json()["code"],"未入库卡片信息获取测试不通过"
+        assert "卡账户不存在" == resGet.json()["message"],"未入库卡片信息获取测试不通过"
+
+        # 使用入库未出库的卡片进行信息获取
+        # 卡片入库
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+
+        resCardFace = cardStorageIn.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cardStorageIn.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cardStorageIn.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        resGet = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        print(resGet.json())
+        assert "10001" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "卡账户不存在" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+
+        # 使用出库未开卡的卡片进行信息获取
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cardStorageOut.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resGet = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        print(resGet.json())
+        assert "10001" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "卡账户不存在" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+
+        # 使用已开卡的卡片可以正确的获取到客户信息
+        resFirstOpen = openCard.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        assert "200" == resFirstOpen.json()["code"], "开卡失败"
+        assert "data" in resFirstOpen.json(), "开卡失败"
+        resGet = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # print("resGet.json()",resGet.json())
+        assert "200" == resGet.json()["code"], "已开卡卡片信息获取测试不通过"
+        assert "data" in resGet.json(), "已开卡卡片信息获取测试不通过"
+
+        # 使用已挂失的卡片信息进行卡片信息获取
+        accountId,customerId = resGet.json()["data"]["accountId"],resGet.json()["data"]["customerId"]
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=str(startCardNo),
+                                     accountId=accountId, customerId=customerId, loginPwd=self.loginPwd)
+        # print("resLossCard.json()",resLossCard.json())
+        assert "200" == resLossCard.json()["code"],"已挂失的卡片获取卡片信息测试不通过"
+        resGet = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # print("resGet.json()", resGet.json())
+        assert "2000" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "该卡为挂失状态，不能进行此操作" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+        # 解挂
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=str(startCardNo),
+                                     accountId=accountId, customerId=customerId, loginPwd=self.loginPwd)
+        # print("resUnLoss.json()",resUnLoss.json())
+
+        # 账号冻结状态
+
+        # 卡片锁定状态
+
+        # 使用已退还的卡片进行卡片信息获取
+        returnCard.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        resGet = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # print("resGet.json()", resGet.json())
+        assert "2000" == resGet.json()["code"], "已退还的卡片信息获取测试不通过"
+        assert "该卡为退还状态，不能进行此操作" == resGet.json()["message"], "已退还的卡片信息获取测试不通过"
+
+
+    def test_lossCardAndUnLost(self):
+        """卡片挂失"""
+        # 获取卡片客户信息
+        accountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=self.startCardNo)
+        accountId,customerId = accountInfo.json()["data"]["accountId"],accountInfo.json()["data"]["customerId"]
+        slaveCardAccountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=self.startSlaveCardNo)
+        print("slaveCardAccountInfo  ",slaveCardAccountInfo.json())
+        customerIdSlaveCard, accountIdSlaveCard = slaveCardAccountInfo.json()["data"]["customerId"], slaveCardAccountInfo.json()["data"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+        # 正常主卡卡片挂失解挂
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo),accountId=accountId, customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resLossCard.json()["code"],"卡片挂失失败"
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resUnLoss.json()["code"],"卡片解挂失败"
+
+
+        # 正常副卡卡片挂失解挂
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startSlaveCardNo),accountId=accountIdSlaveCard,
+                                                 customerId=customerIdSlaveCard,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resLossCard.json()["code"],"副卡挂失失败"
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startSlaveCardNo), accountId=accountIdSlaveCard,
+                                                 customerId=customerIdSlaveCard,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resUnLoss.json()["code"], "副卡解挂失败"
+
+        """测试完成"""
+
+    def test_lossCardError(self):
+        """挂失卡片异常情况"""
+        # 卡账户信息准备
+        accountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                              cardNo=self.startCardNo)
+        accountId, customerId = accountInfo.json()["data"]["accountId"], accountInfo.json()["data"]["customerId"]
+        slaveCardAccountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startSlaveCardNo)
+        print("slaveCardAccountInfo  ", slaveCardAccountInfo.json())
+        customerIdSlaveCard, accountIdSlaveCard = slaveCardAccountInfo.json()["data"]["customerId"], \
+                                                  slaveCardAccountInfo.json()["data"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+        # 密码长度不满足六位数字时挂失失败
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd="1111111")
+        assert "1000" == resLossCard.json()["code"], "密码长度超过六位的错误验证测试不通过"
+        assert "密码必须6位" == resLossCard.json()["message"], "密码长度超过六位的错误验证测试不通过"
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd="11111")
+        assert "1000" == resLossCard.json()["code"], "密码长度不足六位的错误验证测试不通过"
+        assert "密码必须6位" == resLossCard.json()["message"], "密码长度不足六位的错误验证测试不通过"
+
+        # 密码错误挂失失败
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd="123890")
+        assert "10001" == resLossCard.json()["code"], "密码错误挂失失败测试不通过"
+        assert "密码输入有误" == resLossCard.json()["message"], "密码错误挂失失败测试不通过"
+
+
+        # 主卡挂失后，副卡不可以再进行挂失
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resLossCard.json()["code"], "卡片挂失失败"
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startSlaveCardNo), accountId=accountIdSlaveCard,
+                                                 customerId=customerIdSlaveCard,
+                                                 loginPwd=self.loginPwd)
+        assert "2000" == resLossCard.json()["code"], "主卡挂失后副卡不能挂失测试失败"
+        assert f"该卡的主卡【{self.startCardNo}】为挂失状态，不能进行此操作" == resLossCard.json()["message"], "主卡挂失后副卡不能挂失测试失败"
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resUnLoss.json()["code"], "卡片解挂失败"
+        """测试完成"""
+
+    def test_getByCardForUnLost(self):
+        """挂失卡片信息信息"""
+        # 卡账户信息准备
+        accountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                              cardNo=self.startCardNo)
+        accountId, customerId = accountInfo.json()["data"]["accountId"], accountInfo.json()["data"]["customerId"]
+        slaveCardAccountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startSlaveCardNo)
+        print("slaveCardAccountInfo  ", slaveCardAccountInfo.json())
+        customerIdSlaveCard, accountIdSlaveCard = slaveCardAccountInfo.json()["data"]["customerId"], \
+                                                  slaveCardAccountInfo.json()["data"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+
+        # 使用状态正常的卡片进行信息获取
+        resGetByCard = cardLostAndUnLost.getByCardForUnLost(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startCardNo)
+        print(resGetByCard.json())
+        assert "2000" == resGetByCard.json()["code"],"状态正常的卡片用户信息获取测试不通过"
+        assert "该卡为正常状态，不能进行此操作" == resGetByCard.json()["message"],"状态正常的卡片用户信息获取测试不通过"
+
+        # 已挂失的卡片可以成功获取到卡片信息
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resLossCard.json()["code"], "卡片挂失失败"
+
+        resGetByCard = cardLostAndUnLost.getByCardForUnLost(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startCardNo)
+        print(resGetByCard.json())
+        assert "200" == resGetByCard.json()["code"],"已挂失的卡片可以成功获取到卡片信息测试不通过"
+        assert f"{accountId}" in resGetByCard.text,"已挂失的卡片可以成功获取到卡片信息测试不通过"
+
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId, customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resUnLoss.json()["code"], "卡片解挂失败"
+
+        # 未开卡的卡片获取信息验证
+        resGetByCard = cardLostAndUnLost.getByCardForUnLost(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo="999999999999")
+        print(resGetByCard.json())
+        assert "10001" == resGetByCard.json()["code"],"未开卡的卡片获取信息验证测试不通过"
+        assert "卡账户不存在" == resGetByCard.json()["message"],"未开卡的卡片获取信息验证测试不通过"
+
+        # 副卡挂失操作异常操作
+        print("开始副卡挂失异常操作")
+
+        # 使用状态正常的副卡进行信息获取
+        resGetByCard = cardLostAndUnLost.getByCardForUnLost(gatewayHost=self.gatewayHost,
+                                                            clientHeaders=self.clientHeaders,
+                                                            cardNo=self.startSlaveCardNo)
+        print(resGetByCard.json())
+        assert "2000" == resGetByCard.json()["code"], "状态正常的副卡用户信息获取测试不通过"
+        assert "该卡为正常状态，不能进行此操作" == resGetByCard.json()["message"], "状态正常的副卡用户信息获取测试不通过"
+
+        # 已挂失的副卡可以正常查询
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startSlaveCardNo), accountId=accountIdSlaveCard,
+                                                 customerId=customerIdSlaveCard,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resLossCard.json()["code"], "副卡挂失失败"
+        resGetByCard = cardLostAndUnLost.getByCardForUnLost(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startSlaveCardNo)
+        assert "200" == resGetByCard.json()["code"],"已挂失的副卡可以正常查询测试不通过"
+        assert f"{accountId}" in resGetByCard.text,"已挂失的副卡可以正常查询测试不通过"
+
+        # 副卡解挂
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startSlaveCardNo), accountId=accountIdSlaveCard,
+                                                 customerId=customerIdSlaveCard,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resUnLoss.json()["code"], "副卡解挂失败"
+        """测试完成"""
+
+
+    def test_unLostError(self):
+        """卡片异常解挂"""
+        # 卡账户信息准备
+        accountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                              cardNo=self.startCardNo)
+        accountId, customerId = accountInfo.json()["data"]["accountId"], accountInfo.json()["data"]["customerId"]
+        slaveCardAccountInfo = openCard.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startSlaveCardNo)
+        print("slaveCardAccountInfo  ", slaveCardAccountInfo.json())
+        customerIdSlaveCard, accountIdSlaveCard = slaveCardAccountInfo.json()["data"]["customerId"], \
+                                                  slaveCardAccountInfo.json()["data"]["accountId"]
+        resLossCard = cardLostAndUnLost.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId,
+                                                 customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        assert "200" == resLossCard.json()["code"], "卡片挂失失败"
+        resGetByCard = cardLostAndUnLost.getByCardForUnLost(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                       cardNo=self.startCardNo)
+        assert "200" == resGetByCard.json()["code"],"已挂失的卡片可以成功获取到卡片信息测试不通过"
+
+        """开始测试"""
+        # 使用错误的密码进行解挂
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId,
+                                                 customerId=customerId,
+                                                 loginPwd="123890")
+        print("resUnLoss",resUnLoss.json())
+        assert "10001" == resUnLoss.json()["code"], "使用错误的密码解挂失败测试不通过"
+        assert "密码输入有误" == resUnLoss.json()["message"], "使用错误的密码解挂失败测试不通过"
+
+        # 小于六位的密码进行解挂
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId,
+                                                 customerId=customerId,
+                                                 loginPwd="123")
+        print("resUnLoss",resUnLoss.json())
+        assert "10001" == resUnLoss.json()["code"], "小于六位的密码进行解挂失败测试不通过"
+        assert "密码输入有误" == resUnLoss.json()["message"], "小于六位的密码进行解挂失败测试不通过"
+
+        # 大于六位的密码进行解挂
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId,
+                                                 customerId=customerId,
+                                                 loginPwd="123111123")
+        print("resUnLoss", resUnLoss.json())
+        assert "10001" == resUnLoss.json()["code"], "大于六位的密码进行解挂失败测试不通过"
+        assert "密码输入有误" == resUnLoss.json()["message"], "大于六位的密码进行解挂失败测试不通过"
+        """解挂时未进行密码长度验证"""
+
+        resUnLoss = cardLostAndUnLost.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                 cardNo=str(self.startCardNo), accountId=accountId,
+                                                 customerId=customerId,
+                                                 loginPwd=self.loginPwd)
+        """测试完成"""
+
+#coding=utf-8
+
+# @Time    : 2021/5/26 10:16
+# @Author  : Ljq
+# @File    : test_openMasterCard.py
+# @Software: PyCharm
+
+
+"""
+    主卡开卡测试
+"""
+
+import unittest
+import requests
+import time
+import json
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.returnCard as reC
+import commons.api.cardStorageOut as cSO
+import commons.api.openCard as oMC
+import commons.api.cardStock as cS
+from commons.scripts.createIdNum import cIN
+from commons.api.doLogin import doLogin
+from commons.readConf import readConfig
+
+class tset_openMasterCard(unittest.TestCase):
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # 配置信息获取
+        readC = readConfig()
+        cls.cardHost = readC.returnOptionsItems("host", "cardHost")
+        cls.gatewayHost = readC.returnOptionsItems("host", "gatewayHost")
+        cls.cCNum = readC.returnOptionsItems("testInfo","cCNum")
+        cls.cCNumB = readC.returnOptionsItems("testInfo", "cCNumB")
+        cls.cardNum = readC.returnOptionsItems("testInfo", "cardNum")
+        cls.cardNumRe = readC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.loginPwd = readC.returnOptionsItems("testInfo", "loginPwd")
+        # 登录信息获取
+        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"]
+        cls.firmId = cls.userInfo["data"]["user"]["firmId"]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_getCustomerInfo(self):
+        """
+        客户查询测试
+        :return:
+        """
+        # 正确的获取客户信息
+        res = oMC.getCustomerInfo(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cCNum=self.cCNum)
+        print(res.json())
+        assert "200" == res.json()["code"],"使用已存在的客户信息查询失败"
+        # 获取客户身份类型
+        res = oMC.getSubTypeName(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,customerId=res.json()["data"]["id"])
+        assert "200" == res.json()["code"],"查询客户身份类型失败"
+        assert "" != res.json()["data"], "身份类型不应该为空"
+
+        # 使用不存在的证件号进行查询
+        res = oMC.getCustomerInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cCNum=cIN())
+        assert "20002" == res.json()["code"], "使用不存在的客户信息查询时查询结果不一致"
+
+    def test_checkNewCardNo(self):
+        """
+        卡状态校验
+        :return:
+        """
+        # 正向测试卡面校验功能---> #获取客户信息
+        print(self.clientHeaders)
+        resCusInfo = oMC.getCustomerInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cCNum=self.cCNum)
+        print(resCusInfo.json())
+        assert "200" == resCusInfo.json()["code"], "使用已存在的客户信息查询失败"
+        # 校验
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=self.cardNum,customerId=resCusInfo.json()["data"]["id"],customerType=resCusInfo.json()["data"]["customerType"])
+        print("res.json()", res.json())
+        assert "200" == res.json()["code"], "使用已存在未开卡的卡片进行校验校验失败"
+
+        # 使用未入库的卡片进行校验
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=999999999999,
+                                 customerId=resCusInfo.json()["data"]["id"],
+                                 customerType=resCusInfo.json()["data"]["customerType"])
+        assert "10000" == res.json()["code"], "使用已存在未开卡的卡片进行校验校验失败"
+        assert "该卡未入库!" == res.json()["message"], "message信息与预期信息不匹配"
+
+        # 未出库的卡片进行校验
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=1)
+        if self.firmId == 9:
+            startCardNo, endCardNo = 999999999998, 999999999998
+        elif self.firmId == 8:
+            startCardNo, endCardNo = 999999999997, 999999999997
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                 customerId=resCusInfo.json()["data"]["id"],
+                                 customerType=resCusInfo.json()["data"]["customerType"])
+        print(res.json())
+        assert "20000" == res.json()["code"], "未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "未出库卡片校验，message信息与预期信息不匹配"
+
+        # 对已开卡的卡片进行校验
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=self.cardNumRe,
+                                 customerId=resCusInfo.json()["data"]["id"],
+                                 customerType=resCusInfo.json()["data"]["customerType"])
+        print(res.json())
+        assert "20000" == res.json()["code"], "未出库的卡片进行校验校验失败"
+        assert "该卡状态为[在用],不能开卡!" == res.json()["message"], "未出库卡片校验，message信息与预期信息不匹配"
+
+    def test_getOpenCardFee(self):
+        """收费项获取"""
+        # 获取开卡手续费
+        res = oMC.getOpenCardFee(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders)
+        print(res.json())
+        assert "200" == res.json()["code"],"开卡手续费获取失败"
+        assert "" != res.json()["data"],"开卡手续费获取失败"
+
+    def test_openMasterCard(self):
+        """
+        正向开卡流程
+        :return:
+        """
+        # 卡片出库
+        faceNum = 1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        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)
+        # 出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+
+        # 获取手续费
+        costFee = oMC.getOpenCardFee(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders).json()["data"]
+        print(costFee)
+        # 获取客户信息
+        resCusInfo = oMC.getCustomerInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cCNum=self.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 = self.applyUserName
+        holdName = resCusInfo["name"]
+        holdContactsPhone = resCusInfo["customerContactsPhone"]
+
+        # 卡片状态校验
+        resCheck = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                 customerId=customerId,
+                                 customerType=customerType)
+        print(resCheck.json())
+        assert "200" == resCheck.json()["code"],"卡片校验失败"
+
+        # 开卡
+        print("开始开卡")
+        resOpenCard = oMC.openMasterCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                         costFee=costFee, customerName=customerName, customerType=customerType,
+                                         customerId=customerId, loginPwd=self.loginPwd,
+                                         customerOrganizationType=customerOrganizationType,
+                                         customerCredentialType=customerCredentialType,
+                                         customerContactsPhone=customerContactsPhone,
+                                         customerCertificateNumber=customerCertificateNumber, customerCode=customerCode,
+                                         name=name, holdName=holdName, holdContactsPhone=holdContactsPhone,cardType=10)
+
+        print("resOpenCard.json()",resOpenCard.json())
+
+        assert "200" == resOpenCard.json()["code"],"开卡失败"
+        assert None != resOpenCard.json()["data"], "开卡失败"
+
+        # 获取卡信息
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+    def test_dupOpenCard(self):
+        """
+        不能重复开卡
+        :return:
+        """
+        # 卡片出库
+        faceNum = 1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        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)
+        # 出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 获取手续费
+        costFee = oMC.getOpenCardFee(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders).json()["data"]
+        print(costFee)
+        # 获取客户信息
+        resCusInfo = oMC.getCustomerInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cCNum=self.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 = self.applyUserName
+        holdName = resCusInfo["name"]
+        holdContactsPhone = resCusInfo["customerContactsPhone"]
+
+        # 卡片状态校验
+        resCheck = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo,
+                                      customerId=customerId,
+                                      customerType=customerType)
+        print(resCheck.json())
+        assert "200" == resCheck.json()["code"], "卡片校验失败"
+
+        # 开卡
+        print("开始开卡")
+        resOpenCard = oMC.openMasterCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cardNo=startCardNo,
+                                         costFee=costFee, customerName=customerName, customerType=customerType,
+                                         customerId=customerId, loginPwd=self.loginPwd,
+                                         customerOrganizationType=customerOrganizationType,
+                                         customerCredentialType=customerCredentialType,
+                                         customerContactsPhone=customerContactsPhone,
+                                         customerCertificateNumber=customerCertificateNumber, customerCode=customerCode,
+                                         name=name, holdName=holdName, holdContactsPhone=holdContactsPhone, cardType=10)
+        print("resOpenCard.json()", resOpenCard.json())
+        assert "200" == resOpenCard.json()["code"], "开卡失败"
+        assert None != resOpenCard.json()["data"], "开卡失败"
+
+        resOpenCard = oMC.openMasterCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cardNo=startCardNo,
+                                         costFee=costFee, customerName=customerName, customerType=customerType,
+                                         customerId=customerId, loginPwd=self.loginPwd,
+                                         customerOrganizationType=customerOrganizationType,
+                                         customerCredentialType=customerCredentialType,
+                                         customerContactsPhone=customerContactsPhone,
+                                         customerCertificateNumber=customerCertificateNumber, customerCode=customerCode,
+                                         name=name, holdName=holdName, holdContactsPhone=holdContactsPhone, cardType=10)
+        print("resOpenCard.json()", resOpenCard.json())
+        assert "20000" == resOpenCard.json()["code"], "重复开卡失败测试不通过"
+        assert "该卡状态为[在用],不能开卡!" == resOpenCard.json()["message"], "重复开卡失败测试不通过"
+
+        # 获取卡信息
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+    def test_oneCardOneCus(self):
+        """
+        一张卡只能同时开被开卡给一个用户
+        :return:
+        """
+        # 卡片入库
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        # 出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 开卡给第一个客户
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cCNum=self.cCNum,cardNo=startCardNo,applyUserName=self.applyUserName)
+        assert "200" == resFirstOpen.json()["code"],"第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+
+        # 开卡给第二个客户
+        resSecondOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,cCNum=self.cCNumB,cardNo=startCardNo,applyUserName=self.applyUserName)
+        print("resSecondOpen.json()   - - ->",resSecondOpen.json())
+        assert "20000" == resSecondOpen.json()["code"], "一张卡不能开卡给多用户测试不通过"
+        assert "该卡状态为[在用],不能开卡!" in resSecondOpen.text, "一张卡不能开卡给多用户测试不通过"
+
+        # 退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+    def test_openCardState(self):
+        """
+        不同异常状态的卡片在入库时的开卡情况
+        :return:
+        """
+        # 卡片入库
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+
+        # 已作废的卡片出库失败
+        resVoid = cS.cardVoid(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=startCardNo)
+        print(resVoid.json())
+        assert resVoid.json()["code"] == "200", "新出库卡片作废测试失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print(resFirstOpen.json())
+        assert "20000" == resFirstOpen.json()["code"], "已作废的卡片不能开卡，测试不通过"
+        assert "该卡状态为[作废],不能开卡!" == resFirstOpen.json()["message"], "已作废的卡片不能开卡，提示信息错误"
+
+        # 未出库的卡片出库失败
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=endCardNo, applyUserName=self.applyUserName)
+        print(resFirstOpen.json())
+        assert "20000" == resFirstOpen.json()["code"], "未激活的卡片不能开卡，测试不通过"
+        assert "该卡状态为[未激活],不能开卡!" == resFirstOpen.json()["message"], "未激活的卡片不能开卡，提示信息错误"
+
+#coding=utf-8
+
+# @Time    : 2021/5/26 10:19
+# @Author  : Ljq
+# @File    : test_openSlaveCard.py
+# @Software: PyCharm
+
+
+"""
+    副卡开卡测试
+"""
+
+import unittest
+import requests
+import time
+import json
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.returnCard as reC
+import commons.api.cardStorageOut as cSO
+import commons.api.openCard as oMC
+import commons.api.cardLostAndUnLost as cLAUL
+import commons.api.cardStock as cS
+from commons.readConf import readConfig
+from commons.api.doLogin import doLogin
+
+class tset_openMasterCard(unittest.TestCase):
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # 配置信息获取
+        readC = readConfig()
+        cls.cardHost = readC.returnOptionsItems("host", "cardHost")
+        cls.gatewayHost = readC.returnOptionsItems("host", "gatewayHost")
+        cls.cCNum = readC.returnOptionsItems("testInfo","cCNum")
+        cls.cCNumB = readC.returnOptionsItems("testInfo", "cCNumB")
+        cls.cardNum = readC.returnOptionsItems("testInfo", "cardNum")
+        cls.cardNumRe = readC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.loginPwd = readC.returnOptionsItems("testInfo", "loginPwd")
+        # 登录信息获取
+        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"]
+        cls.firmId = cls.userInfo["data"]["user"]["firmId"]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def test_getAccountInfo(self):
+        """
+        获取卡片信息测试
+        :return:
+        """
+        # 使用未入库的卡片进行获取
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost,clientHeaders =self.clientHeaders,cardNo=999999999999)
+        print(resGet.json())
+        assert "10001" == resGet.json()["code"],"未入库卡片信息获取测试不通过"
+        assert "卡账户不存在" == resGet.json()["message"],"未入库卡片信息获取测试不通过"
+
+        # 使用入库未出库的卡片进行信息获取
+        # 卡片入库
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        print(resGet.json())
+        assert "10001" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "卡账户不存在" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+
+        # 使用出库未开卡的卡片进行信息获取
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        print(resGet.json())
+        assert "10001" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "卡账户不存在" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+
+        # 使用已开卡的卡片可以正确的获取到客户信息
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        assert "200" == resFirstOpen.json()["code"], "开卡失败"
+        assert "data" in resFirstOpen.json(), "开卡失败"
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # print("resGet.json()",resGet.json())
+        assert "200" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "data" in resGet.json(), "未出库卡片信息获取测试不通过"
+
+        # 使用已挂失的卡片信息进行卡片信息获取
+        accountId,customerId = resGet.json()["data"]["accountId"],resGet.json()["data"]["customerId"]
+        resLossCard = cLAUL.lossCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=str(startCardNo),
+                                     accountId=accountId, customerId=customerId, loginPwd=self.loginPwd)
+        # print("resLossCard.json()",resLossCard.json())
+        assert "200" == resLossCard.json()["code"],"已挂失的卡片获取卡片信息测试不通过"
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # print("resGet.json()", resGet.json())
+        assert "2000" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "该卡为挂失状态，不能进行此操作" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+        # 解挂
+        resUnLoss = cLAUL.unLostCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=str(startCardNo),
+                                     accountId=accountId, customerId=customerId, loginPwd=self.loginPwd)
+        # print("resUnLoss.json()",resUnLoss.json())
+
+        # 账号冻结状态
+
+        # 卡片锁定状态
+
+        # 使用已退还的卡片进行卡片信息获取
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # print("resGet.json()", resGet.json())
+        assert "2000" == resGet.json()["code"], "未出库卡片信息获取测试不通过"
+        assert "该卡为退还状态，不能进行此操作" == resGet.json()["message"], "未出库卡片信息获取测试不通过"
+
+    def test_checkSlaveCardNo(self):
+        """测试副卡校验功能开卡"""
+        # 使用未入库的副卡进行校验
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=999999999999,cardType=20)
+        print(res.json())
+        assert "10000" == res.json()["code"], "使用已存在未开卡的卡片进行校验校验失败"
+        assert "该卡未入库!" == res.json()["message"], "message信息与预期信息不匹配"
+
+        # 使用未出库的卡片进行校验
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo,
+                                 cardType=20)
+        print(res.json())
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+
+        # 使用已出库的卡片进行校验
+        SlaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = len([i for i in range(startSlaveCardNo, endSlaveCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=SlaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo,
+                                 cardType=20)
+        print(res.json())
+        assert "200" == res.json()["code"], "使用已出库的卡片进行校验校验失败"
+        assert "OK" == res.json()["message"], "message信息与预期信息不匹配"
+
+        # 使用已作废的卡片进行校验
+        resCardVoid = cS.cardVoid(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNo=endSlaveCardNo)
+        assert "200"==resCardVoid.json()["code"],"卡片作废失败"
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=endSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已作废的卡片进行校验校验失败"
+        assert "该卡状态为[作废],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+
+
+        # 使用已开卡的卡片进行校验
+        time.sleep(2)
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo+1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->",resSavaCard.json())
+        # 出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = len([i for i in range(startCardNo, endCardNo)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        # 主卡开卡
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen",resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡开卡
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        print("resOpenSlaveCard     --->        ",resOpenSlaveCard.json())
+        resCheckNewCardNo= oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo,
+                                 cardType=20)
+        print(resCheckNewCardNo.json())
+        assert "20000" == resCheckNewCardNo.json()["code"], "使用已开卡的卡片进行校验校验失败"
+        assert "该卡状态为[在用],不能开卡!" == resCheckNewCardNo.json()["message"], "message信息与预期信息不匹配"
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+
+
+        # 使用已退卡的卡片进行校验
+        resCheckNewCardNo = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                               cardNo=startSlaveCardNo,
+                                               cardType=20)
+        print("203 resCheckNewCardNo ",resCheckNewCardNo.json())
+        assert "200" == resCheckNewCardNo.json()["code"], "使用已开卡的卡片进行校验校验失败"
+        assert "OK" == resCheckNewCardNo.json()["message"], "message信息与预期信息不匹配"
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+
+    def test_openSlaveCard(self):
+        """
+        副卡开卡测试
+        :return:
+        """
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        # 出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = len([i for i in range(startCardNo, endCardNo)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        # 主卡开卡
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        print(res.json())
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = len([i for i in range(startSlaveCardNo, endSlaveCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        # 开卡
+        costFee = oMC.getOpenCardFee(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders).json()["data"]
+        print(costFee)
+        resGet = oMC.getAccountInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo).json()["data"]
+        print("resGet    --->   ", resGet)
+        customerName = resGet["customerName"]
+        customerId = resGet["customerId"]
+        customerCredentialType = resGet["customerCertificateType"]
+        customerContactsPhone = resGet["customerContactsPhone"]
+        loginPwd = self.loginPwd
+        cardNo = startSlaveCardNo
+        customerCertificateNumber = resGet["customerCertificateNumber"]
+        cardType = 20
+        customerCode = resGet["customerCode"]
+        name = self.applyUserName
+        parentAccountId = resGet["accountId"]
+        parentLoginPwd = self.loginPwd
+        holdName = customerName
+        holdContactsPhone = customerContactsPhone
+        resOpenSlaveCard = oMC.openSlaveCard(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             customerName=customerName,
+                                             customerId=customerId, customerContactsPhone=customerContactsPhone,
+                                             loginPwd=loginPwd, cardNo=cardNo,
+                                             customerCertificateNumber=customerCertificateNumber, cardType=cardType,
+                                             costFee=costFee, customerCode=customerCode,
+                                             name=name, parentAccountId=parentAccountId, parentLoginPwd=parentLoginPwd,
+                                             holdName=holdName,
+                                             holdContactsPhone=holdContactsPhone,
+                                             customerCredentialType=customerCredentialType
+                                             )
+
+        # # 办理副卡方法封装
+        # resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+        #                                         cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+        #                                         loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+        #                                         parentLoginPwd=self.loginPwd)
+
+        print("resOpenSlaveCard.json()", resOpenSlaveCard.json())
+        assert "200" == resOpenSlaveCard.json()["code"],"开卡测试失败"
+        assert "success" == resOpenSlaveCard.json()["message"], "开卡测试失败"
+        # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+    def test_openSlaveCardState(self):
+        """
+        异常的副卡办理状态
+        :return:
+        """
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        # 出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = len([i for i in range(startCardNo, endCardNo)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        # 主卡开卡
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 1
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = len([i for i in range(startSlaveCardNo, endSlaveCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 以上为测试准备
+
+        # 卡片不能重复开卡
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        print("resOpenSlaveCard   ",resOpenSlaveCard.json())
+        assert "20000" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        assert "该卡状态为[在用],不能开卡!" == resOpenSlaveCard.json()["message"], "开卡测试失败"
+
+        # 副卡退还后可以重新开卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+
+        # 主卡密码错误时开卡失败
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd="909090")
+        assert "10001" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        assert "密码输入有误" == resOpenSlaveCard.json()["message"], "开卡测试失败"
+
+        # 副卡新密码格式不正确-接口暂未校验
+
+        # # 副卡退卡
+        # reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # 主卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+
+
+#coding=utf-8
+
+# @Time    : 2021/5/24 9:51
+# @Author  : Ljq
+# @File    : test_outCard.py
+# @Software: PyCharm
+
+
+"""
+    卡片出库测试用例
+"""
+
+import unittest
+import re
+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
+
+
+class test_outCard(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"]
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+    def setUp(self):
+        time.sleep(2)
+        # pass
+
+    def tearDown(self):
+        pass
+
+    def test_openPage(self):
+        # 直接打开出库列表
+        listRes = cSO.getOutPage(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        print(listRes.json())
+        assert "200" == listRes.json()["code"],"出库列表查询失败"
+
+    def test_outCard_positive(self):
+        # 先添加入库卡片
+        faceNum = 3
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        cardFace = cSI.returnFaceValue(resCardFace=cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost,webHeaders=self.webHeaders,startCardNo=startCardNo,endCardNo=endCardNo,cardFace=cardFace)
+
+        # 出库 ---> 卡片类别获取
+        cardTypeRes = cSO.getCardType(cardHost=self.cardHost,webHeaders=self.webHeaders)
+        # 获取用户信息
+        userInfo = cSO.getUserInfo(cardHost=self.cardHost, webHeaders=self.webHeaders, name=self.applyUserCode,keyword=self.applyUserCode)
+        assert userInfo.json()["data"][0]["id"] == self.applyUserId, "获取到的用户信息与实际用户信息不匹配"
+        # 出库 ---> 卡面信息获取
+        cardFaceB = cSI.returnFaceValue(resCardFace=cSO.getCardFace(cardHost=self.cardHost,webHeaders=self.webHeaders),faceNum=faceNum)
+        # 出库 ---> 卡片入库卡面与当前卡面对比
+        for cardNo in range(startCardNo,endCardNo+1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders,cardFace=cardFaceB,cardNo=cardNo)
+            assert cardState.json()["code"] == "200","卡片面校验不通过"
+            assert cardFace == cardFaceB,"卡面信息断言失败"
+        # 出库 ---> 卡片出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo,endCardNo+1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost,webHeaders=self.webHeaders,cardNos=cardNos,applyUserName=self.applyUserName,applyUserId=self.applyUserId,applyUserCode=self.applyUserCode,amount=amount)
+        assert outCardRes.json()["code"] == "200","出库失败"
+
+        # 出库信息断言
+        outCardDetail = cSO.getOutCardDetail(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        assert sorted(outCardDetail) == sorted([str(i) for i in range(startCardNo,endCardNo+1)]), "返回的出库信息与实际出库信息不一致"
+
+    def test_searchUser(self):
+        # 先添加入库卡片
+        faceNum = 3
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        cardFace = cSI.returnFaceValue(resCardFace=cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                       faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+
+        # 出库 ---> 卡片类别获取
+        cardTypeRes = cSO.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # 获取用户信息
+        userInfo = cSO.getUserInfo(cardHost=self.cardHost, webHeaders=self.webHeaders, name=self.applyUserCode,
+                                   keyword=self.applyUserCode)
+        assert userInfo.json()["data"][0]["id"] == self.applyUserId, "获取到的用户信息与实际用户信息不匹配"
+        # 出库 ---> 卡面信息获取
+        cardFaceB = cSI.returnFaceValue(resCardFace=cSO.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                        faceNum=faceNum)
+        # 出库 ---> 卡片入库卡面与当前卡面对比
+        for cardNo in range(startCardNo, endCardNo + 1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                            cardNo=cardNo)
+            assert cardState.json()["code"] == "200", "卡片面校验不通过"
+            assert cardFace == cardFaceB, "卡面信息断言失败"
+        # 出库 ---> 卡片出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 根据领取人获取最新的出库记录
+        listRes = cSO.getOutPage(cardHost=self.cardHost, webHeaders=self.webHeaders,applyUserName=self.applyUserName,
+                                    applyUserId=self.applyUserId)
+        assert self.applyUserName == list(set([i["applyUserName"] for i in listRes.json()["rows"]]))[0],"领取人查询成功"
+
+    def test_searchCard(self):
+        # 先添加入库卡片
+        faceNum = 3
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        cardFace = cSI.returnFaceValue(resCardFace=cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                       faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+
+        # 出库 ---> 卡片类别获取
+        cardTypeRes = cSO.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # 获取用户信息
+        userInfo = cSO.getUserInfo(cardHost=self.cardHost, webHeaders=self.webHeaders, name=self.applyUserCode,
+                                   keyword=self.applyUserCode)
+        assert userInfo.json()["data"][0]["id"] == self.applyUserId, "获取到的用户信息与实际用户信息不匹配"
+        # 出库 ---> 卡面信息获取
+        cardFaceB = cSI.returnFaceValue(resCardFace=cSO.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                        faceNum=faceNum)
+        # 出库 ---> 卡片入库卡面与当前卡面对比
+        for cardNo in range(startCardNo, endCardNo + 1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                            cardNo=cardNo)
+            assert cardState.json()["code"] == "200", "卡片面校验不通过"
+            assert cardFace == cardFaceB, "卡面信息断言失败"
+        # 出库 ---> 卡片出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 根据领取人获取最新的出库记录
+        listRes = cSO.getOutPage(cardHost=self.cardHost, webHeaders=self.webHeaders,cardNo=startCardNo)
+        assert 1 == len([i for i in listRes.json()["rows"]]),"查询结果不唯一，查询失败"
+        firstId = listRes.json()["rows"][0]["id"]
+        resDetail = cSO.getOutListDetail(cardHost=self.cardHost, webHeaders=self.webHeaders, id=firstId)
+        outCardDetail = re.findall("<ul><li>(.*?)</li></ul>", resDetail.text)
+        assert str(startCardNo) in outCardDetail,"查询失败"
+
+    def test_searchDate(self):
+        # 先添加入库卡片
+        faceNum = 3
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        cardFace = cSI.returnFaceValue(resCardFace=cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                       faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+
+        # 出库 ---> 卡片类别获取
+        cardTypeRes = cSO.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # 获取用户信息
+        userInfo = cSO.getUserInfo(cardHost=self.cardHost, webHeaders=self.webHeaders, name=self.applyUserCode,
+                                   keyword=self.applyUserCode)
+        assert userInfo.json()["data"][0]["id"] == self.applyUserId, "获取到的用户信息与实际用户信息不匹配"
+        # 出库 ---> 卡面信息获取
+        cardFaceB = cSI.returnFaceValue(resCardFace=cSO.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                        faceNum=faceNum)
+        # 出库 ---> 卡片入库卡面与当前卡面对比
+        for cardNo in range(startCardNo, endCardNo + 1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                            cardNo=cardNo)
+            assert cardState.json()["code"] == "200", "卡片面校验不通过"
+            assert cardFace == cardFaceB, "卡面信息断言失败"
+        # 出库 ---> 卡片出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 根据领取人获取最新的出库记录
+        startDate = str(time.strftime("%Y-%m-%d 00:00:00", time.localtime()))
+        endDate = str(time.strftime("%Y-%m-%d 23:59:59", time.localtime()))
+        listRes = cSO.getOutPage(cardHost=self.cardHost, webHeaders=self.webHeaders,startDate=startDate,endDate=endDate)
+        pageNum = math.ceil(listRes.json()["total"]/10)
+        listRes = cSO.getOutPage(cardHost=self.cardHost, webHeaders=self.webHeaders, startDate=startDate,
+                                 endDate=endDate,page=pageNum)
+        dateList = [i["applyTime"] for i in listRes.json()["rows"]]
+        assert [] == [i for i in dateList if i < startDate or i > endDate], "查询结果错误，查询出非当天的入库信息"
+
+    def test_searchAllOption(self):
+        # 先添加入库卡片
+        faceNum = 3
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        cardFace = cSI.returnFaceValue(resCardFace=cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                       faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+
+        # 出库 ---> 卡片类别获取
+        cardTypeRes = cSO.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # 获取用户信息
+        userInfo = cSO.getUserInfo(cardHost=self.cardHost, webHeaders=self.webHeaders, name=self.applyUserCode,
+                                   keyword=self.applyUserCode)
+        assert userInfo.json()["data"][0]["id"] == self.applyUserId, "获取到的用户信息与实际用户信息不匹配"
+        # 出库 ---> 卡面信息获取
+        cardFaceB = cSI.returnFaceValue(resCardFace=cSO.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                        faceNum=faceNum)
+        # 出库 ---> 卡片入库卡面与当前卡面对比
+        for cardNo in range(startCardNo, endCardNo + 1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                            cardNo=cardNo)
+            assert cardState.json()["code"] == "200", "卡片面校验不通过"
+            assert cardFace == cardFaceB, "卡面信息断言失败"
+        # 出库 ---> 卡片出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 根据领取人获取最新的出库记录
+        startDate = str(time.strftime("%Y-%m-%d 00:00:00", time.localtime()))
+        endDate = str(time.strftime("%Y-%m-%d 23:59:59", time.localtime()))
+        # 根据领取人获取最新的出库记录
+        listRes = cSO.getOutPage(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNo=startCardNo,startDate=startDate,endDate=endDate,applyUserName=self.applyUserName,
+                                    applyUserId=self.applyUserId)
+        assert 1 == len([i for i in listRes.json()["rows"]]), "查询结果不唯一，查询失败"
+        firstId = listRes.json()["rows"][0]["id"]
+        resDetail = cSO.getOutListDetail(cardHost=self.cardHost, webHeaders=self.webHeaders, id=firstId)
+        outCardDetail = re.findall("<ul><li>(.*?)</li></ul>", resDetail.text)
+        assert str(startCardNo) in outCardDetail, "查询失败"
+
+    def test_checkCardState(self):
+        # 先添加入库卡片
+        faceNum = 3
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 1
+        cardFace = cSI.returnFaceValue(resCardFace=cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                       faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+
+        # 出库 ---> 卡片类别获取
+        cardTypeRes = cSO.getCardType(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        # 获取用户信息
+        userInfo = cSO.getUserInfo(cardHost=self.cardHost, webHeaders=self.webHeaders, name=self.applyUserCode,
+                                   keyword=self.applyUserCode)
+        assert userInfo.json()["data"][0]["id"] == self.applyUserId, "获取到的用户信息与实际用户信息不匹配"
+        # 出库 ---> 卡面信息获取
+        cardFaceB = cSI.returnFaceValue(resCardFace=cSO.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders),
+                                        faceNum=faceNum)
+        # 出库 ---> 卡片入库卡面与当前卡面对比
+        for cardNo in range(startCardNo, endCardNo + 1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                            cardNo=cardNo)
+            assert cardState.json()["code"] == "200", "卡片面校验不通过"
+            assert cardFace == cardFaceB, "卡面信息断言失败"
+        # 出库 ---> 卡片出库
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        amount = len([i for i in range(startCardNo, endCardNo + 1)])
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+
+        # 已出库的卡在出库页面进行状态校验
+        for cardNo in range(startCardNo, endCardNo + 1):
+            cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                            cardNo=cardNo)
+            assert cardState.json()["message"] == "该卡状态为[激活]，不能进行此操作!", "提示信息错误"
+            assert cardState.json()["code"] == "5000", "出库失败"
+
+        # 未出库的卡校验
+        cardState = cSO.checkCardForOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardFace=cardFaceB,
+                                        cardNo=startCardNo+2)
+        assert cardState.json()["message"] == "该卡未入库!", "提示信息错误"
+        assert cardState.json()["code"] == "10000", "未出库的卡片状态校验失败"
+
+        # 已开卡的状态校验，暂缺
+
+
+#coding=utf-8
+
+# @Time    : 2021/6/11 14:35
+# @Author  : Ljq
+# @File    : test_pwdModify.py
+# @Software: PyCharm
+
+
+"""
+    
+"""
+
+import unittest
+import random
+import time
+import json
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.returnCard as reC
+import commons.api.cardStorageOut as cSO
+import commons.api.openCard as oMC
+import commons.api.operatePwd as operatePwd
+from commons.readConf import readConfig
+from commons.api.doLogin import doLogin
+
+class test_pwdModify(unittest.TestCase):
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # 配置信息获取
+        readC = readConfig()
+        cls.cardHost = readC.returnOptionsItems("host", "cardHost")
+        cls.gatewayHost = readC.returnOptionsItems("host", "gatewayHost")
+        cls.cCNum = readC.returnOptionsItems("testInfo","cCNum")
+        cls.cCNumB = readC.returnOptionsItems("testInfo", "cCNumB")
+        cls.cardNum = readC.returnOptionsItems("testInfo", "cardNum")
+        cls.cardNumRe = readC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.loginPwd = readC.returnOptionsItems("testInfo", "loginPwd")
+        # 登录信息获取
+        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"]
+        cls.firmId = cls.userInfo["data"]["user"]["firmId"]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def producePwd(self):
+        pwd = "".join(random.sample("0123456789", 6))
+        return pwd
+
+    def test_pwdModify(self):
+        """修改密码正向流程测试"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束-获取卡片客户信息
+        resSimpleInfo = operatePwd.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resSimpleInfo = operatePwd.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cardNo=startSlaveCardNo)
+        customerIdSlaveCard, accountIdSlaveCard = resSimpleInfo.json()["data"]["accountInfo"]["customerId"], \
+                                                  resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+
+        # 主卡正常修改密码
+        newPwd = self.producePwd()
+        print("newPwd",newPwd)
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,oldLoginPwd=self.loginPwd,
+                                   loginPwd=newPwd,secondLoginPwd=newPwd,cardNo=startCardNo,accountId=accountId,customerId=customerId)
+        # print(resRLP.json())
+        assert "200" == resRLP.json()["code"],"主卡正常修改密码测试不通过"
+        assert "OK" == resRLP.json()["message"], "主卡正常修改密码测试不通过"
+
+        # 副卡正常修改密码
+        newPwdSlave = self.producePwd()
+        # print("newPwdSlave",newPwdSlave)
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,oldLoginPwd=self.loginPwd,loginPwd=newPwdSlave,
+                               secondLoginPwd=newPwdSlave,cardNo=startSlaveCardNo,accountId=accountIdSlaveCard,customerId=customerIdSlaveCard)
+        print(resRLP.json())
+        assert "200" == resRLP.json()["code"],"副卡正常修改密码测试不通过"
+        assert "OK" == resRLP.json()["message"], "副卡正常修改密码测试不通过"
+
+        """测试完成"""
+
+        # 副卡退卡
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo,loginPwd=newPwdSlave)
+        assert "200" == resSlave.json()["code"],"副卡使用新密码退卡成功，密码修改成功"
+        assert "OK" == resSlave.json()["message"], "副卡使用新密码退卡成功，密码修改成功"
+        # 主卡退卡
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,loginPwd=newPwd)
+        assert "200" == res.json()["code"],"主卡使用新密码退卡成功，密码修改成功"
+        assert "OK" == res.json()["message"], "主卡使用新密码退卡成功，密码修改成功"
+
+    def test_pwdModifyError(self):
+        """修改密码异常流程"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束-获取卡片客户信息
+        resSimpleInfo = operatePwd.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resSimpleInfo = operatePwd.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cardNo=startSlaveCardNo)
+        customerIdSlaveCard, accountIdSlaveCard = resSimpleInfo.json()["data"]["accountInfo"]["customerId"], \
+                                                  resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+
+        # 副卡原密码错误修改失败
+        newPwdSlave = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, oldLoginPwd="909090",
+                                   loginPwd=newPwdSlave,
+                                   secondLoginPwd=newPwdSlave, cardNo=startSlaveCardNo, accountId=accountIdSlaveCard,
+                                   customerId=customerIdSlaveCard)
+        assert "10001" == resRLP.json()["code"], "副卡原密码错误修改失败测试不通过"
+        assert "密码输入有误" == resRLP.json()["message"], "副卡原密码错误修改失败测试不通过"
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                     cardNo=startSlaveCardNo, loginPwd=newPwdSlave)
+        assert "10001" == resSlave.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+        # 主卡原密码错误修改失败
+        newPwd = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,oldLoginPwd="909090",
+                                   loginPwd=newPwd,secondLoginPwd=newPwd,cardNo=startCardNo,accountId=accountId,customerId=customerId)
+        assert "10001" == resRLP.json()["code"],"主卡原密码错误修改失败测试不通过"
+        assert "密码输入有误" == resRLP.json()["message"], "主卡原密码错误修改失败测试不通过"
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                loginPwd=newPwd)
+        assert "10001" == res.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+
+        # 两次输入的新密码不一致时修改密码失败
+        newPwdSlave = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, oldLoginPwd=self.loginPwd,
+                                   loginPwd="909090",secondLoginPwd=newPwdSlave, cardNo=startSlaveCardNo,
+                                   accountId=accountIdSlaveCard, customerId=customerIdSlaveCard)
+        print(resRLP.json())
+        assert "2000" == resRLP.json()["code"], "副卡两次输入的新密码不一致时修改密码失败测试不通过"
+        assert "两次输入密码不匹配" == resRLP.json()["message"], "副卡两次输入的新密码不一致时修改密码失败测试不通过"
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                     cardNo=startSlaveCardNo, loginPwd=newPwdSlave)
+        assert "10001" == resSlave.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+        # 主卡原密码错误修改失败
+        newPwd = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, oldLoginPwd=self.loginPwd,
+                                   loginPwd="909090", secondLoginPwd=newPwd, cardNo=startCardNo, accountId=accountId,
+                                   customerId=customerId)
+        print(resRLP.json())
+        assert "2000" == resRLP.json()["code"], "主卡两次输入的新密码不一致时修改密码失败测试不通过"
+        assert "两次输入密码不匹配" == resRLP.json()["message"], "主卡两次输入的新密码不一致时修改密码失败测试不通过"
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                loginPwd=newPwd)
+        assert "10001" == res.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+
+        # 第一个密码输入长度不满足六位时修改失败
+        newPwdSlave = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, oldLoginPwd=self.loginPwd,
+                                   loginPwd="90909",secondLoginPwd=newPwdSlave, cardNo=startSlaveCardNo,
+                                   accountId=accountIdSlaveCard, customerId=customerIdSlaveCard)
+        print(resRLP.json())
+        assert "1000" == resRLP.json()["code"], "副卡第一个密码输入长度不满足六位时修改失败测试不通过"
+        assert "密码必须6位" == resRLP.json()["message"], "副卡第一个密码输入长度不满足六位时修改失败测试不通过"
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                     cardNo=startSlaveCardNo, loginPwd=newPwdSlave)
+        assert "10001" == resSlave.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+        # 主卡原密码错误修改失败
+        newPwd = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, oldLoginPwd=self.loginPwd,
+                                   loginPwd="90909", secondLoginPwd=newPwd, cardNo=startCardNo, accountId=accountId,
+                                   customerId=customerId)
+        print(resRLP.json())
+        assert "1000" == resRLP.json()["code"], "主卡第一个密码输入长度不满足六位时修改失败测试不通过"
+        assert "密码必须6位" == resRLP.json()["message"], "主卡第一个密码输入长度不满足六位时修改失败测试不通过"
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                loginPwd=newPwd)
+        assert "10001" == res.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+
+        # 第二个密码输入长度不满足六位时修改失败
+        newPwdSlave = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                   oldLoginPwd=self.loginPwd,
+                                   loginPwd=newPwdSlave, secondLoginPwd="90909", cardNo=startSlaveCardNo,
+                                   accountId=accountIdSlaveCard, customerId=customerIdSlaveCard)
+        print(resRLP.json())
+        assert "1000" == resRLP.json()["code"], "副卡第二个密码输入长度不满足六位时修改失败测试不通过"
+        assert "确认密码密码必须6位" == resRLP.json()["message"], "副卡第二个密码输入长度不满足六位时修改失败测试不通过"
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                     cardNo=startSlaveCardNo, loginPwd=newPwdSlave)
+        assert "10001" == resSlave.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+        # 主卡原密码错误修改失败
+        newPwd = self.producePwd()
+        resRLP = operatePwd.modifyLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                   oldLoginPwd=self.loginPwd,
+                                   loginPwd=newPwd, secondLoginPwd="90909", cardNo=startCardNo, accountId=accountId,
+                                   customerId=customerId)
+        print(resRLP.json())
+        assert "1000" == resRLP.json()["code"], "主卡第二个密码输入长度不满足六位时修改失败测试不通过"
+        assert "确认密码密码必须6位" == resRLP.json()["message"], "主卡第二个密码输入长度不满足六位时修改失败测试不通过"
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,
+                                loginPwd=newPwd)
+        assert "10001" == res.json()["code"], "修改密码失败后不能使用新密码退卡，测试不通过"
+
+        """测试完成"""
+
+        # # 副卡退卡
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
 \ No newline at end of file
+#coding=utf-8
+
+# @Time    : 2021/6/11 14:36
+# @Author  : Ljq
+# @File    : test_pwdReset.py
+# @Software: PyCharm
+
+
+"""
+    重置密码功能接口测试
+"""
+
+
+import unittest
+import random
+import time
+import json
+import math
+import commons.api.cardStorageIn as cSI
+import commons.api.returnCard as reC
+import commons.api.cardStorageOut as cSO
+import commons.api.openCard as oMC
+import commons.api.operatePwd as oP
+from commons.readConf import readConfig
+from commons.api.doLogin import doLogin
+
+class test_pwdModify(unittest.TestCase):
+    def setUp(self) -> None:
+        pass
+
+    def tearDown(self) -> None:
+        pass
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        # 配置信息获取
+        readC = readConfig()
+        cls.cardHost = readC.returnOptionsItems("host", "cardHost")
+        cls.gatewayHost = readC.returnOptionsItems("host", "gatewayHost")
+        cls.cCNum = readC.returnOptionsItems("testInfo","cCNum")
+        cls.cCNumB = readC.returnOptionsItems("testInfo", "cCNumB")
+        cls.cardNum = readC.returnOptionsItems("testInfo", "cardNum")
+        cls.cardNumRe = readC.returnOptionsItems("testInfo", "cardNumRe")
+        cls.loginPwd = readC.returnOptionsItems("testInfo", "loginPwd")
+        # 登录信息获取
+        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"]
+        cls.firmId = cls.userInfo["data"]["user"]["firmId"]
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        pass
+
+    def producePwd(self):
+        pwd = "".join(random.sample("0123456789", 6))
+        return pwd
+
+    def test_pwdModify(self):
+        """修改密码正向流程测试"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束-获取卡片客户信息
+        resSimpleInfo = oP.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resSimpleInfo = oP.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cardNo=startSlaveCardNo)
+        customerIdSlaveCard, accountIdSlaveCard = resSimpleInfo.json()["data"]["accountInfo"]["customerId"], \
+                                                  resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+
+        # 主卡正常重置密码
+        newPwd = self.producePwd()
+        print("newPwd",newPwd)
+        resRLP = oP.resetLoginPwd(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,loginPwd=newPwd,
+                               secondLoginPwd=newPwd,cardNo=startCardNo,accountId=accountId,customerId=customerId)
+        assert "200" == resRLP.json()["code"],"主卡正常重置密码测试不通过"
+        assert "OK" == resRLP.json()["message"], "主卡正常重置密码测试不通过"
+
+        # 副卡正常重置密码
+        newPwdSlave = self.producePwd()
+        print("newPwdSlave",newPwdSlave)
+        resRLP = oP.resetLoginPwd(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,loginPwd=newPwdSlave,
+                               secondLoginPwd=newPwdSlave,cardNo=startSlaveCardNo,accountId=accountIdSlaveCard,customerId=customerIdSlaveCard)
+        assert "200" == resRLP.json()["code"],"副卡正常重置密码测试不通过"
+        assert "OK" == resRLP.json()["message"], "副卡正常重置密码测试不通过"
+
+        """测试完成"""
+
+        # 副卡退卡
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo,loginPwd=newPwdSlave)
+        assert "200" == resSlave.json()["code"],"副卡使用新密码退卡成功，密码重置成功"
+        assert "OK" == resSlave.json()["message"], "副卡使用新密码退卡成功，密码重置成功"
+        # 主卡退卡
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,loginPwd=newPwd)
+        assert "200" == res.json()["code"],"主卡使用新密码退卡成功，密码重置成功"
+        assert "OK" == res.json()["message"], "主卡使用新密码退卡成功，密码重置成功"
+
+    def test_pwdModifyError(self):
+        """修改密码异常流程测试   部分用例后续添加"""
+        # 主卡入库-出库-开卡
+        faceNum = 1
+        startCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endCardNo = startCardNo + 2
+        resCardFace = cSI.getCardFace(cardHost=self.cardHost, webHeaders=self.webHeaders)
+        cardFace = cSI.returnFaceValue(resCardFace=resCardFace, faceNum=faceNum)
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startCardNo,
+                                   endCardNo=endCardNo, cardFace=cardFace)
+        print("resSavaCard.json()  ->", resSavaCard.json())
+        cardNos = str(startCardNo) + "," + str(endCardNo)
+        print(cardNos)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=cardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resFirstOpen = oMC.openMasterCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                             cCNum=self.cCNum, cardNo=startCardNo, applyUserName=self.applyUserName)
+        print("resFirstOpen", resFirstOpen.json())
+        assert "200" == resFirstOpen.json()["code"], "第一次开卡，开卡失败"
+        assert "data" in resFirstOpen.json(), "第一次开卡，开卡失败"
+        # 副卡入库-出库-开卡
+        startSlaveCardNo = int(time.strftime("%y%m%d%H%M%S", time.localtime()))
+        endSlaveCardNo = startSlaveCardNo + 2
+        resSavaCard = cSI.savaCard(cardHost=self.cardHost, webHeaders=self.webHeaders, startCardNo=startSlaveCardNo,
+                                   endCardNo=endSlaveCardNo, cardType=20)
+        res = oMC.checkNewCardNo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                 cardNo=startSlaveCardNo,
+                                 cardType=20)
+        assert "20000" == res.json()["code"], "使用已存在未出库的卡片进行校验校验失败"
+        assert "该卡状态为[未激活],不能开卡!" == res.json()["message"], "message信息与预期信息不匹配"
+        slaveCardNos = str(startSlaveCardNo) + "," + str(endSlaveCardNo)
+        amount = 2
+        outCardRes = cSO.cardAddOut(cardHost=self.cardHost, webHeaders=self.webHeaders, cardNos=slaveCardNos,
+                                    applyUserName=self.applyUserName, applyUserId=self.applyUserId,
+                                    applyUserCode=self.applyUserCode, amount=amount)
+        assert outCardRes.json()["code"] == "200", "出库失败"
+        resOpenSlaveCard = oMC.openSlaveCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                                cardNo=startCardNo, slaveCardNo=startSlaveCardNo,
+                                                loginPwd=self.loginPwd, applyUserName=self.applyUserName,
+                                                parentLoginPwd=self.loginPwd)
+        assert "200" == resOpenSlaveCard.json()["code"], "开卡测试失败"
+        # 开卡结束-获取卡片客户信息
+        resSimpleInfo = oP.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                      cardNo=startCardNo)
+        customerId,accountId = resSimpleInfo.json()["data"]["accountInfo"]["customerId"],resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        resSimpleInfo = oP.getSimpleInfo(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                         cardNo=startSlaveCardNo)
+        customerIdSlaveCard, accountIdSlaveCard = resSimpleInfo.json()["data"]["accountInfo"]["customerId"], \
+                                                  resSimpleInfo.json()["data"]["accountInfo"]["accountId"]
+        # 以上为测试数据准备
+
+        """开始测试"""
+
+        # 副卡使用两个不一致的密码进行重置时重置失败
+        newPwdSlave = self.producePwd()
+        print("newPwdSlave", newPwdSlave)
+        resRLP = oP.resetLoginPwd(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, loginPwd="123456",
+                                  secondLoginPwd=newPwdSlave, cardNo=startSlaveCardNo, accountId=accountIdSlaveCard,
+                                  customerId=customerIdSlaveCard)
+        print(resRLP.json())
+        assert "2000" == resRLP.json()["code"], "副卡正常重置密码测试不通过"
+        assert "两次密码输入不一致，请重新输入" == resRLP.json()["message"], "副卡正常重置密码测试不通过"
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders,
+                                     cardNo=startSlaveCardNo, loginPwd=newPwdSlave)
+        assert "10001" == resSlave.json()["code"], "重置密码失败后不能使用新密码退卡，测试不通过"
+
+
+        # 主卡使用两个不一致的密码进行重置时重置失败
+        newPwd = self.producePwd()
+        print("newPwd",newPwd)
+        resRLP = oP.resetLoginPwd(gatewayHost=self.gatewayHost,clientHeaders=self.clientHeaders,loginPwd="123456",
+                               secondLoginPwd=newPwd,cardNo=startCardNo,accountId=accountId,customerId=customerId)
+        print(resRLP.json())
+        assert "2000" == resRLP.json()["code"],"主卡正常重置密码测试不通过"
+        assert "两次密码输入不一致，请重新输入" == resRLP.json()["message"], "主卡正常重置密码测试不通过"
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo,loginPwd=newPwd)
+        assert "10001" == res.json()["code"],"重置密码失败后不能使用新密码退卡，测试不通过"
+
+        # 挂失的卡片不可以重置密码
+
+        # 卡务锁定的卡片不可以重置密码
+
+        # 账号冻结的卡片不可以重置密码
+
+        # 资金账号锁定的卡片可以重置密码
+
+        """测试完成"""
+
+        # 副卡退卡
+        resSlave = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startSlaveCardNo)
+        # assert "200" == resSlave.json()["code"],"副卡使用新密码退卡成功，密码重置成功"
+        # assert "OK" == resSlave.json()["message"], "副卡使用新密码退卡成功，密码重置成功"
+        # 主卡退卡
+        res = reC.returnCardDef(gatewayHost=self.gatewayHost, clientHeaders=self.clientHeaders, cardNo=startCardNo)
+        # assert "200" == res.json()["code"],"主卡使用新密码退卡成功，密码重置成功"
+        # assert "OK" == res.json()["message"], "主卡使用新密码退卡成功，密码重置成功"
+
+
@@ -25,7 +25,7 @@ def Create_Testcase_suite():
     '''创建测试套件'''
     testunit = unittest.TestSuite()
     test_Loader = DiscoveringTestLoader()
-    discover = test_Loader.discover("./testcase/", pattern='test_*.py', top_level_dir=None)
+    discover = test_Loader.discover("./", pattern='test_*.py', top_level_dir=None)
     print(discover)
     for test_suite in discover:
         testunit.addTests(test_suite)
@@ -37,7 +37,7 @@ 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"
+    report_file = os.path.abspath(os.path.join(path, "../"))+ "/report/" + now + "_result.html"
     # 创建报告文件
     fp = open(report_file, 'wb')