测试用例进门缴费防重功能适配

liujiqiang
1 parent fcf11dfd
Showing 3 changed files with 53 additions and 5 deletions
commons/api/entranceFeeBillList/entranceFeeBillList.py
commons/api/entranceFeeBillList/jmsfToken.py
commons/api/entranceFeeBillList/operationDoFreeze.py
@@ -12,7 +12,7 @@
 import json,time,random,re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
-# from commons.MySession import my
+from commons.api.entranceFeeBillList import jmsfToken as jT
 from bs4 import BeautifulSoup
 import urllib.parse
  
@@ -219,10 +219,11 @@ def get_calculateRes(session=None,host=&quot;&quot;,autocompletecartype=None,**kwargs):
     res = session.useHeadersRequests("post", url=url,data=data,headers=headers)
     return res
  
-def do_doPay(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doPay(session=None,host="",jmsfToken=None,autocompletecartype=None,fee_str="",**kwargs):
     """进门单缴费"""
     url = host + "/entranceTrade/doPay.action"
     headers = dct.urlCode()
+    headers["jmsf_duplicate_commit_token"]=jmsfToken
  
     data = {"protocolId": "", "pwd": "{pwd}", "clientRedirectTag": "", "viewType": "pay", "optType": "{optType}",
             "optUrl": "", "correctInfo": "{correctInfo}", "weightType": "{weightType}", "id": "{orderId}",
@@ -405,7 +406,14 @@ def do_payOrder(session=None,host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrName=&quot;
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
  
-    aa = do_doPay(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    # 获取防重token
+    tAmount = chargeTotalAmountYuan
+    jmsfToken = jT.get_jmsfDuplicateCommitToken(session=session,host=host,cardNo=ic,fundId=accountId,amount=tAmount,
+                                                customerName=customerName,entranceId=orderId)
+    print("jmsfToken",jmsfToken)
+
+    aa = do_doPay(session=session,host=host,jmsfToken=jmsfToken, autocompletecartype=autocompletecartype, fee_str=fee_str,
+                  pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,
+# -*- coding: utf-8 -*-
+
+# @Time    : 2021/10/9 13:32
+# @Author  : Ljq
+# @File    : jmsfToken.py
+# @Software: PyCharm
+
+"""
+
+"""
+
+import json,time,random
+import re
+
+from commons.scripts import dealContentType as dct
+# from commons.MySession import sessionSy
+
+def get_jmsfDuplicateCommitToken(session=None,host="",**kwargs):
+    """进门防重接口"""
+    url = host + "/pay/index.action"
+    headers = dct.jsonCode()
+    params = {"bizType":"30","htmlRequest":"1","cardNo":"888810032426","fundId":"107575","amount":"45","customerName":"******","entranceId":"7471"}
+    params = dict(params,**kwargs)
+    res = session.useHeadersRequests(method="get", url=url, params=params,headers=headers)
+    jmsf_duplicate_commit_token = re.findall('name="token" id="token" value="(.*?)">',res.text)[0]
+    return jmsf_duplicate_commit_token
+
+# host = "http://test.jmsf.diligrp.com:8385"
+# session = sessionSy
+# res = get_jmsfDuplicateCommitToken(session=session,host=host)
+# print(res)
 \ No newline at end of file
@@ -13,13 +13,15 @@ import json,time, re
 from commons.scripts import dealContentType as dct
 from commons.scripts import jsonToUrlcode
 from commons.api.entranceFeeBillList import entranceFeeBillList as eFBL
+from commons.api.entranceFeeBillList import jmsfToken as jT
 from bs4 import BeautifulSoup
 import urllib.parse
  
-def do_doFreeze(session=None,host="",autocompletecartype=None,fee_str="",**kwargs):
+def do_doFreeze(session=None,host="",jmsfToken=None,autocompletecartype=None,fee_str="",**kwargs):
     """进门单缴费"""
     url = host + "/entranceTrade/doFreeze.action"
     headers = dct.urlCode()
+    headers["jmsf_duplicate_commit_token"]=jmsfToken
  
     data = {"protocolId": "", "pwd": "{pwd}", "clientRedirectTag": "", "viewType": "pay", "optType": "{optType}",
             "optUrl": "", "correctInfo": "{correctInfo}", "weightType": "{weightType}", "id": "{orderId}",
@@ -197,7 +199,14 @@ def do_freezeOrder(session=None,host=&quot;http://test.jmsf.diligrp.com:8385&quot;,attrNam
     receivableAmount = receivable
     tareWeightDate = tareWeightDate
  
-    aa = do_doFreeze(session=session,host=host, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
+    # 获取防重token
+    tAmount = freezeMoneySymbol
+    htmlRequest = 2
+    jmsfToken = jT.get_jmsfDuplicateCommitToken(session=session,host=host,cardNo=ic,fundId=accountId,amount=tAmount,
+                                                customerName=customerName,entranceId=orderId,htmlRequest=htmlRequest)
+    print("jmsfToken",jmsfToken)
+
+    aa = do_doFreeze(session=session,host=host,jmsfToken=jmsfToken, autocompletecartype=autocompletecartype, fee_str=fee_str, pwd=pwd, optType=optType,
                   weightType=weightType, id=id, goodsId=goodsId, number=number, created=created, status=status,
                   source=source,
                   correctDiscount=correctDiscount, totalAmount=totalAmount, customerId=customerId,