From dd6d8839020bf56efb5452da5e9a5e10d4a87013 Mon Sep 17 00:00:00 2001
From: zhaojiahui <zhaojiahui@yinjian.com>
Date: Wed, 30 Jul 2025 18:50:17 +0800
Subject: [PATCH 1/2] Initial commit

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3cbff17
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# DP-enterprise-fuiou-payment-push
+
+DP企微支付
\ No newline at end of file
-- 
2.49.0


From 9a923a67b9f781da84be216b405331102b37c81f Mon Sep 17 00:00:00 2001
From: jefferyzhao <375696853@qq.com>
Date: Wed, 30 Jul 2025 18:53:06 +0800
Subject: [PATCH 2/2] first commit

---
 .DS_Store                                     |  Bin 0 -> 6148 bytes
 .idea/.gitignore                              |    8 +
 .idea/enterprise-wechat-payment-push.iml      |   18 +
 .../inspectionProfiles/profiles_settings.xml  |    6 +
 .idea/misc.xml                                |    4 +
 .idea/modules.xml                             |    8 +
 1.py                                          |    4 +
 FuiouPay.py                                   |   71 +
 __pycache__/FuiouPay.cpython-36.pyc           |  Bin 0 -> 2087 bytes
 __pycache__/FuiouPay.cpython-37.pyc           |  Bin 0 -> 2194 bytes
 __pycache__/app.cpython-37.pyc                |  Bin 0 -> 5883 bytes
 __pycache__/config.cpython-36.pyc             |  Bin 0 -> 1343 bytes
 __pycache__/config.cpython-37.pyc             |  Bin 0 -> 1492 bytes
 __pycache__/dpapp.cpython-37.pyc              |  Bin 0 -> 8828 bytes
 __pycache__/utils.cpython-36.pyc              |  Bin 0 -> 24468 bytes
 __pycache__/utils.cpython-37.pyc              |  Bin 0 -> 25338 bytes
 config.py                                     |   56 +
 dg_priv_key.pem                               |    3 +
 dg_pub_key.pem                                |    3 +
 dpapp.py                                      |  333 +++++
 logs/dpapp.log                                |   46 +
 logs/payapp.log                               |   35 +
 priv_key.pem                                  |    3 +
 pub_key.pem                                   |    3 +
 test.py                                       |   20 +
 utils.py                                      | 1328 +++++++++++++++++
 26 files changed, 1949 insertions(+)
 create mode 100644 .DS_Store
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/enterprise-wechat-payment-push.iml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 1.py
 create mode 100644 FuiouPay.py
 create mode 100644 __pycache__/FuiouPay.cpython-36.pyc
 create mode 100644 __pycache__/FuiouPay.cpython-37.pyc
 create mode 100644 __pycache__/app.cpython-37.pyc
 create mode 100644 __pycache__/config.cpython-36.pyc
 create mode 100644 __pycache__/config.cpython-37.pyc
 create mode 100644 __pycache__/dpapp.cpython-37.pyc
 create mode 100644 __pycache__/utils.cpython-36.pyc
 create mode 100644 __pycache__/utils.cpython-37.pyc
 create mode 100644 config.py
 create mode 100644 dg_priv_key.pem
 create mode 100644 dg_pub_key.pem
 create mode 100644 dpapp.py
 create mode 100644 logs/dpapp.log
 create mode 100644 logs/payapp.log
 create mode 100644 priv_key.pem
 create mode 100644 pub_key.pem
 create mode 100644 test.py
 create mode 100644 utils.py

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a25e5132d1b687c919209306da8518e3d8ccfa7b
GIT binary patch
literal 6148
zcmeHK%Sr=55Ufc;9*PieUWEMt1D?FDF&?}L9`qJXj4>KbKm+Esckvhe1;57c(dwQd
zZ1!;#(QfFec~sA%X4u&Q;JS<JeV`4XNf)fNm=u__i|4EoYBq>Y`<P;a5gzf3evWMw
zzfl3%yKP)y&Yc?~y?^)I$t5~$8R6k%IvWnAvjN$1R6gjPFE!?Xy7n+v_Hv!;4%ohz
z;<h->jA!JABaRCr-ZBw&+~TfyCY3R{>6tXhT$ZvwGwdc7JgXC~`>ALqI3)i)HTSI)
zzpv|<2aPhTt{&w^I>!Z0sgu_<!&gPqBQ@|sjY{-)yP0{_%h&8)Gh7zUOaW8i-z&g7
zTdcY1(Na^u6fgx=3dr{%q6@|W6Oa1oV4_a|VvW^m%*zj=#6$t(fQd)8(3}q?`cN01
z7|w^YJ_@`zVB*n-!-dC(3nRPmLUB4e`;U|k7kjkS6fgzW6{z}RTkikk^7sFGkd;gU
zQ{Yc2;A*|IUYAP>cWZ8Oa@R)mOS+iw5|678X7nm1SFYk6x*F>v$q?g!iAUDZ>_<Rl
Lu*4MjQ3bvMa-fr`

literal 0
HcmV?d00001

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..081b737
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 数据源本地存储已忽略文件
+/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
diff --git a/.idea/enterprise-wechat-payment-push.iml b/.idea/enterprise-wechat-payment-push.iml
new file mode 100644
index 0000000..f936df0
--- /dev/null
+++ b/.idea/enterprise-wechat-payment-push.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="Flask">
+    <option name="enabled" value="true" />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..a2e120d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..4adf23a
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/enterprise-wechat-payment-push.iml" filepath="$PROJECT_DIR$/.idea/enterprise-wechat-payment-push.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/1.py b/1.py
new file mode 100644
index 0000000..30efd8a
--- /dev/null
+++ b/1.py
@@ -0,0 +1,4 @@
+from utils import *
+
+a = query_pay_details("231002197204291515")
+logger.info(fa)
\ No newline at end of file
diff --git a/FuiouPay.py b/FuiouPay.py
new file mode 100644
index 0000000..cb8c922
--- /dev/null
+++ b/FuiouPay.py
@@ -0,0 +1,71 @@
+import json
+from datetime import datetime
+
+import requests
+from Crypto.PublicKey import RSA
+import base64
+from Crypto.Cipher import PKCS1_v1_5
+import logging
+
+logger = logging.getLogger(__name__)
+
+# 使用公钥加密
+def rsa_long_encrypt(public_key,msg, length=100):
+    """
+    单次加密串的长度最大为 (key_size/8)-11
+    1024bit的证书用100， 2048bit的证书用 200
+    """
+    pub_key = RSA.importKey(open(public_key).read())
+    # pub_key = RSA.importKey(open('E:/YinJian/银建支付对接维护说明/富友/fy-enterprise-wechat-payment-push/pub_key.pem').read())
+    pubobj = PKCS1_v1_5.new(pub_key)
+    res = []
+    for i in range(0, len(msg), length):
+        res.append(pubobj.encrypt(msg[i:i + length].encode('GBK')))
+    return base64.b64encode(b"".join(res)).decode('GBK')
+
+
+class H5Main:
+    def __init__(self, sub_mchnt_cd):
+        self.mchnt_cd = "0001000F7152279"
+        self.sub_mchnt_cd = sub_mchnt_cd
+        self.url = 'https://aggpcpay.fuioupay.com/aggh5Gate.fuiou'
+        self.notify_url = "http://web.jiyuankeshang.com/api2/paymentCallBack"
+        # self.notify_url = "http://172.16.6.15:3006/paymentCallBack"
+
+    def unified_order(self, order_no, total, description):
+        if self.sub_mchnt_cd == '0001000F7152364':
+            param = {
+                    "mchnt_cd": self.sub_mchnt_cd,
+                    "order_date": datetime.now().strftime("%Y%m%d"),
+                    "order_id": order_no,
+                    "order_amt": total,
+                    "page_notify_url": self.notify_url,
+                    "back_notify_url": self.notify_url,
+                    "ver": "4.0.0",
+                    "goods_name": "履约服务费",
+                    "goods_detail": description,
+                    "fee_type": "CNY",
+                }
+            pub_key_location = 'dg_pub_key.pem'
+            # pub_key_location = 'E:\YinJian\银建支付对接维护说明\DP\DP-enterprise-wechat-payment-push\dg_pub_key.pem'
+        else:
+            param = {
+                "mchnt_cd": self.mchnt_cd,
+                "sub_mchnt_cd": self.sub_mchnt_cd,
+                "order_date": datetime.now().strftime("%Y%m%d"),
+                "order_id": order_no,
+                "order_amt": total,
+                "page_notify_url": self.notify_url,
+                "back_notify_url": self.notify_url,
+                "ver": "4.0.0",
+                "goods_name": "承包金",
+                "goods_detail": description,
+                "fee_type": "CNY",
+            }
+            pub_key_location = 'pub_key.pem'
+            # pub_key_location = 'E:\YinJian\银建支付对接维护说明\DP\DP-enterprise-wechat-payment-push\pub_key.pem'
+        logger.info(f"======================发起支付===================={param}")
+        # 加密
+        message = json.dumps(param)
+        encrypted_message = rsa_long_encrypt(pub_key_location,message,100)
+        return json.dumps({"message": encrypted_message})
\ No newline at end of file
diff --git a/__pycache__/FuiouPay.cpython-36.pyc b/__pycache__/FuiouPay.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7aa9d46bef6cd67df4619bd20018c05091b4dcc0
GIT binary patch
literal 2087
zcmah~-ESL35Z}EopU+OxA_SDr07|KWIJTRlr2<r%szs`ZBJuz|37sz9jeQs2NA}hY
zwk{ILDTt~Ss%Rxt^?^!IKtifOAlib||6?B^PMaqlc;kuLvkPgd#Gd!JbMvt`JF_$1
zKQdxfemmCqtbow(Xva{2J`6K?7l0swTgaBH(!v3@F&^*~TLGThQUlG_hCJQYfv2^M
zAZO=*XAy(sHn43TN5mxg4Mg%i#m*DFh)RWR*d5K6urP_sDfa>jwEFhq8?aalC*~Hb
z&Z(+1vrRy)E`5?CH=J{@CJcZhA9E!|J?yJJz;%^tzMiT;X$`clzki4u1oK>qdpK2k
z>QVIG-gP6@eKXbke2P;89_3MVTG@kqizq$N>%kdUYwsXl@QXzCM^at#{81?d&$ad{
zeApU?(LZ-_>$@xcGhg(teYAP~hufDnwlCi5-@LkY`GfwKUvFN&Ilga&cAUiP(y4=`
z$!ayTs#a>#OCAU9JJ&wkym9sRg>R~r${)X;9j{fU58fvMUL~_)7``gh<3~>X2?Q#Q
zF&Pw*_kuWL`~>X?EsAL<G)7&*v`jgqYeHvk*q}mffy{7YP$42m!#eB4To^z^gbHKH
zP3Y{j$S=)K4_TTYd0;`PR4C<y6}OjKUfqEM2{lL>!hjtcylLk^Ai1^yM6~1!mC;0C
z?_0zk2QU7rP90r<-y{t=Wij&-I=M#cO_xu`ZYKclWZX`gQ^(p~)Lw8q<+vkuvBY&+
zQP^;Xj#{u$QUpNyLyCnp{0QEQ*^}^Im(06E0pc*sL`o>KF+p%mF;O;<trC@Juxdny
zBpSkabLK7A3+vKG4!O#iT`g%(aEcrRR|Gk*1E4}wK$ReQ3FhswN~HpMs~kH}ovGCh
zywaU)avmp#rl#CRBd){Y%FFUhlBh?4<ThuH!(AV+yH%+U+G}*F?0cQI8?Ml#3CS90
z$6jq}7@#?~)jHzVS4x^NgL*UMPMwHi0%8B>O>MK5u)>IY%N+;kk|MN(wwBp5aFQ$!
z19$>nh3Pn6=yAu{18<25fUuE0-LXMb%6B#D@*>G0wPXUa@LU2SMLvXRMPY{|#j&sS
zkgv)bfsjGCd`(Un^i(A}F)mx{8p*BeVGa2D|JazBP5yELY^-%1YPgVUJq074la&kA
zZSZ`mrv@qZ)b*U?l94p$L7hT!M(4#n$=N?U-8CjoP6QLAt526J<w|=DPSF4UtJ|_x
z&-Kq-x%1-<Tb-LfS+dyEAQD!@2xX3JO~M?|9ufHg<px}g#cqQ-{{~!)EkTBMGSpL)
z39AuBBymDFprSaS3FWTW66P|c4)4UYJ4zbPu!hPp4cd8dVC$1x{j;aHKR#b7WDX7T
zH~|v2SHcSt_DLv7cu~Sj5?+=t3D7O<+;bK<uRU<|KRtivr=PbjT-*HR^9Ly~9ZW?o
zph*HJhWKPRN>++c!)Q&I31`c)eY0nQH;A4NWgc>&`AHNCowS2E$%?gPvgbg_9!4~b
zgw7-GwnTx@q|UsUd(t3wnH$)<hW<k%sJl|Y%F=fCuq9C941K!)dXKb2Z`lKRmaTCx
zN)7@bY$+NpVg()z9=R&mR18hN{g<yP7POio?mj%MiF>x4FX^(5WMUmhSdJ4!q}`Hq
z(Q#JWZfhW6&%=k=0SU4h?f_Yd>?wf9U?#H6Ol;;dP6=m0hgjF7QWk5I(bYChcp`Sq
z$<`f}7qWf~jX(P%V7oz8j0|OSUfiTC`xnRppKZJ2<C!mmUhwL`@z>?wOEQ|dQB+Jg
JH%!$U{TmQgJ6-?)

literal 0
HcmV?d00001

diff --git a/__pycache__/FuiouPay.cpython-37.pyc b/__pycache__/FuiouPay.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..af53a57f3383ea6cb2841a1ce63c1eaf3342bc04
GIT binary patch
literal 2194
zcmah~-H#MS5bvI^ot@qLfEW#miW-nrZ`nPL&!_<o!H8anm>4E!CUe_;dvmw*LC-9>
zo4G`CfRR9y1QMf|>={K(3`BzwkjNk5TfchC9Zx<O->sTm6p+N8bWP2#s=B+Xx@z_e
z3|IsPU$b`Rw*n!*<Hy~h0<#NdJPU*oMjOP&x6+_KwJGgkimd>qHdJ4;wLYfXI$&DE
z@N;&qkD0c~%}$<Mi_|VKiy16;g4)IXgqbXVg0TF8Vh=ESh?EL<U_UZZqS9n;!V}Nu
zz^iW`+6^!3;DPZ&Rp)5c*>Z=0S`AN$BL_1Na~x(YfFz_t6D1`Jw4*MPMLMr0T1QV+
z;IulK*Wcfn7>p*llrGRzSy1<q_cqKMsopVDt&>k_YQUpBMoubgNXKHzBE^T2Bctz<
zq|hlcwKI_Fh;;^03Mbc^M_^-X9gObT3%9>t?4Is)ubf)C_T%zrC+=Lh)xB})_Qemn
zUwyN5?Z&!|bG+rmUYl>)UK*)ZGplN4bZp8?KzrrN@ulmRmd}4%tyKQFd1l>cWo-Kc
z62K~%m7uVzRQK;W@Fy^&G$b%6GVl3OD3SxbCABc(fz$+dnb0!jfFF~(aDzIRY6E13
z8-WUwIUdwRD@vpROvt!2rrels9h3Q~tz&&in+-j%U>p@nIcY`BsfJf`z#*ynaa|g)
zVm+C$b09#}Hh>AIW~C~4EUEV$5s$+u{(1+<Yda?od%+u?8%*xry?g2A@$RpeZ=b)i
z^vkD{D_6hlo?cwOytw?ysmZ+uM|hBM5eYBmBhyVUY>q^3%Li~IYQ{5@`w%+lw#rdU
z4vW}z8evd(`tA(CPH_<k(N`-L)##&i0~KrGyN2N1p#ZZBW{eU}Y|02+Z_1Pt#8#Qg
zG<a)Fhg2KVczw%Tt{2qM1_!=zW)~3c8BK{p;35$RRsgCn6{yMxUX=-Zs8Xpwb}Rd~
zRkw_eZrjlwnMsl;-nnU$TdzkoaIT!WiA*i@5uMqxA1a~;x2vcQ+Q;}*dDd$+-C&N#
zGmz4rcI1t2>IZ1tZ8Y|{wYiceO}{o1Bu<UVVhqXo=SyvhhO~k(@upi2@FhiRF>g$Z
zr@@mfTRrjwd`i=CyueEw2i=TKAcPv((;n(YrF>VThSv=TYGDGh@N|Gl$t;9uP7yni
zOK3+~Bpnqi2|@<pn$>V(&{LJ^%(!UHYb-af2cv-N|6^ljHu;MMu(9U##OUN$A=N%7
zU%>j5B+!Xc4LX65SgD>Gthk`g=MZHBY0iV1h7=7>$oo>XdFxo)SbuoEzn-=Av2vwc
zX%2xO-5<VQ#=1TWcXj3Jbz2>uI9#&CQy`L7C>R$GwlQh;c#p|^k8}M*4n=OAJO74V
z4oyLx?giANTu7@PhAegh*XOd>;~7s}uOZE8&Yh$c@%A9AJN<eqN8E2>GraxLt?rqV
zcRoB<Dr5)hWph19#0DhKBiV?ggyaPzFCuvf$q0~k;odd30`kg3NB84%D?k0*E8K@E
z2pvpi&gXFq9>a06dxiBP)gU}3%{UR$*y_bIfc2thG{Slvyw|*7I+WUM90pQnO+SjW
z$}O4VS<tonfek{bCt>0?WP$OxCcG%|&>(V!>)XS9H=rxjToi~h+OF#N2hN=S(H^|(
z1I@sj_CTH`?Kv=tw*w*6QZ!nm3OpJ-_*ST?7#e>47uS?w=sQK)exzR@_boe7(y^#8
zzm6j<$MHkfY#?8BoFh%Q(US<=Uf}lkoDw^!z_Jui0zoFmnlq`H%a9VyVqY2*n^7qX
zxheROCXbU?4v%BE56cI$77qW4?B5|)fvOzn%f`KEhKt^hBZoQhg1XGtdGcnKAF%`1
jts=pGkZt;~^GWmNo?EZt|0-S$#H2+9Ce5Z|sn+1%42Wov

literal 0
HcmV?d00001

diff --git a/__pycache__/app.cpython-37.pyc b/__pycache__/app.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fd68221e8b5a3d97ec88ff6ff7fd3031a127fab4
GIT binary patch
literal 5883
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

literal 0
HcmV?d00001

diff --git a/__pycache__/config.cpython-36.pyc b/__pycache__/config.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cabcab6263692fb797d77d3ad438d7139482b07c
GIT binary patch
literal 1343
zcmZ8h&2Jk;6n7kd#7>hoNk7s;A=jv~Jv+Ozvl}6l5G+WfI9AgSWiHn2yjk0c?Op73
zT>A<ULP8)U6bT6~91z?%pi0m~{|{ej+U8$C9C(|g4ejjC?|uB<d-L|KcFmcY{0~Rt
z`oHN!;_t-&RtEJ|+`UH#kPr!&5EGCTNthIqkP<0Ki!@|J2C^axQ(_8oA_sYqhiNel
zm&7HQ5i>9=X5q593|GVzm=kj_FXl030T#qnxGJu}HE|uTiyLr5EW#q(gj?_qybHH~
zOpBZF-cDlq{SnQp0GgfpN<Z=oPJZ=Xv#nPsp=QY}QD=#*5V};|%CD~VqejqOf#GNQ
z(d|YQg}s$hX)qWR_nO1L?Ck4aLw4##6|}|tV4yw6a~O3j+cYgj{n)1{w|y>&X>ny5
z#1nV6s*+VI`)nsHGh_W>ceC8J*Z21xZjV%W|Iu14*w|XPxYyoeYIG+UZF=Pg)k5^?
zXnS*5+3@vRrF9^9Yh&B3_Q@xky9Y)%y5HXGl||MdxLkU!5GIx!&TL0hMz~a-YY}E^
zj$J5MQR%tBMzaPnik4ZV#3>pU6N|QGaz&}Bwc|3tdX7P*$pIPW7|b^e4%%`lvpqxG
zT=O`GxzeZLaBgUq8;UumO{rAK*u-=U?kLbcPy$$8YOc<5Y+Kp%B8U1W81XrngEMn9
z@flIRVJo0mRh}{gh_){n&vy(jW|-?soH-B^+jLyTIV03|U*~ui9Z+ugZrmG_hKKK*
zG0Sy*P7JNN*4m62oSA8A?)WxH4M0FLOW8P2>a~nkqgUS>HNcgPk9H5_R^`E3NA2$3
z-S^6vOC7DHRGRzLQStm-X%iKnXW0$|#<WeCA(7D_ftln4KZV4}L=4FoCSyn;ET{YP
zD4u`+_~hp=5TAeb^!V$;lP|yP=VJF8*2~{NKmO~Nmw)_u$~}Af)A8Yx*jm6ylrMh$
z1`8a2dsH|+eEjUmQDynoI9sbhplY>o&XYY|3uV+8XH?J)n=sCehP87wvr}HbTfR5W
ziQU?{nnzaFbtl5e>?<XAV7}s$&2XFzB?g7zINusz?K6G4tCemZXsBW4ED~?n{f-J+
zEv=$6eh&G!T(fZ@(2;DmdU1(3<SkcDDi!pjn9VdsryZnGqM2@-d1ct#*TZqf@1L<K
zk<E4cEnVvc-RQSOcL}F<3jdT!A6M}%;KS-}*lqT7VW3q*Mg=^#jow1o?=?y)==jZg
qF&vJkK4=Gkr9Q-8U!q45Qj@7<YU1^kLMw$<?7P@W)Z@6*$o~L+pPDKF

literal 0
HcmV?d00001

diff --git a/__pycache__/config.cpython-37.pyc b/__pycache__/config.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3411422956fc8c4754c51fc1be8b0eb6724987f3
GIT binary patch
literal 1492
zcmZ8gOK;mo5SDF8j+EF*ocFWtF$iRnOD=b56h#zQXk);Rkte)0AS`#57HwH%MbfHu
zE1I-uQS<=>K@aUAITURVNe@AQHbn#U*1w=@Ehqi~y?1E4&0~rEc4oer;kN_w;>buj
zhwIOu-*5a?%;o;hoc|X3xeK`CTL_R7IT#QFFenCLNDM(<<e?x6P!vTN7Q?Vd?17Rf
zL0Obxuh<Lw#6B1iBQPpPVZYc92gCt5C=SAy7{i=Ha7Y}6!{P`W5l7*uI0nbWaX2nc
zAa@c@h*NM9PQht7183ol?+W5Hj9<;2d$UW*Dukf5G?gZPg_kc}3s&_MF^Dy3O%gs%
zrwlSaKU=;~O_N60o`Urc%H1=KB#Gjw$;nQqGqD`3r?R!8<A!W4O{j2HjCDHN;~uAk
z+m2<~iuhSf5$5<z8kWtJWg4D1KRYk!+}sMi8r7&deX~7NYdg~`%Qr7~RdoHsYCXI(
zJ8d&>b(yN}`LH|V)o#pJlJ~loXV&K~`MNsSTobH$>9RYY8t=|5teH{w`s#9A6T_x~
z%O$&pLB%*{)Zv;?gGuGNwm}`uP=#_8k)8{*J8Bx{gl$a_gHM<?6~`S$Jr1TMHaMoI
zB=dYzdA34^a+CU|$w1pKp^j&2hiSH5<6DeT7c}=g?P?9o^q6a5jbm8cWL$yvff(S}
zmefpb*Jxq_(VkQaC|8c-OQsmxsll0XZTQqszUe3+E;D7OO>4`SglNlkJ%{_+=fEvD
z)8_gTXAXviGP#S5s6m{J!5SN*FV|=sQ^xof_igz?fd`D(PSy=)W?7nX-vOxs43N}T
z8N&_KZ@^18^(FTWoHX&8X0s75Eq5E>%ErZoH90$XquNpn3s+XW8rIqtQ-oMrbC&{2
z;3kn4gN$)F1xmGJP*WnKK?1chjgI8h0L!x!Hw@+Y)HXd${4M;Ia$5r#3}!HtK_1~;
zAsxeG^UmX~`?nA`KYQB$;`Y|3-=w81{EGMdmyi3u{qX$JuiM<l)9?GYpJd)4%*6BA
zk6&Vg{#SP^{o9W>p4^=~ccwR7uS2Nn^<K%7v93olY4nOJY)1j~O5OGPu35ZVo4!)J
z)+>pH`i?2e$jT+%N&*nWyGF0HX6^F5!651lM-r2ws8?=wu=kF=x2=^9)-=@d9ivFR
z;-@VYHk(={JN!Z9Uki<9jX)<dXvSHKEakOO3BSQGO)|FF=x!@0;E8Ubkwrzhtz{gx
zw(E;B3Rd)bujr>cnRsGKQFSs`>`&UV6-$)_yZNPd+SK(pY$reE+GlaJ+wjj7v}#j}
z3qflpkgdgPwYu^9NBut@Y~Fde@#NdZ=a269Kfm|v!M$f+f3o<_d<6%m+fh4+b;VDE
zFs<MfRxwzK(zvmx!j>N_O+@RxJ#VdsfG>Qzfc;~RkRQqq<_G?N^62H!%VIC~Alg}8
J_GEFye*ub*(0>2`

literal 0
HcmV?d00001

diff --git a/__pycache__/dpapp.cpython-37.pyc b/__pycache__/dpapp.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..825b2fb1e1d3632e916c3696f1cc056c4606e4e1
GIT binary patch
literal 8828
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
E50ZGPH2?qr

literal 0
HcmV?d00001

diff --git a/__pycache__/utils.cpython-36.pyc b/__pycache__/utils.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0d858ebc0dc50d4cb2ff1719bd166f0d6675b824
GIT binary patch
literal 24468
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

literal 0
HcmV?d00001

diff --git a/__pycache__/utils.cpython-37.pyc b/__pycache__/utils.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d3635a32604962056a1fe948990111cc7cf7e172
GIT binary patch
literal 25338
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

literal 0
HcmV?d00001

diff --git a/config.py b/config.py
new file mode 100644
index 0000000..217fee3
--- /dev/null
+++ b/config.py
@@ -0,0 +1,56 @@
+'''
+coding:utf-8
+@Time:2023/3/28 5:02 PM
+@Author:dyq
+'''
+
+# 调用域名
+base_path = 'https://www.jiyuankeshang.com'
+# 企微应用id 应用ID
+corpid = 'wweb8b852846334c2f'
+zy_corpid = 'wwc276f7a0347c310b'
+SECRET = 'MPa5NNk5SpE51CWrJEr6CkjWOzcpUxA_oIMC47bmj5c'
+ZY_SECRET = 'ozJbEVP-tHzOJyNIfeANlvZ7lIO9Pu0GJYv1pzUmjsE'
+zy_agentid = '1000092'
+agentid = '1000005'
+# 商户号
+#mchid = '1640957093'
+# APIv3密钥
+v3_SECRET = '87568e2507acb94056e7310c9c2ab9d5'
+# 服务器IP
+ip = '101.43.208.145'
+# 商户号证书序列号
+#serial_no = '22E0F3EA849ABD1E687C82D43D26190C46DA5834'
+# 未收付应用id
+pay_app = '675b8d1a24d61bca7bf1cb4c'
+lw_pay_app = '65815f117de49256b1e67e75'
+# # 已收表单Id
+received_id = '67f37759de8bbe9eed71b793'
+lw_received_id = '66038178cdefd20d643ae7c5'
+# # 未收表单Id
+uncollected_id = '67e21d2ebaccd58c66fa7c77'
+lw_uncollected_id = '660376f8e0f50cf16cd2971a'
+# # 充值明细
+pay_details_id = '67ee3fa22e399b68fef8d839'
+lw_pay_details_id = '659fa34cd0365889c7750269'
+# # 个人账户
+accout_id = '67ee40362e399b68fef8e000'
+# 增减项app
+hz_app = '675b8d1a24d61bca7bf1cb4c'
+# 增减项表单
+hz_id = '67f38f4abaccd58c66bd7246'
+# 驾驶员信息表单
+# ht_id = '658e440978f6daedd0db50c3'
+ht_id = '658e233e78f6daedd0da54c6'
+# 收付款事由基础设置表单
+reasons_id = '680ae70dde8bbe9eed7fa8f0'
+# apikey
+apikey = '82bl1lhsgjzhd9ahBYvaMNVAncYYRkbE'
+# 辅助表单（查询驾驶员身份证号）
+fu_app = '6437c223ee895d000812a37d'
+fu_id = '64685d55e6051a000edad530'
+# 财务管理应用ID
+cw_app = '675b8d1a24d61bca7bf1cb4c'
+#驾驶员支付信息
+transactions_id = '66a850d3b3c800c6f541be2f'
+rule_sort = {"收预收承包金": 0, "承包金": 1, "调度费": 2, "保养费": 3, "费税收取-其他": 4}
\ No newline at end of file
diff --git a/dg_priv_key.pem b/dg_priv_key.pem
new file mode 100644
index 0000000..f3972c0
--- /dev/null
+++ b/dg_priv_key.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC822wv9HcW+qqn8l8ne5ICkUh1rFGGrBuGvrmO0ULemFsGpp3g+opW8u2dKJxy+ezqywe+2IU6vuGqIp32FW4EjjeuTKq1UcD7mAiPc0jmp60DD5Jy1ILBBiwEX1WY4GLVHn5kzG4E5XX9fxAg69zBpxDaI//cUljdBUGY/ZL79qAo22Oq1f2va+wEA+uJA0qir0/BO1tMxraa6PmFRniOAIof+49nIaKS+QKV01P9qcllZ61woI6QzWtDuuTIXllxOM9tFh0SPePHTnuXJrA6/bsqkbYOUGC7b6DA22KQVF51fWFD5bNbWuCYUYi6Sj9ErU1KUmrHs24D2Hd+ON+jAgMBAAECggEBAIUpqlT96OK5CI+3JETwqnlI+3CNekadICOYY7pB7waJItXDsdqqjdTVIZoIwpeHhffgBKwae4Z6hR+znPGhFpv7s2MhB9Ulug8smgyb2zFX1XQtDLQPB8sWkP7cQbyzqrxe7fwg8QpeyR1e9H5iEJwzMny9mXE+Vw4w4JoBYhxqBzZgVn1rn5w4pt+UonFo5peZSoDDYSm37ReJ9Ay6/XzS3SEGOA1cKxYfpltZ7MBTmspAxBSgDlrmW+wjnN6qZuDOQkq9YodmaZUqcv4j+JupGbPPKxbhAOOxvnLTB2QQpWqKBZ4iwlpjb921498zxIZJ1JdTqJ4e2MCM60+/QaECgYEA91DVOv4QZrxN8f1YAWqfdDrE9UZP/9DC06BKOEGv6g8ez/QffKrI7RQDaeE3b6vorbWQuHSfV+3UNCDS/RGN8VNuTpHLMnfV7HS4PtkMSEZeH0dNVIaWtzWFUrnniN+HWwFxJQ/jncBlIannMEWfemmCM0GeumO7TVgZfcrza0kCgYEAw30YHVHC5DuFwW3LYZTZLFPRNnK7ZKFb/TgTBKMGMi3ogiQhKUNuTRa/z+7aq3TGmPqIC157Ua1fnzTm8llnZPaHYCHcrQoE83rwg9mNvkIx9IWEAfGrl5HjmcbnHlAsWPBbFBqzHZZoRAnOYHMHfJfP3YU/yHIy4RZCKV+Jp4sCgYA+WzcoJJ7mCFxuwz3JPaTunVLDtPK+wVgeG7Aa9xTvothV/mth932pqP4jWBGuKl4ETl8q4ty6QtDaQ9xuylpLmomZbdEZ7HUXpWY/EmKyZmuc31F0GmstzmTLMuxZ6mIqY/avLY5qW/QjxL7xwNww9SFK4ySuQi8blTb4LI+rYQKBgEYBTRpqxh0PR7XeCKAYOrFKDrit23eM5TFH3F+jtbtQf1vjblCliiFnDSd8RKhzuA7eYMuZeRXlvUF5I18ULxeTxSTi23DIDr/Wfbzpsn24nMUQ7xX3Iliz8MqH1Qog8dCjuin36b6ltw7uaA5YAw1WHCUa651vb9L1Mpo4UUZDAoGBAKFC4B+n016uGniY8qCDsQtSSz3HfuH4X2zq5KXkeETBkWYD3UK6Z7cluOJSh2qFf9NHvuZEMJCw6pI545zVPrwBoBRwDVxGcSNcUQvCs+G7XWsv5MsZ29h+AnthVB047dFJUrj4t6fzDlOTyJWS1w63FT29CQquRJ4Lp40cinmv
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/dg_pub_key.pem b/dg_pub_key.pem
new file mode 100644
index 0000000..e554c48
--- /dev/null
+++ b/dg_pub_key.pem
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKH7pCZGo8n1Lk1F5I034gR6mAMfyIZSvLe2sZdh8QQ+qw+dBNvZZej/c8wwBmKH889zF5f1UEtrywN0e8iEOjkyGAeo55qLcy5ZNyC6/ox1JTyW4kqJRGJZ2tk9rZt/UBkSO3sOK8XPIR47m3qNhioZuuFIIUS03PgRXByHXozwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/dpapp.py b/dpapp.py
new file mode 100644
index 0000000..14049f8
--- /dev/null
+++ b/dpapp.py
@@ -0,0 +1,333 @@
+from flask import Flask, request, redirect, abort, session, jsonify
+from utils import *
+from FuiouPay import H5Main
+# from WXPay import WXPay
+import os, _thread, urllib
+import logging
+from logging.handlers import TimedRotatingFileHandler
+from flask_cors import CORS
+
+
+
+app = Flask(__name__)
+app.config['SECRET_KEY'] = os.urandom(24)
+CORS(app, supports_credentials=True)
+
+def setup_logging():
+    """配置日志系统，按天分割日志文件"""
+    # 创建日志目录
+    log_dir = "logs"
+    os.makedirs(log_dir, exist_ok=True)
+
+    # 设置日志格式
+    log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    formatter = logging.Formatter(log_format)
+
+    # 创建按天轮转的文件处理器
+    file_handler = TimedRotatingFileHandler(
+        filename=os.path.join(log_dir, 'dpapp.log'),
+        when='midnight',  # 每天午夜轮转
+        interval=1,  # 每天一个文件
+        backupCount=30,  # 保留30天的日志
+        encoding='utf-8'
+    )
+    file_handler.setFormatter(formatter)
+    file_handler.setLevel(logging.INFO)
+
+    # 创建控制台处理器
+    console_handler = logging.StreamHandler()
+    console_handler.setFormatter(formatter)
+    console_handler.setLevel(logging.DEBUG)
+
+    # 获取根logger并配置
+    logger = logging.getLogger()
+    logger.setLevel(logging.DEBUG)
+    logger.addHandler(file_handler)
+    logger.addHandler(console_handler)
+
+
+# 初始化日志配置
+setup_logging()
+
+# 获取当前模块的 logger
+logger = logging.getLogger(__name__)
+logger.info(f"DPPayApp started")  # 会输出到文件和控制台
+
+@app.route('/queryUserId', methods=['GET'])
+def queryUserId():
+    # 获取支付明细
+    try:
+        code = request.args.get('code')
+        data = query_wx_userid(code)
+        if len(data) <= 11:
+            res = query_wx_fj_info(data)
+            data = res
+        return  redirect(f'http://web.jiyuankeshang.com/#/DPpay?user={data}&appid={corpid}&agentid={agentid}')
+    except Exception as e:
+        return {}
+
+@app.route('/queryUserIdZY', methods=['GET'])
+def queryUserIdZY():
+    # 获取支付明细
+    try:
+        code = request.args.get('code')
+        data = query_zy_wx_userid(code)
+        if len(data) <= 11:
+            res = query_zy_wx_fj_info(data)
+            data = res
+        return  redirect(f'http://web.jiyuankeshang.com/#/DPpay?user={data}&appid={zy_corpid}&agentid={zy_agentid}')
+    except Exception as e:
+        return {}
+
+
+@app.route('/queryUser', methods=['GET'])
+def queryUserApi():
+    # 获取支付明细
+    try:
+        id = request.args.get('user')
+        data = queryUser(id)
+        for item in data['pay_detail']:
+            if 'charge_amount' in item:
+                item['price'] = item.pop('charge_amount')
+            if 'charge_time' in item:
+                item['time'] = item.pop('charge_time')
+        logger.info(f"===================queryUserdata{data}")
+        return data
+    except Exception as e:
+        return {}
+
+
+@app.route('/getPaymentDetails', methods=['GET'])
+def getPaymentDetails():
+    try:
+        id = request.args.get('user', '')
+        
+        id = id.replace(" ", "")
+        
+        if not id:
+           logger.info(f"no id")
+           return {}
+        data = query_pay_details(id)
+        for item in data:
+            if item == "amount":
+                continue
+            for detail in data[item]['data']:
+                if 'fukuanshiyou' in detail:
+                    detail['name'] = detail.pop('fukuanshiyou')
+        return data
+    except Exception as e:
+        logger.info(f"error{e}")
+        return {}
+
+
+@app.route('/paymentCallBack', methods=['POST'])
+def paymentCallBack():
+    # 充值成功后回调  {"pay_amount": 20000, "id": "18515367096"}
+    try:
+        logger.info(f"====================================paymentCallBack=========================================")
+        msg = request.data.decode('UTF-8')
+        logger.info(f"回调参数为===={msg}")
+        msg = eval(msg)
+        logger.info(f"eval参数为===={msg}")
+        if msg['resp_desc'] == '成功':
+            logger.info(f"=================================充值回调SUCCESS==========================================")
+            if msg['mchnt_cd'] == '0001000F7152364':
+                rsa_key = RSA.importKey(open('dg_priv_key.pem').read())
+                # rsa_key = RSA.importKey(open('E:\YinJian\银建支付对接维护说明\DP\DP-enterprise-wechat-payment-push\dg_priv_key.pem').read())
+            else:
+                rsa_key = RSA.importKey(open('priv_key.pem').read())
+                # rsa_key = RSA.importKey(open('E:\YinJian\银建支付对接维护说明\DP\DP-enterprise-wechat-payment-push\priv_key.pem').read())
+            logger.info(f"msg==={msg['message']}")
+            logger.info(f"rsa_key{rsa_key}")
+            whp = rsa_long_decrypt(rsa_key, msg['message'])
+            logger.info(f"报文已解密{whp}")
+            whp_dict = json.loads(whp)
+            # 打印字典中的所有键
+            logger.info(f"1111111{whp_dict.keys()}")
+            # 获取'order_id'键的值并取前18个字符
+            id = whp_dict['order_id'][:18]
+            # 查询机构、分司
+            res = filter_jdy_ht(id)
+            transaction_id = whp_dict['pay_ssn']
+            amount = float(whp_dict['order_amt'])
+            order_pay_type = whp_dict['order_pay_type']
+            # 判断支付类型
+            if order_pay_type[:2] == "We":
+                pay_type = "微信支付"
+            elif order_pay_type[:3] == "Ali":
+                pay_type = "支付宝支付"
+            elif order_pay_type == "0000000000":
+                pay_type = "云闪付支付"
+            amount = amount / 100
+            if whp_dict['mchnt_cd'] == '0001000F7152364':
+                payment_items = "驾驶员履约服务费"
+                info1 = {"pay_amount": amount, "id": id,
+                         "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+                         "fsfz": res[6],
+                         "hphm": res[5], "transaction_id": transaction_id, "payment_items": payment_items,
+                         "pay_type": pay_type}
+                logger.info(f"充值回调处理{info1}")
+                _thread.start_new_thread(add_payment_lw, ({"pay_amount": amount, "id": id,
+                                                        "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+                                                        "fsfz": res[6],
+                                                        "hphm": res[5], "transaction_id": transaction_id, "payment_items": payment_items, "pay_type": pay_type},))
+            else:
+                payment_items = "承包金"
+                info1 = {"pay_amount": amount, "id": id,
+                                                        "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+                                                        "fsfz": res[6],
+                                                        "hphm": res[5], "transaction_id": transaction_id, "payment_items": payment_items, "pay_type": pay_type}
+                logger.info(f"充值回调处理{info1}")
+                _thread.start_new_thread(add_payment, ({"pay_amount": amount, "id": id,
+                                                        "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+                                                        "fsfz": res[6],
+                                                        "hphm": res[5], "transaction_id": transaction_id, "payment_items": payment_items, "pay_type": pay_type},))
+        return {"code": 200}
+    except Exception as e:
+        return jsonify(error=str(e)), 500
+
+
+@app.route('/test', methods=['POST'])
+def test():
+    # 新增未收付明细 {"pay_amount": 20000, "id": "18515367096"}
+    try:
+        data = request.data.decode("utf-8")
+        logger.info(f"data{data}")
+        return {}
+    except Exception as e:
+        logger.error(f"error{e}")
+        return {}
+
+
+
+
+@app.route('/addUnPayment', methods=['POST'])
+def addno_moneyment():
+    # 新增未收付明细 {"pay_amount": 20000, "id": "18515367096"}
+    try:
+        data = request.data.decode("utf-8")
+        data = data.replace("null", "None")
+        data = eval(data)
+        data = data['data']
+        if data['mode_type'] == "DP":
+            res = filter_jdy_ht(data['id_card'])
+
+            _thread.start_new_thread(add_payment, ({"pay_amount": 0, "id": data['id_card'],
+             "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+             "fsfz": res[6],
+             "hphm": res[5]}, 1))
+            return {}
+        else:
+            return {}
+    except Exception as e:
+        logger.error(f"addUnPayment,e{e},res{res}")
+        return {}
+
+
+@app.route('/addPayment', methods=['POST'])
+def addPayment():
+    # 新增充值明细 {"pay_amount": 20000, "id": "18515367096"}
+    try:
+        data = request.data.decode("utf-8")
+        logger.info(f"新增充值明细,data{data}")
+        data = data.replace("null", "None")
+        data = eval(data)
+        data = data['data']
+        if data['mode_type'] == "DP":
+            res = filter_jdy_ht(data['id_card'])
+            if not data['charge_amount']:
+                data['charge_amount'] = 0
+            if not res:
+                # 合同表单未有数据
+                logger.info(f"合同表单未有数据,data{data}")
+                fsfz = data['fsfz']['dept_no'] if data['fsfz'] else ""
+                _thread.start_new_thread(add_payment, ({"pay_amount": data['charge_amount'], "id": data['id_card'],
+                                                        "fs": data['fs'], "jg": data['jg'], "name": data['name'],
+                                                        "fsfz": fsfz, "hphm": data['hphm']}, 1))
+            else:
+                logger.info(f"新增充值明细111,pay_amount: {data['charge_amount']}, id: {data['id_card']},fs: {res[1]}, jg: {res[0]}, name: {res[4]}, shfid: {res[7]},fsfz: {res[6]},hphm: {res[5]}")
+                _thread.start_new_thread(add_payment, ({"pay_amount": data['charge_amount'], "id": data['id_card'],
+                 "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+                 "fsfz": res[6],
+                 "hphm": res[5]}, 1))
+            return {"code": 200}
+        else:
+            return {"code": 200}
+    except Exception as e:
+        logger.info(f"addPayment,e{e},data{data}")
+        return {}
+
+@app.route('/addlwPayment', methods=['POST'])
+def addlwPayment():
+    # 新增充值明细 {"pay_amount": 20000, "id": "18515367096"}
+    try:
+        data = request.data.decode("utf-8")
+        logger.info(f"新增充值明细{data}")
+        data = data.replace("null", "None")
+        data = eval(data)
+        data = data['data']
+        res = filter_jdy_ht(data['id_card'])
+        if not data['price']:
+            data['price'] = 0
+        if not res:
+            # 合同表单未有数据
+            fsfz = data['fsfz']['dept_no'] if data['fsfz'] else ""
+            _thread.start_new_thread(add_payment_lw, ({"pay_amount": data['price'], "id": data['id_card'],
+                                                    "fs": data['fs'], "jg": data['jg'], "name": data['name'],
+                                                    "fsfz": fsfz, "hphm": data['hphm']}, 1))
+        else:
+            _thread.start_new_thread(add_payment_lw, ({"pay_amount": data['price'], "id": data['id_card'],
+             "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+             "fsfz": res[6],
+             "hphm": res[5]}, 1))
+        return {}
+    except Exception as e:
+        logger.info(f"addlwPayment,e{e},data{data}")
+        return {}
+
+
+@app.route('/transactions', methods=['GET'])
+def transactions():
+    # 调起h5支付
+    try:
+        logger.info(f"开始支付")
+        id = request.args.get('user')
+        price = request.args.get('price')
+        shh = request.args.get('option')
+        logger.info(f"===============费用缴纳类型为{shh}===============")
+        logger.info(f"金额,{price}")
+
+        if not float(price):
+            res = filter_jdy_ht(id)
+            _thread.start_new_thread(add_payment, ({"pay_amount": 0, "id": id,
+             "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+             "fsfz": res[6],
+             "hphm": res[5]}, 1))
+            return {}
+        else:
+            # 查询商户号、商户号证书
+            res = filter_jdy_ht(id)
+            logger.info(f"res,{res}")
+            if not res:
+                return "error"
+            logger.info(f"金额,{price}")
+            price = float(price) * 100
+            if shh == '1':
+                if not res[2] or not res[0]:
+                    return "error"
+                fy = H5Main(res[2])
+                logger.info(f"发起缴纳承包金,{id}{int(time.time())}{int(price)}")
+                message = fy.unified_order(f"{id}{int(time.time())}", int(price), "订单支付")
+                return message
+            else:
+                fy = H5Main('0001000F7152364')
+                logger.info(f"发起缴纳履约服务费{id}{int(time.time())}, {int(price)}")
+                message = fy.unified_order(f"{id}{int(time.time())}", int(price), "订单支付")
+                return message
+    except Exception as e:
+        logger.error(f"error{e}")
+        return jsonify(error=str(e)), 500
+
+
+if __name__ == '__main__':
+    app.run(host="0.0.0.0", port=3005, processes=True)
diff --git a/logs/dpapp.log b/logs/dpapp.log
new file mode 100644
index 0000000..69e97e2
--- /dev/null
+++ b/logs/dpapp.log
@@ -0,0 +1,46 @@
+2025-05-08 11:41:19,952 - dpapp - INFO - DPPayApp started
+2025-05-08 11:41:19,960 - werkzeug - INFO -  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+2025-05-08 11:41:40,299 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c22c147f52adcb2aeed04","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000001","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":1,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:19:29.185Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282942276472","type":"转入","updateTime":"2025-05-08T03:19:29.185Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746674369185}

+
+2025-05-08 11:41:40,430 - dpapp - INFO - 新增充值明细111,pay_amount: 1, id: 450481198712202058,fs: J315车队, jg: 康建利福汽车服务, name: 曾辉, shfid: J488912202058,fsfz: 1776480,hphm: 京BDB5375
+2025-05-08 11:41:40,430 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 11:41:40] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 11:41:40,431 - utils - INFO - 开始========data{'pay_amount': 1, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}, type1
+2025-05-08 11:41:40,431 - utils - INFO - 开始查询未收付明细, id_card: 450481198712202058,filter_data: {'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67e21d2ebaccd58c66fa7c77', 'limit': 100, 'filter': {'rel': 'and', 'cond': [{'field': 'id_card', 'method': 'eq', 'value': ['450481198712202058']}, {'field': 'no_money', 'method': 'eq', 'value': ['450481198712202058']}]}} 
+2025-05-08 11:41:43,134 - utils - INFO - 执行承包金add_payment{'pay_amount': 1, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}
+2025-05-08 11:41:43,134 - utils - INFO - 更新未收付{'2025-03': {'data': [{'creator': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'updater': {'name': '赵学敏', 'username': '#admin', 'status': 1, 'type': 0}, 'deleter': None, 'createTime': '2025-05-08T02:09:51.328Z', 'updateTime': '2025-05-08T03:39:51.546Z', 'deleteTime': None, 'code': 'YZWL25050800001', '_widget_1745810482694': 'WSF25031800330', 'type': '收款', 'fukuanshiyou': '交通违法扣款', 'month1': '2025-03', 'month': '2025-02-28T16:00:00.000Z', 'yewubiaodanmingcheng': '替换车辆归还', 'yewubiaodanbianma': 'CLGH-p20250318005', 'sijixingming': '曾辉', 'id_card': '450481198712202058', 'shfid': 'J488912202058', 'company_jc': '', 'xd': '', 'sijisuozaigongsi': '康建利福汽车服务', 'fs': 'J315车队', 'license_plate': '京BD02424', 'fs_p': {'name': 'J315车队', 'dept_no': 1776480, 'type': 0, 'parent_no': 328, 'integrate_id': '1776480', 'status': 1}, 'money': 1200.0, 'pay': 1200.0, 'no_money': 0, 'ys': '2025-03-17T16:00:00.000Z', 'start_time': None, 'end_time': None, 'hz_month': '2025-02-28T16:00:00.000Z', '_widget_1744679600972': '', 'mode_type': 'DP', 'lydunjiao': '月租', 'bill_type': '个人账单', 'contract_num': '', 'car_dept': '金建', 'sy': '', 'shgid': '', '_id': '681c126f2e399b68feb72083', 'appId': '675b8d1a24d61bca7bf1cb4c', 'entryId': '67e21d2ebaccd58c66fa7c77', 'sort': 9999, 'flag': 1, 'flag_m': 1200.0}], '_th_amount': 1200.0, 'hz': []}, 'amount': 1200.0}
+2025-05-08 11:41:43,268 - utils - INFO - 新增已收========={'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67f37759de8bbe9eed71b793', 'is_start_trigger': True, 'is_start_workflow': True, 'data': {'code': {'value': 'YZWL25050800001'}, 'type': {'value': '收款'}, 'fukuanshiyou': {'value': '交通违法扣款'}, 'month': {'value': '2025-02-28T16:00:00.000Z'}, 'month1': {'value': '2025-03'}, 'yewubiaodanmingcheng': {'value': '替换车辆归还'}, 'yewubiaodanbianma': {'value': 'CLGH-p20250318005'}, 'sijixingming': {'value': '曾辉'}, 'shfid': {'value': 'J488912202058'}, 'id_card': {'value': '450481198712202058'}, 'pay_time': {'value': '2025-05-08 03:41:43'}, 'company_jc': {'value': ''}, 'xd': {'value': ''}, 'sijisuozaigongsi': {'value': '康建利福汽车服务'}, 'fs': {'value': 'J315车队'}, 'license_plate': {'value': '京BD02424'}, 'money': {'value': 1200.0}, 'pay': {'value': 1200.0}, 'hz_month': {'value': '2025-02-28T16:00:00.000Z'}, 'fs_p': {'value': 1776480}, 'shgid': {'value': ''}, 'mode_type': {'value': 'DP'}, 'sy': {'value': '个人账户抵扣'}, 'ys': {'value': '2025-03-17T16:00:00.000Z'}, 'lydunjiao': {'value': '月租'}, 'bill_type': {'value': '个人账单'}, 'car_dept': {'value': '金建'}, 'contract_num': {'value': ''}}}
+2025-05-08 11:41:43,387 - utils - INFO - 删除=========1200.0, 1200.0
+2025-05-08 11:41:43,387 - utils - INFO - ===========================未收付已清缴，删除未收付明细===============================
+2025-05-08 11:41:43,480 - utils - INFO - 更新个人账户余额update_info
+2025-05-08 11:41:43,684 - utils - INFO - 结束========
+2025-05-08 11:42:20,031 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c27af29096e59ac582c25","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000003","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:40:31.184Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282942276472","type":"转入","updateTime":"2025-05-08T03:40:31.184Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746675631184}
+2025-05-08 11:42:20,194 - dpapp - INFO - 新增充值明细111,pay_amount: 200, id: 450481198712202058,fs: J315车队, jg: 康建利福汽车服务, name: 曾辉, shfid: J488912202058,fsfz: 1776480,hphm: 京BDB5375
+2025-05-08 11:42:20,195 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 11:42:20] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 11:42:20,197 - utils - INFO - 开始========data{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}, type1
+2025-05-08 11:42:20,197 - utils - INFO - 开始查询未收付明细, id_card: 450481198712202058,filter_data: {'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67e21d2ebaccd58c66fa7c77', 'limit': 100, 'filter': {'rel': 'and', 'cond': [{'field': 'id_card', 'method': 'eq', 'value': ['450481198712202058']}, {'field': 'no_money', 'method': 'eq', 'value': ['450481198712202058']}]}} 
+2025-05-08 11:42:21,119 - utils - INFO - 执行承包金add_payment{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}
+2025-05-08 11:42:21,120 - utils - INFO - 更新未收付{'amount': 0.0}
+2025-05-08 11:42:21,120 - utils - INFO - 更新个人账户余额update_info
+2025-05-08 11:42:21,301 - utils - INFO - 结束========
+2025-05-08 14:57:02,487 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c27af29096e59ac582c25","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000003","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:40:31.184Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282945276472","type":"转入","updateTime":"2025-05-08T03:40:31.184Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746675631184}
+2025-05-08 14:57:02,630 - dpapp - INFO - 新增充值明细111,pay_amount: 200, id: 450481198712202058,fs: J315车队, jg: 康建利福汽车服务, name: 曾辉, shfid: J488912202058,fsfz: 1776480,hphm: 京BDB5375
+2025-05-08 14:57:02,631 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 14:57:02] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 14:57:02,631 - utils - INFO - 开始========data{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}, type1
+2025-05-08 14:57:02,631 - utils - INFO - 开始查询未收付明细, id_card: 450481198712202058,filter_data: {'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67e21d2ebaccd58c66fa7c77', 'limit': 100, 'filter': {'rel': 'and', 'cond': [{'field': 'id_card', 'method': 'eq', 'value': ['450481198712202058']}, {'field': 'no_money', 'method': 'eq', 'value': ['450481198712202058']}]}} 
+2025-05-08 14:57:06,184 - utils - INFO - 执行承包金add_payment{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}
+2025-05-08 14:57:43,322 - dpapp - INFO - DPPayApp started
+2025-05-08 14:57:43,330 - werkzeug - INFO -  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+2025-05-08 14:57:49,295 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c27af29096e59ac582c25","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000003","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:40:31.184Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282945276572","type":"转入","updateTime":"2025-05-08T03:40:31.184Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746675631184}
+2025-05-08 14:57:49,407 - dpapp - INFO - 新增充值明细111,pay_amount: 200, id: 450481198712202058,fs: J315车队, jg: 康建利福汽车服务, name: 曾辉, shfid: J488912202058,fsfz: 1776480,hphm: 京BDB5375
+2025-05-08 14:57:49,407 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 14:57:49] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 14:57:49,408 - utils - INFO - 开始========data{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}, type1
+2025-05-08 14:57:49,408 - utils - INFO - 开始查询未收付明细, id_card: 450481198712202058,filter_data: {'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67e21d2ebaccd58c66fa7c77', 'limit': 100, 'filter': {'rel': 'and', 'cond': [{'field': 'id_card', 'method': 'eq', 'value': ['450481198712202058']}, {'field': 'no_money', 'method': 'eq', 'value': ['450481198712202058']}]}} 
+2025-05-08 14:57:52,944 - utils - INFO - 执行承包金add_payment{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}
+2025-05-08 14:57:52,944 - utils - INFO - 更新未收付{'2025-05': {'data': [{'creator': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'updater': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'deleter': None, 'createTime': '2025-05-08T06:53:55.734Z', 'updateTime': '2025-05-08T06:53:55.734Z', 'deleteTime': None, 'code': 'YZWL25050800005', '_widget_1745810482694': 'WSF25031800330', 'type': '收款', 'fukuanshiyou': '调度费', 'month1': '2025-05', 'month': '2025-04-30T16:00:00.000Z', 'yewubiaodanmingcheng': '承租表单', 'yewubiaodanbianma': 'HT-240800013', 'sijixingming': '曾辉', 'id_card': '450481198712202058', 'shfid': 'J488912202058', 'company_jc': '', 'xd': '', 'sijisuozaigongsi': '康建利福汽车服务', 'fs': 'J315车队', 'license_plate': '京BD02424', 'fs_p': {'name': 'J315车队', 'dept_no': 1776480, 'type': 0, 'parent_no': 328, 'integrate_id': '1776480', 'status': 1}, 'money': 40.0, 'pay': 0.0, 'no_money': 40.0, 'ys': '2025-05-07T16:00:00.000Z', 'start_time': None, 'end_time': None, 'hz_month': '2025-04-30T16:00:00.000Z', '_widget_1744679600972': '', 'mode_type': 'DP', 'lydunjiao': '趸交', 'bill_type': '个人账单', 'contract_num': 'HT-240800013', 'car_dept': '金建', 'sy': '', 'shgid': '', '_id': '681c550329096e59ac5ab3b3', 'appId': '675b8d1a24d61bca7bf1cb4c', 'entryId': '67e21d2ebaccd58c66fa7c77', 'sort': 2, 'flag_m': 0}, {'creator': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'updater': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'deleter': None, 'createTime': '2025-05-08T06:53:39.274Z', 'updateTime': '2025-05-08T06:53:39.274Z', 'deleteTime': None, 'code': 'YZWL25050800004', '_widget_1745810482694': 'WSF25031800330', 'type': '收款', 'fukuanshiyou': '保养费', 'month1': '2025-05', 'month': '2025-04-30T16:00:00.000Z', 'yewubiaodanmingcheng': '承租表单', 'yewubiaodanbianma': 'HT-240800013', 'sijixingming': '曾辉', 'id_card': '450481198712202058', 'shfid': 'J488912202058', 'company_jc': '', 'xd': '', 'sijisuozaigongsi': '康建利福汽车服务', 'fs': 'J315车队', 'license_plate': '京BD02424', 'fs_p': {'name': 'J315车队', 'dept_no': 1776480, 'type': 0, 'parent_no': 328, 'integrate_id': '1776480', 'status': 1}, 'money': 113.0, 'pay': 0.0, 'no_money': 113.0, 'ys': '2025-05-07T16:00:00.000Z', 'start_time': None, 'end_time': None, 'hz_month': '2025-04-30T16:00:00.000Z', '_widget_1744679600972': '', 'mode_type': 'DP', 'lydunjiao': '趸交', 'bill_type': '个人账单', 'contract_num': 'HT-240800013', 'car_dept': '金建', 'sy': '', 'shgid': '', '_id': '681c54f347f52adcb2b19a39', 'appId': '675b8d1a24d61bca7bf1cb4c', 'entryId': '67e21d2ebaccd58c66fa7c77', 'sort': 3, 'flag_m': 0}, {'creator': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'updater': {'name': '赵学敏', 'username': '#admin', 'status': 1, 'type': 0}, 'deleter': None, 'createTime': '2025-05-08T05:23:13.088Z', 'updateTime': '2025-05-08T06:53:08.031Z', 'deleteTime': None, 'code': 'YZWL25050800003', '_widget_1745810482694': 'WSF25031800330', 'type': '收款', 'fukuanshiyou': '收预收承包金', 'month1': '2025-05', 'month': '2025-04-30T16:00:00.000Z', 'yewubiaodanmingcheng': '承租表单', 'yewubiaodanbianma': 'HT-240800013', 'sijixingming': '曾辉', 'id_card': '450481198712202058', 'shfid': 'J488912202058', 'company_jc': '', 'xd': '', 'sijisuozaigongsi': '康建利福汽车服务', 'fs': 'J315车队', 'license_plate': '京BD02424', 'fs_p': {'name': 'J315车队', 'dept_no': 1776480, 'type': 0, 'parent_no': 328, 'integrate_id': '1776480', 'status': 1}, 'money': 6000.0, 'pay': 200.0, 'no_money': 5800.0, 'ys': '2025-05-07T16:00:00.000Z', 'start_time': None, 'end_time': None, 'hz_month': '2025-02-28T16:00:00.000Z', '_widget_1744679600972': '', 'mode_type': 'DP', 'lydunjiao': '趸交', 'bill_type': '个人账单', 'contract_num': 'HT-240800013', 'car_dept': '金建', 'sy': '', 'shgid': '', '_id': '681c3fc147f52adcb2affb40', 'appId': '675b8d1a24d61bca7bf1cb4c', 'entryId': '67e21d2ebaccd58c66fa7c77', 'sort': 1, 'flag': 1, 'flag_m': 200.0}], '_th_amount': 6153.0, 'hz': []}, '2025-04': {'data': [{'creator': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'updater': {'name': '赵学敏', 'username': '#admin', 'status': 1, 'type': 0}, 'deleter': None, 'createTime': '2025-05-08T02:09:51.328Z', 'updateTime': '2025-05-08T06:53:18.061Z', 'deleteTime': None, 'code': 'YZWL25050800001', '_widget_1745810482694': 'WSF25031800330', 'type': '收款', 'fukuanshiyou': '承包金', 'month1': '2025-04', 'month': '2025-03-31T16:00:00.000Z', 'yewubiaodanmingcheng': '承租表单', 'yewubiaodanbianma': 'HT-240800013', 'sijixingming': '曾辉', 'id_card': '450481198712202058', 'shfid': 'J488912202058', 'company_jc': '', 'xd': '', 'sijisuozaigongsi': '康建利福汽车服务', 'fs': 'J315车队', 'license_plate': '京BD02424', 'fs_p': {'name': 'J315车队', 'dept_no': 1776480, 'type': 0, 'parent_no': 328, 'integrate_id': '1776480', 'status': 1}, 'money': 4478.0, 'pay': 0.0, 'no_money': 4478.0, 'ys': '2025-05-07T16:00:00.000Z', 'start_time': None, 'end_time': None, 'hz_month': '2025-04-30T16:00:00.000Z', '_widget_1744679600972': '', 'mode_type': 'DP', 'lydunjiao': '趸交', 'bill_type': '个人账单', 'contract_num': 'HT-240800013', 'car_dept': '金建', 'sy': '', 'shgid': '', '_id': '681c126f2e399b68feb72083', 'appId': '675b8d1a24d61bca7bf1cb4c', 'entryId': '67e21d2ebaccd58c66fa7c77', 'sort': 1, 'flag_m': 0}], '_th_amount': 4478.0, 'hz': []}, 'amount': 10631.0}
+2025-05-08 14:57:53,061 - utils - INFO - 删除=========0.0, 40.0
+2025-05-08 14:57:53,285 - utils - INFO - 删除=========0.0, 113.0
+2025-05-08 14:57:53,450 - utils - INFO - 新增已收========={'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67f37759de8bbe9eed71b793', 'is_start_trigger': True, 'is_start_workflow': True, 'data': {'code': {'value': 'YZWL25050800003'}, 'type': {'value': '收款'}, 'fukuanshiyou': {'value': '收预收承包金'}, 'month': {'value': '2025-04-30T16:00:00.000Z'}, 'month1': {'value': '2025-05'}, 'yewubiaodanmingcheng': {'value': '承租表单'}, 'yewubiaodanbianma': {'value': 'HT-240800013'}, 'sijixingming': {'value': '曾辉'}, 'shfid': {'value': 'J488912202058'}, 'id_card': {'value': '450481198712202058'}, 'pay_time': {'value': '2025-05-08 06:57:53'}, 'company_jc': {'value': ''}, 'xd': {'value': ''}, 'sijisuozaigongsi': {'value': '康建利福汽车服务'}, 'fs': {'value': 'J315车队'}, 'license_plate': {'value': '京BD02424'}, 'money': {'value': 6000.0}, 'pay': {'value': 200.0}, 'hz_month': {'value': '2025-02-28T16:00:00.000Z'}, 'fs_p': {'value': 1776480}, 'shgid': {'value': ''}, 'mode_type': {'value': 'DP'}, 'sy': {'value': '个人账户抵扣'}, 'ys': {'value': '2025-05-07T16:00:00.000Z'}, 'lydunjiao': {'value': '趸交'}, 'bill_type': {'value': '个人账单'}, 'car_dept': {'value': '金建'}, 'contract_num': {'value': 'HT-240800013'}}}
+2025-05-08 14:57:53,552 - utils - INFO - 删除=========200.0, 6000.0
+2025-05-08 14:57:53,664 - utils - INFO - 删除=========0.0, 4478.0
+2025-05-08 14:57:53,664 - utils - INFO - 更新个人账户余额update_info
+2025-05-08 14:57:53,838 - utils - INFO - 结束========
diff --git a/logs/payapp.log b/logs/payapp.log
new file mode 100644
index 0000000..06a1911
--- /dev/null
+++ b/logs/payapp.log
@@ -0,0 +1,35 @@
+2025-05-08 11:23:20,165 - dpapp - INFO - DPPayApp started
+2025-05-08 11:23:20,176 - werkzeug - INFO -  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+2025-05-08 11:23:23,957 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c22c147f52adcb2aeed04","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000001","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:19:29.185Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282942276472","type":"转入","updateTime":"2025-05-08T03:19:29.185Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746674369185}

+
+2025-05-08 11:23:24,035 - utils - INFO - req_tool_jdy{'code': 3005, 'msg': 'The request contains invalid parameter(s).'}
+2025-05-08 11:23:26,101 - utils - INFO - req_tool_jdy{'code': 3005, 'msg': 'The request contains invalid parameter(s).'}
+2025-05-08 11:23:28,184 - utils - INFO - req_tool_jdy{'code': 3005, 'msg': 'The request contains invalid parameter(s).'}
+2025-05-08 11:23:30,233 - utils - INFO - req_tool_jdy{'code': 3005, 'msg': 'The request contains invalid parameter(s).'}
+2025-05-08 11:24:52,308 - dpapp - INFO - DPPayApp started
+2025-05-08 11:24:52,316 - werkzeug - INFO -  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+2025-05-08 11:24:54,897 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c22c147f52adcb2aeed04","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000001","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:19:29.185Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282942276472","type":"转入","updateTime":"2025-05-08T03:19:29.185Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746674369185}

+
+2025-05-08 11:24:55,016 - dpapp - INFO - addPayment,e'price',data{'_id': '681c22c147f52adcb2aeed04', '_widget_1743667106306': None, '_widget_1743667108715': 'CZMX202505080000001', '_widget_1744091796748': [], 'appId': '675b8d1a24d61bca7bf1cb4c', 'car_dept': '金建', 'charge_amount': 200, 'charge_note': '', 'charge_time': '2025-05-08T03:19:22.000Z', 'collect_pos': '', 'contract_num': '', 'createTime': '2025-05-08T03:19:29.185Z', 'creator': {'_id': '66b980a0683f21a2d1429548', 'name': '葛梦伟', 'status': 1, 'type': 0, 'username': '993848'}, 'deleteTime': None, 'deleter': None, 'entryId': '67ee3fa22e399b68fef8d839', 'formName': '充值明细表_财务', 'form_code': '', 'form_name': '', 'fs': 'J315车队', 'fs_p': {'_id': '66d19d41d6eb869c4d32f453', 'dept_no': 1776480, 'name': 'J315车队', 'type': 0}, 'hphm': '京BDB5375', 'hz_month': None, 'hz_month1': '', 'id_card': '450481198712202058', 'jg': '康建利福汽车服务', 'mode_type': 'DP', 'name': '曾辉', 'pay_type': '微信支付', 'payment_content': '', 'rq': None, 'shfid': 'J488912202058', 'transactionid': '4200002659202504282942276472', 'type': '转入', 'updateTime': '2025-05-08T03:19:29.185Z', 'updater': {'_id': '66b980a0683f21a2d1429548', 'name': '葛梦伟', 'status': 1, 'type': 0, 'username': '993848'}, 'ys': None, 'zhtype': '预收款', 'zxform_code': ''}
+2025-05-08 11:24:55,017 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 11:24:55] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 11:28:26,818 - dpapp - INFO - DPPayApp started
+2025-05-08 11:28:26,825 - werkzeug - INFO -  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+2025-05-08 11:28:28,513 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c22c147f52adcb2aeed04","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000001","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:19:29.185Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282942276472","type":"转入","updateTime":"2025-05-08T03:19:29.185Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746674369185}

+
+2025-05-08 11:28:28,614 - dpapp - INFO - addPayment,e'price',data{'_id': '681c22c147f52adcb2aeed04', '_widget_1743667106306': None, '_widget_1743667108715': 'CZMX202505080000001', '_widget_1744091796748': [], 'appId': '675b8d1a24d61bca7bf1cb4c', 'car_dept': '金建', 'charge_amount': 200, 'charge_note': '', 'charge_time': '2025-05-08T03:19:22.000Z', 'collect_pos': '', 'contract_num': '', 'createTime': '2025-05-08T03:19:29.185Z', 'creator': {'_id': '66b980a0683f21a2d1429548', 'name': '葛梦伟', 'status': 1, 'type': 0, 'username': '993848'}, 'deleteTime': None, 'deleter': None, 'entryId': '67ee3fa22e399b68fef8d839', 'formName': '充值明细表_财务', 'form_code': '', 'form_name': '', 'fs': 'J315车队', 'fs_p': {'_id': '66d19d41d6eb869c4d32f453', 'dept_no': 1776480, 'name': 'J315车队', 'type': 0}, 'hphm': '京BDB5375', 'hz_month': None, 'hz_month1': '', 'id_card': '450481198712202058', 'jg': '康建利福汽车服务', 'mode_type': 'DP', 'name': '曾辉', 'pay_type': '微信支付', 'payment_content': '', 'rq': None, 'shfid': 'J488912202058', 'transactionid': '4200002659202504282942276472', 'type': '转入', 'updateTime': '2025-05-08T03:19:29.185Z', 'updater': {'_id': '66b980a0683f21a2d1429548', 'name': '葛梦伟', 'status': 1, 'type': 0, 'username': '993848'}, 'ys': None, 'zhtype': '预收款', 'zxform_code': ''}
+2025-05-08 11:28:28,614 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 11:28:28] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 11:29:16,713 - dpapp - INFO - DPPayApp started
+2025-05-08 11:29:16,720 - werkzeug - INFO -  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+2025-05-08 11:29:18,796 - dpapp - INFO - 新增充值明细,data{"data":{"_id":"681c22c147f52adcb2aeed04","_widget_1743667106306":null,"_widget_1743667108715":"CZMX202505080000001","_widget_1744091796748":[],"appId":"675b8d1a24d61bca7bf1cb4c","car_dept":"金建","charge_amount":200,"charge_note":"","charge_time":"2025-05-08T03:19:22.000Z","collect_pos":"","contract_num":"","createTime":"2025-05-08T03:19:29.185Z","creator":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"deleteTime":null,"deleter":null,"entryId":"67ee3fa22e399b68fef8d839","formName":"充值明细表_财务","form_code":"","form_name":"","fs":"J315车队","fs_p":{"_id":"66d19d41d6eb869c4d32f453","dept_no":1776480,"name":"J315车队","type":0},"hphm":"京BDB5375","hz_month":null,"hz_month1":"","id_card":"450481198712202058","jg":"康建利福汽车服务","mode_type":"DP","name":"曾辉","pay_type":"微信支付","payment_content":"","rq":null,"shfid":"J488912202058","transactionid":"4200002659202504282942276472","type":"转入","updateTime":"2025-05-08T03:19:29.185Z","updater":{"_id":"66b980a0683f21a2d1429548","name":"葛梦伟","status":1,"type":0,"username":"993848"},"ys":null,"zhtype":"预收款","zxform_code":""},"op":"data_create","opTime":1746674369185}

+
+2025-05-08 11:29:18,892 - dpapp - INFO - 新增充值明细111,pay_amount: 200, id: 450481198712202058,fs: J315车队, jg: 康建利福汽车服务, name: 曾辉, shfid: J488912202058,fsfz: 1776480,hphm: 京BDB5375
+2025-05-08 11:29:18,892 - werkzeug - INFO - 127.0.0.1 - - [08/May/2025 11:29:18] "POST /addPayment HTTP/1.1" 200 -
+2025-05-08 11:29:18,893 - utils - INFO - 开始========data{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}, type1
+2025-05-08 11:29:18,893 - utils - INFO - 开始查询未收付明细, id_card: 450481198712202058,filter_data: {'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67e21d2ebaccd58c66fa7c77', 'limit': 100, 'filter': {'rel': 'and', 'cond': [{'field': 'id_card', 'method': 'eq', 'value': ['450481198712202058']}, {'field': 'no_money', 'method': 'eq', 'value': ['450481198712202058']}]}} 
+2025-05-08 11:29:21,521 - utils - INFO - 执行承包金add_payment{'pay_amount': 200, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '康建利福汽车服务', 'name': '曾辉', 'shfid': 'J488912202058', 'fsfz': 1776480, 'hphm': '京BDB5375'}
+2025-05-08 11:29:21,521 - utils - INFO - 更新未收付{'2025-03': {'data': [{'creator': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'updater': {'name': '葛梦伟', 'username': '993848', 'status': 1, 'type': 0, 'departments': [791], 'integrate_id': '993848'}, 'deleter': None, 'createTime': '2025-05-08T02:09:51.328Z', 'updateTime': '2025-05-08T02:09:51.328Z', 'deleteTime': None, 'code': 'YZWL25050800001', '_widget_1745810482694': 'WSF25031800330', 'type': '收款', 'fukuanshiyou': '交通违法扣款', 'month1': '2025-03', 'month': '2025-02-28T16:00:00.000Z', 'yewubiaodanmingcheng': '替换车辆归还', 'yewubiaodanbianma': 'CLGH-p20250318005', 'sijixingming': '曾辉', 'id_card': '450481198712202058', 'shfid': 'J488912202058', 'company_jc': '', 'xd': '', 'sijisuozaigongsi': '康建利福汽车服务', 'fs': 'J315车队', 'license_plate': '京BD02424', 'fs_p': {'name': 'J315车队', 'dept_no': 1776480, 'type': 0, 'parent_no': 328, 'integrate_id': '1776480', 'status': 1}, 'money': 1200.0, 'pay': 1200.0, 'no_money': 0, 'ys': '2025-03-17T16:00:00.000Z', 'start_time': None, 'end_time': None, 'hz_month': '2025-02-28T16:00:00.000Z', '_widget_1744679600972': '', 'mode_type': 'DP', 'lydunjiao': '月租', 'bill_type': '个人账单', 'contract_num': '', 'car_dept': '金建', 'sy': '', 'shgid': '', '_id': '681c126f2e399b68feb72083', 'appId': '675b8d1a24d61bca7bf1cb4c', 'entryId': '67e21d2ebaccd58c66fa7c77', 'sort': 9999, 'flag': 1, 'flag_m': 1200.0}], '_th_amount': 1200.0, 'hz': []}, 'amount': 1200.0}
+2025-05-08 11:29:21,673 - utils - INFO - 新增已收========={'app_id': '675b8d1a24d61bca7bf1cb4c', 'entry_id': '67f37759de8bbe9eed71b793', 'is_start_trigger': True, 'is_start_workflow': True, 'data': {'code': {'value': 'YZWL25050800001'}, 'type': {'value': '收款'}, 'fukuanshiyou': {'value': '交通违法扣款'}, 'month': {'value': '2025-02-28T16:00:00.000Z'}, 'month1': {'value': '2025-03'}, 'yewubiaodanmingcheng': {'value': '替换车辆归还'}, 'yewubiaodanbianma': {'value': 'CLGH-p20250318005'}, 'sijixingming': {'value': '曾辉'}, 'shfid': {'value': 'J488912202058'}, 'id_card': {'value': '450481198712202058'}, 'pay_time': {'value': '2025-05-08 03:29:21'}, 'company_jc': {'value': ''}, 'xd': {'value': ''}, 'sijisuozaigongsi': {'value': '康建利福汽车服务'}, 'fs': {'value': 'J315车队'}, 'license_plate': {'value': '京BD02424'}, 'money': {'value': 1200.0}, 'pay': {'value': 1200.0}, 'hz_month': {'value': '2025-02-28T16:00:00.000Z'}, 'fs_p': {'value': 1776480}, 'shgid': {'value': ''}, 'mode_type': {'value': 'DP'}, 'sy': {'value': '个人账户抵扣'}, 'ys': {'value': '2025-03-17T16:00:00.000Z'}, 'lydunjiao': {'value': '月租'}, 'bill_type': {'value': '个人账单'}, 'car_dept': {'value': '金建'}, 'contract_num': {'value': ''}}}
+2025-05-08 11:29:21,805 - utils - INFO - 删除=========1200.0, 1200.0
+2025-05-08 11:29:21,805 - utils - INFO - ===========================未收付已清缴，删除未收付明细===============================
+2025-05-08 11:29:21,918 - utils - INFO - 更新个人账户余额update_info
+2025-05-08 11:29:22,106 - utils - INFO - 结束========
diff --git a/priv_key.pem b/priv_key.pem
new file mode 100644
index 0000000..612efe9
--- /dev/null
+++ b/priv_key.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC/32miL42GsFcVwII+YDxjbjAdASu6f0SyD6fz5jFl+QWYJ16Z8suIpFOpsrvlVE9t8PD1gX1tJmmJYCi1IjoUrVxdKc6nBZ8w68xhttIdnP341W2bBMjWK1Tr3IWC1BwUFYOaGT4c5RJf886BzmUQpQetxi88nXWJCVbAEedhi4OdCgULS7Z74leTDgIi3+xlU7qLICndcCC4zPQM3IsETt/WQBW0bed+sNYI7RxMaAKQ6PaGcbryjZshDtRby+s8UqgdHVnDXY4++DafJjg+FzflE7rM+TyDBY80gvZduMZXHlGytZm9FQNFZSbhvYW0mOOznuwpq7DDLOank6qzAgMBAAECggEBAIdP/WT9eCeGcMPMUY2/vJa6fH/X9Yi+fCm+1Mkyi5/IcGOPUC3thhBFIyNIAy6FuMZl5uice2HgdwkEoXCsRJ2UbNDezPgJBO0xPZ+jmKZ9srYrffKW+zPetzLm/9j10R9w1LB2INGr0ruMaxQsBCYq3DF21JVAzkToKx+lALJOwC+ZEdjwYBCEzSSAKI/VupEMucuRMlSRRIQQXlqDPO0s5ymSkhynslBstpeKsGhl38hLgRA6aQIuhuvtLO00OlOwLxAfWTxgT+2VKntvvBZ3waoUw7sKLlSpX99dfgfARdAj08+ZR4cD06QtLSgAoiYvCet+/1yX457/coH1UdECgYEA/HUAAsD0dM6LG99ki0879ep3+2nd3Msk+4/IPV6p7J3qKuXpG8yGIXGacXzo+gjTxbfkE0l/xD41TcOz8HV7ZRJHtOBGEy6ZZoyqzqTVFS71FjzUL2W1P7RQjDqOpCxZyuW3vsLFVdVrN3fVuMv0NBHDvnzB55HAAeJFrL6Hj70CgYEAwpDAegggdaOFWj9eo03+oiwqJsutK6O6Fa1OZAA+QPG4tXqgiRIAqQ87HEi+a7GPKbntYkJX0YYNhSDkIUqebT1Fb/7kDVfLuDhF2cRa6Qr4CNrIi+F9KguJo3grNzBk/SWNUyouJsSxnQ3XS9kGbIddIzTMOukrnNmNebvOUy8CgYEAij7HsrpXI1+3bZv3QxIwk4nCCjr+81mK9vbVgEXGZ3xSLwuXi1GEYewD1wG/0qviy/LXQniNLrmiFuOENbkfyUkpWzM1LGvoNO/y2RYKWX9NVtAYoZvglPH46dFnKx/eS+1foWanCUnFXKqSro+BOsI/nqBSzqxRqLZv0RjEw0ECgYBeKr7tkRdcuFrnVfpQ4YPXK7bu9e8HSwPaT/m7zp5SwmsacpJWJP9q03NReienadWXZWRuBRwJzW6nu0aOklXhGyGLVfs8NfzkWV/9SNqTJfrsFi+v+9+fRNxF4PhRirumBdHDqYuSueoY0EUecZh5WH6MdpZOAOJZ1LVzcKEogwKBgQDkA5O4Fcxgo8fZaCkeV7Tlg1C1RJBXDD+E29ToAJw2EOruPkWV+rkrZZSpz+4pwgKgcM9IIZJKo/fI7tKDIwj3D+JzFO+H0RNiyMvrCZe7fDnvaPcFGPwqKwyCpjkurKtUdXYbHz9wapFJzaLpYD9opPRBRwZK8TkmXSWNyJi0Kw==
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/pub_key.pem b/pub_key.pem
new file mode 100644
index 0000000..83dad9f
--- /dev/null
+++ b/pub_key.pem
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCg2Sk+UF++991s65lk5rIekfG82nvlzz5P8JKxm98ZA4e2UE4avHvGnFv16maFl6SzOTtKcVMnJzyxJsyTIUZvOeEuBXv2ChdVpqux19h1UJPrUoaSH1gi8sYYSkQkiX8i4JJy4yXEmShdajDEPU/ywZ2/0MqXahO1GlFwQid+wwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..304902e
--- /dev/null
+++ b/test.py
@@ -0,0 +1,20 @@
+from flask import Flask, request, redirect, abort, session
+
+from FuiouPay import H5Main
+from utils import *
+import os, _thread, urllib
+
+from utils import *
+# add_payment({'pay_amount': 5000, 'id': '450481198712202058', 'fs': 'J315车队', 'jg': '金建', 'name': '曾辉', 'fsfz': 1776480,
+#              'shfid': 'J488912202058', 'hphm': '京BD02424', 'paymentdetails': []},1)
+id_list = ['411024199002103214','130425199203156312','211381198704144119','210602198306150513','422326197404090017','41082219930630201X','413026197704257299','410311198701065578','131002198910063051','411403199405137232','210905198607031038','142702197203072115','34080219650302041X','412721197606053511','410927199001035018','131121198209030213','410523200311100274','231002197204291515','132801196904071812','232303197608246853','372930198112167358','412722199902065731','410182198203162134','410927198406156016','130726199606110055','131126198302172111','41232219740905339X','410482198110215934','130427199008233119','412723196806056811','320721197103302615','410522199911138135','13262719771129171X','37132519820630091X','430721198211020017','332621197109082770','412728197605121599','410311198710282558','41232719990822131X','342127197411200830','522421197401054894','410103197304162475','410122198212114429','120104198611146012','13212919770913071X','132628198209210516','411503199801054012','519002197404161293','130533198304185332','413026199503010977','413028197410216419','410523200011179355','410603198903230056','131024198710023985','411381198506044552','130429196810033818','513723198508160067','410482197411022357','410523199006115052','130634198609253510','372924199009153318','412723198011142184','130730199305153419','342222198104206050','371312198608046713','412702197605171832','110102197203151112','41052119921227705X','130427199405064718','130423197705012114','342127198002109272','410901198602281152','410927199306026032','230281199505102137','37252319830720845X','410821199010271019','41302619760122841X','130226197507055955','410221197404201417','140302197301191018','410927199905241017','142701197406033611','132130197009086717','131002197010093111','210727198110075139','230202198010292514','132522198006080535','410311198207063016','410523199004101036','410927198708105011','410521199101158090','41052119850529051X','413025197112266312','41052219770205813X']
+for id in id_list:
+    res = filter_jdy_ht(id)
+    if not res:
+        print(f"未查询到数据: {id}")
+        continue
+    add_payment({"pay_amount": 0, "id": id,
+                 "fs": res[1], "jg": res[0], "name": res[4], "shfid": res[7],
+                 "fsfz": res[6],
+                 "hphm": res[5]}, 1)
+    time.sleep(10)
\ No newline at end of file
diff --git a/utils.py b/utils.py
new file mode 100644
index 0000000..f8c8f91
--- /dev/null
+++ b/utils.py
@@ -0,0 +1,1328 @@
+from datetime import datetime
+from Crypto.PublicKey import RSA
+import base64
+from Crypto.Cipher import PKCS1_v1_5
+import requests, time, json, uuid, datetime
+from flask import jsonify
+from config import *
+from dateutil.relativedelta import relativedelta
+import threading
+import urllib3
+from Crypto.Cipher import AES
+from base64 import b64encode, b64decode
+import logging
+
+logger = logging.getLogger(__name__)
+
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+lock = threading.Lock()
+
+
+def format_uct(origin_date_str):
+    origin_date_str = origin_date_str.split('.')[0]
+    utc_date = datetime.datetime.strptime(origin_date_str, "%Y-%m-%dT%H:%M:%S")
+    local_date = utc_date + datetime.timedelta(hours=8)
+    local_date_str = datetime.datetime.strftime(local_date, '%Y-%m-%d %H:%M:%S')
+    return local_date_str
+
+
+def filter_jdy_ht(id):
+    """筛选简道云合同表单中驾驶员对应信息"""
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    filter_data = {
+        "app_id": fu_app,
+        "entry_id": ht_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "id",
+                    "method": "eq",
+                    "value": [id]
+                }
+            ]
+        }
+    }
+    ht_detail = turn_page(url, filter_data)
+    if not ht_detail:
+        return []
+    ht_detail = ht_detail[0]
+    # 机构
+    jg = ht_detail['jg']
+    # 分司
+    fs = ht_detail['ssbm']
+    # 商户号
+    sh = ht_detail['sh']
+    # 商户号证书
+    shzs = '38C5F89F06EC667D54936A4FF0DC93A227BFC128'
+
+    # 姓名
+    name = ht_detail['name']
+    # 车牌号
+    hphm = ht_detail['hphm']
+    # 分司负责人
+    fsfz = ht_detail['fsfz']['dept_no'] if ht_detail['fsfz'] else ""
+    shfid = ht_detail['shfid']
+    return [jg, fs, sh, shzs, name, hphm, fsfz, shfid]
+
+
+def queryUser(id):
+    # 查询充值明细
+    # user = get_user_info(id)
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    filter_data = {
+        "app_id": pay_app,
+        "entry_id": pay_details_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "pay_type",
+                    "method": "in",
+                    "value": ["微信支付","支付宝支付","云闪付支付"]
+                },
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                }
+            ]
+        }
+    }
+    filter_data_lw = {
+        "app_id": lw_pay_app,
+        "entry_id": lw_pay_details_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "pay_type",
+                    "method": "in",
+                    "value": ["微信支付","支付宝支付","云闪付支付"]
+                },
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                }
+            ]
+        }
+    }
+    pay_detail1 = turn_page(url, filter_data)
+    pay_detail2 = turn_page(url, filter_data_lw)
+    pay_detail = pay_detail1 + pay_detail2
+    for i in pay_detail:
+        i['charge_time'] = format_uct(i['charge_time'])
+    # 查询个人余额
+    info = {
+        "app_id": pay_app,
+        "entry_id": accout_id,
+        "filter": {"rel": "and",
+                   "cond": [
+                       {
+                           "field": "id_card",
+                           "method": "eq",
+                           "value": [id]
+                       },
+                       {
+                           "field": "date",
+                           "method": "empty",
+
+                       }
+                   ]}
+    }
+    # 查询个人余额账户表
+    res = req_tool_jdy(url, info)
+    balance = 0
+    if res['data']:
+        balance = res['data'][0]['balance']
+    balance = float("%.2f" % balance)
+    return {"balance": balance, "pay_detail": pay_detail}
+
+def querydpUser(id):
+    # 查询充值明细
+    # user = get_user_info(id)
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    filter_data = {
+        "app_id": pay_app,
+        "entry_id": pay_details_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "pay_type",
+                    "method": "in",
+                    "value": ["微信支付","支付宝支付","云闪付支付"]
+                },
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                }
+            ]
+        }
+    }
+    pay_detail = turn_page(url, filter_data)
+    for i in pay_detail:
+        i['charge_time'] = format_uct(i['charge_time'])
+    # 查询个人余额
+    info = {
+        "app_id": pay_app,
+        "entry_id": accout_id,
+        "filter": {"rel": "and",
+                   "cond": [
+                       {
+                           "field": "id_card",
+                           "method": "eq",
+                           "value": [id]
+                       },
+                       {
+                           "field": "mode_type",
+                           "method": "eq",
+                           "value": ['DP']
+                       },
+                       {
+                           "field": "date",
+                           "method": "empty",
+
+                       }
+                   ]}
+    }
+    # 查询个人余额账户表
+    res = req_tool_jdy(url, info)
+    balance = 0
+    if res['data']:
+        balance = res['data'][0]['balance']
+    balance = float("%.2f" % balance)
+    return {"balance": balance, "pay_detail": pay_detail}
+
+def get_last_8_hour():
+    _time = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time() - 8 * 60 * 60))
+    return _time
+
+
+def turn_page(url, data):
+    """翻页查询"""
+    info = []
+    while 1:
+        try:
+            res = req_tool_jdy(url, data)
+            info += res['data']
+            if len(res['data']) < 100:
+                return info
+            data["data_id"] = res["data"][-1]["_id"]
+        except Exception as e:
+            logger.error(f"turn_page,e{e}, res{res}")
+
+
+def get_user_info(id, type=None):
+    """获取用户信息"""
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    if type:
+        filter_data = {
+            "app_id": fu_app,
+            "entry_id": fu_id,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "id_card",
+                        "method": "eq",
+                        "value": [id]
+                    }
+                ]
+            }
+        }
+    else:
+        filter_data = {
+            "app_id": fu_app,
+            "entry_id": fu_id,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "user",
+                        "method": "eq",
+                        "value": [id]
+                    }
+                ]
+            }
+        }
+    res = req_tool_jdy(url, filter_data)
+    if res['data']:
+        return res['data'][0]
+    return ''
+
+
+def query_pay_details(id):
+    # 查询某人未收付明细
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    filter_data = {
+        "app_id": pay_app,
+        "entry_id": uncollected_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                },
+                {
+                    "field": "bill_type",
+                    "method": "eq",
+                    "value": "个人账单"
+                },
+                {
+                    "field": "no_money",
+                    "method": "eq",
+                    "value": [id]
+                },
+            ]
+        }
+    }
+    filter_data_lw = {
+        "app_id": lw_pay_app,
+        "entry_id": lw_uncollected_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                },
+                {
+                    "field": "no_money",
+                    "method": "eq",
+                    "value": [id]
+                },
+            ]
+        }
+    }
+
+    uncollected_data1 = turn_page(url, filter_data)
+    for i in uncollected_data1:
+        flag = False
+        if i['bill_type'] == "个人账单":
+            flag = True
+            break
+    uncollected_data2 = turn_page(url, filter_data_lw)
+    uncollected_data = uncollected_data1 + uncollected_data2
+    _data = []
+    for i in uncollected_data:
+        flag = False
+        for j in ["收预收承包金", "承包金", "调度费", "保养费", "营运服务费", "费税收取-其他", "维修费", "违约金", "驾驶员履约服务费", "发票罚款", "停车费", "交通违法扣款", "车辆管理费"]:
+            if j == i['fukuanshiyou']:
+                flag = True
+                break
+        if not flag:
+            continue
+        i['money'] = float("%.2f" % i['money']) if i['money'] else 0
+        i['pay'] = float("%.2f" % i['pay']) if i['pay'] != None and i['pay'] != '' else 0
+        i['no_money'] = float("%.2f" % i['no_money']) if i['no_money'] != None and i['no_money'] != '' else 0
+        i['sort'] = 9999
+        for j in rule_sort:
+            if j in i['fukuanshiyou']:
+                i['sort'] = rule_sort[j]
+        _data.append(i)
+    uncollected_data = _data
+    uncollected_data = sorted(uncollected_data, key=lambda x: x['createTime'], reverse=True)
+    # 过滤已结清数据
+    uncollected_data = [i for i in uncollected_data if i['money'] != i['pay']]
+    undata = {}
+    # 按月份归类 uncollected_data
+    for un in uncollected_data:
+        if un['month1'] in undata.keys():
+            undata[un['month1']]['data'].append(un)
+        else:
+            undata[un['month1']] = {"data": []}
+            undata[un['month1']]['data'] = [un]
+    # # 按月查询增减项  flowState结束
+    amount = 0
+    for un in undata:
+        _th_amount = 0
+        del_list = []
+        filter_data = {
+            "app_id": hz_app,
+            "entry_id": hz_id,
+            "limit": 100,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "id_card",
+                        "method": "eq",
+                        "value": [id]
+                    },
+                    {
+                        "field": "month1",
+                        "method": "eq",
+                        "value": [un]
+                    },
+                ]
+            }
+        }
+        hz_data_list = turn_page(url, filter_data)
+        # 应付总额  承包金定额=应收承包金-增减项
+        zj_sum = sum(item['jine'] for item in hz_data_list)
+        for index, j in enumerate(undata[un]['data']):
+            j['no_money'] = j['no_money'] if j['no_money'] else j['money']
+
+            if '承包金' in j['fukuanshiyou'] and j['yewubiaodanmingcheng'] == '费税计划':
+                if j['pay'] - zj_sum == j['money']:
+                    del_list.append(index)
+                    continue
+                # 定额 de = 表单中的金额-增减
+                # 应付金额 money = 表单中的金额
+                # 未付金额 no_money = 应付金额-增减-已付金额
+                j['pay'] = j['pay'] if j['pay'] else 0
+
+                undata[un]['de'] = j['money'] - zj_sum
+                # j['money'] = undata[un]['de'] + zj_sum
+                j['no_money'] = j['money'] - j['pay']
+            amount += j['no_money'] if j['no_money'] else j['money']
+            _th_amount += j['no_money'] if j['no_money'] else j['money']
+        undata[un]['_th_amount'] = _th_amount
+        undata[un]['hz'] = hz_data_list
+        for d in del_list:
+            undata[un]['data'].pop(d)
+    undata['amount'] = float("%.2f" % amount)
+    for i in list(undata.keys()):
+        if i != 'amount' and not undata[i]['data']:
+            del undata[i]
+    return undata
+
+def query_dp_pay_details(id):
+    # 查询某人未收付明细
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    filter_data = {
+        "app_id": pay_app,
+        "entry_id": uncollected_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                },
+                {
+                    "field": "mode_type",
+                    "method": "eq",
+                    "value": ['DP']
+                },
+                {
+                    "field": "no_money",
+                    "method": "eq",
+                    "value": [id]
+                },
+            ]
+        }
+    }
+    logger.info(f"开始查询未收付明细, id_card: {id},filter_data: {filter_data} ")
+    uncollected_data = turn_page(url, filter_data)
+    _data = []
+    for i in uncollected_data:
+        flag = False
+        for j in ["收预收承包金", "承包金", "调度费", "保养费", "营运服务费", "费税收取-其他", "维修费", "违约金", "驾驶员履约服务费", "发票罚款", "停车费", "交通违法扣款", "车辆管理费"]:
+            if j == i['fukuanshiyou']:
+                if i['bill_type'] == "个人账单":
+                    flag = True
+                    break
+        if not flag:
+            continue
+        i['money'] = float("%.2f" % i['money']) if i['money'] else 0
+        i['pay'] = float("%.2f" % i['pay']) if i['pay'] != None and i['pay'] != '' else 0
+        i['no_money'] = float("%.2f" % i['no_money']) if i['no_money'] != None and i['no_money'] != '' else 0
+        i['sort'] = 9999
+        for j in rule_sort:
+            if j in i['fukuanshiyou']:
+                i['sort'] = rule_sort[j]
+        _data.append(i)
+    uncollected_data = _data
+    uncollected_data = sorted(uncollected_data, key=lambda x: x['createTime'], reverse=True)
+    # 过滤已结清数据
+    uncollected_data = [i for i in uncollected_data if i['money'] != i['pay']]
+    undata = {}
+    # 按月份归类 uncollected_data
+    for un in uncollected_data:
+        if un['month1'] in undata.keys():
+            undata[un['month1']]['data'].append(un)
+        else:
+            undata[un['month1']] = {"data": []}
+            undata[un['month1']]['data'] = [un]
+    # # 按月查询增减项  flowState结束
+    amount = 0
+    for un in undata:
+        _th_amount = 0
+        del_list = []
+        filter_data = {
+            "app_id": hz_app,
+            "entry_id": hz_id,
+            "limit": 100,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "id_card",
+                        "method": "eq",
+                        "value": [id]
+                    },
+                    {
+                        "field": "mode_type",
+                        "method": "eq",
+                        "value": ['DP']
+                    },
+                    {
+                        "field": "month1",
+                        "method": "eq",
+                        "value": [un]
+                    },
+                ]
+            }
+        }
+        hz_data_list = turn_page(url, filter_data)
+        # 应付总额  承包金定额=应收承包金-增减项
+        zj_sum = sum(item['jine'] for item in hz_data_list)
+        for index, j in enumerate(undata[un]['data']):
+            j['no_money'] = j['no_money'] if j['no_money'] else j['money']
+
+            if '承包金' in j['fukuanshiyou'] and j['yewubiaodanmingcheng'] == '费税计划':
+                if j['pay'] - zj_sum == j['money']:
+                    del_list.append(index)
+                    continue
+                # 定额 de = 表单中的金额-增减
+                # 应付金额 money = 表单中的金额
+                # 未付金额 no_money = 应付金额-增减-已付金额
+                j['pay'] = j['pay'] if j['pay'] else 0
+
+                undata[un]['de'] = j['money'] - zj_sum
+                # j['money'] = undata[un]['de'] + zj_sum
+                j['no_money'] = j['money'] - j['pay']
+            amount += j['no_money'] if j['no_money'] else j['money']
+            _th_amount += j['no_money'] if j['no_money'] else j['money']
+        undata[un]['_th_amount'] = _th_amount
+        undata[un]['hz'] = hz_data_list
+        for d in del_list:
+            undata[un]['data'].pop(d)
+    undata['amount'] = float("%.2f" % amount)
+    for i in list(undata.keys()):
+        if i != 'amount' and not undata[i]['data']:
+            del undata[i]
+    return undata
+
+def query_lw_pay_details(id):
+    # 查询某人未收付明细
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    filter_data_lw = {
+        "app_id": lw_pay_app,
+        "entry_id": lw_uncollected_id,
+        "limit": 100,
+        "filter": {
+            "rel": "and",
+            "cond": [
+                {
+                    "field": "id_card",
+                    "method": "eq",
+                    "value": [id]
+                },
+                {
+                    "field": "no_money",
+                    "method": "eq",
+                    "value": [id]
+                },
+            ]
+        }
+    }
+
+    uncollected_data = turn_page(url, filter_data_lw)
+    _data = []
+    for i in uncollected_data:
+        flag = False
+        for j in ["收预收承包金", "承包金", "调度费", "保养费", "营运服务费", "费税收取-其他", "维修费", "违约金", "驾驶员履约服务费", "交通违法扣款"]:
+            if j == i['fukuanshiyou']:
+                flag = True
+                break
+        if not flag:
+            continue
+        i['money'] = float("%.2f" % i['money']) if i['money'] else 0
+        i['pay'] = float("%.2f" % i['pay']) if i['pay'] != None and i['pay'] != '' else 0
+        i['no_money'] = float("%.2f" % i['no_money']) if i['no_money'] != None and i['no_money'] != '' else 0
+        i['sort'] = 9999
+        for j in rule_sort:
+            if j in i['fukuanshiyou']:
+                i['sort'] = rule_sort[j]
+        _data.append(i)
+    uncollected_data = _data
+    uncollected_data = sorted(uncollected_data, key=lambda x: x['createTime'], reverse=True)
+    # 过滤已结清数据
+    uncollected_data = [i for i in uncollected_data if i['money'] != i['pay']]
+    undata = {}
+    # 按月份归类 uncollected_data
+    for un in uncollected_data:
+        if un['month1'] in undata.keys():
+            undata[un['month1']]['data'].append(un)
+        else:
+            undata[un['month1']] = {"data": []}
+            undata[un['month1']]['data'] = [un]
+    # # 按月查询增减项  flowState结束
+    amount = 0
+    for un in undata:
+        _th_amount = 0
+        del_list = []
+        filter_data = {
+            "app_id": hz_app,
+            "entry_id": hz_id,
+            "limit": 100,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "id_card",
+                        "method": "eq",
+                        "value": [id]
+                    },
+                    {
+                        "field": "month1",
+                        "method": "eq",
+                        "value": [un]
+                    },
+                ]
+            }
+        }
+        hz_data_list = turn_page(url, filter_data)
+        # 应付总额  承包金定额=应收承包金-增减项
+        zj_sum = sum(item['jine'] for item in hz_data_list)
+        for index, j in enumerate(undata[un]['data']):
+            j['no_money'] = j['no_money'] if j['no_money'] else j['money']
+
+            if '承包金' in j['fukuanshiyou'] and j['yewubiaodanmingcheng'] == '费税计划':
+                if j['pay'] - zj_sum == j['money']:
+                    del_list.append(index)
+                    continue
+                # 定额 de = 表单中的金额-增减
+                # 应付金额 money = 表单中的金额
+                # 未付金额 no_money = 应付金额-增减-已付金额
+                j['pay'] = j['pay'] if j['pay'] else 0
+
+                undata[un]['de'] = j['money'] - zj_sum
+                # j['money'] = undata[un]['de'] + zj_sum
+                j['no_money'] = j['money'] - j['pay']
+            amount += j['no_money'] if j['no_money'] else j['money']
+            _th_amount += j['no_money'] if j['no_money'] else j['money']
+        undata[un]['_th_amount'] = _th_amount
+        undata[un]['hz'] = hz_data_list
+        for d in del_list:
+            undata[un]['data'].pop(d)
+    undata['amount'] = float("%.2f" % amount)
+    for i in list(undata.keys()):
+        if i != 'amount' and not undata[i]['data']:
+            del undata[i]
+    return undata
+
+def req_tool_jdy(url, data):
+    headers = {"Authorization": f"Bearer {apikey}"}
+    while 1:
+        try:
+            res = requests.post(url, headers=headers, json=data, timeout=20, verify=False).json()
+            if "code" in res.keys():
+                logger.info(f"req_tool_jdy{res}")
+                time.sleep(2)
+                continue
+            return res
+        except Exception as e:
+            logger.error(f"error, {e}")
+
+
+def req_tool_vx(url, data=None, flag=None):
+    while 1:
+        try:
+            if not flag:
+                res = requests.post(url, json=data, timeout=10, verify=False).json()
+            else:
+                res = requests.get(url, timeout=10, verify=False).json()
+            return res
+        except Exception as e:
+            logger.error(f"error, {e}")
+
+
+def update_no_money(data):
+    """更新未收付，添加已收付明细"""
+    url = f'{base_path}/api/v5/app/entry/data/update'
+    add_url = f'{base_path}/api/v5/app/entry/data/create'
+    del_url = f'{base_path}/api/v1/app/{pay_app}/entry/{uncollected_id}/data_delete'
+    for i in data:
+        if 'amount' == i:
+            continue
+        for j in data[i]['data']:
+            if j['fukuanshiyou'] == '驾驶员履约服务费':
+                continue
+            info = {
+                "app_id": pay_app,
+                "entry_id": uncollected_id,
+                "data_id": j['_id'],
+                "is_start_trigger": True,
+                "is_start_workflow": True,
+                "data": {
+                    "pay": {"value": j['pay']},
+                    "no_money": {"value": j['no_money']}
+                }
+            }
+            req_tool_jdy(url, info)
+            now_time = get_last_8_hour()
+            # 新增已收付明细
+            if 'flag' in j.keys() and float(j['flag_m']):
+                if not j['flag_m'] or not float(j['flag_m']):
+                    continue
+                fs_p = j['fs_p']['dept_no'] if j['fs_p'] else ""
+                add_info = {
+                    "app_id": pay_app,
+                    "entry_id": received_id,
+                    "is_start_trigger": True,
+                    "is_start_workflow": True,
+                    "data": {
+                        "code": {"value": j['code']}, "type": {"value": "收款"},
+                            "fukuanshiyou": {"value": j['fukuanshiyou']}, "month": {"value": j['month']},
+                            "month1": {"value": j['month1']},"yewubiaodanmingcheng": {"value": j['yewubiaodanmingcheng']},
+                            "yewubiaodanbianma": {"value": j['yewubiaodanbianma']},
+                            "sijixingming": {"value": j['sijixingming']},"shfid": {"value": j['shfid']},
+                            "id_card": {"value": j['id_card']},"pay_time": {"value": now_time},
+                            "company_jc": {"value": j['company_jc']}, "xd": {"value": j['xd']},
+                            "sijisuozaigongsi": {"value": j['sijisuozaigongsi']}, "fs": {"value": j['fs']},
+                            "license_plate": {"value": j['license_plate']}, "money": {"value": j['money']},
+                            "pay": {"value": j['flag_m']}, "hz_month": {"value": j['hz_month']}, "zjin_status": {"value": "未结算"},
+                            "fs_p": {"value": fs_p}, "shgid": {"value": j['shgid']}, "mode_type": {"value": j['mode_type']},
+                            "sy": {"value": "个人账户抵扣"},"ys": {"value": j['ys']},"lydunjiao": {"value": j['lydunjiao']},"bill_type": {"value": j['bill_type']},
+                            "car_dept": {"value": j['car_dept']},"contract_num": {"value": j['contract_num']}
+                    }
+                }
+                logger.info(f"新增已收========={add_info}")
+                req_tool_jdy(add_url, add_info)
+            logger.info(f"删除========={j['pay']}, {j['money']}" )
+            if j['sijixingming'] == '姓名':
+                logger.info(f"j,{j}")
+            if j['pay'] == j['money']:
+                # 未收付已清缴，删除未收付明细
+                del_info = {
+                    "data_id": j["_id"],
+                    "is_start_trigger": True
+                }
+                # 新增劳务佣金
+                # today_str = datetime.datetime.now().strftime('%Y-%m-%d')
+                # if j['name'] == "承包金":
+                #     add_info = {
+                #         "app_id": pay_app,
+                #         "entry_id": uncollected_id,
+                #         "is_start_trigger": True,
+                #         "is_start_workflow": True,
+                #         "data": {
+                #             "type": {"value": "付款"},
+                #             "name": {"value": "劳务佣金"}, "month": {"value": j['month']},
+                #             "yewubiaodanmingcheng": {"value": "已收付表单"},
+                #             "yewubiaodanbianma": {"value": j['yewubiaodanbianma']},
+                #             "sijixingming": {"value": j['sijixingming']},
+                #             "id_card": {"value": j['id_card']},
+                #             "sijisuozaigongsi": {"value": j['sijisuozaigongsi']}, "fs": {"value": j['fs']},
+                #             "_widget_1704357037281": {"value": j['_widget_1704357037281']},
+                #             "abbreviation": {"value": j['abbreviation']}, "money": {"value": j['lw_money']},
+                #             "pay": {"value": 0}, "no_money": {"value": j['lw_money']},
+                #             "fs_p": {"value": fs_p}, "status1": {"value": "已清缴"},
+                #             "lw_money": {"value": j['lw_money']},"hz_month": {"value": j['hz_month']},
+                #             "ys": {"value": today_str}, "month1": {"value": j['month1']},
+                #             "bill_type": {"value": "劳务"}
+                #         }
+                #     }
+                #     req_tool_jdy(add_url, add_info)
+                logger.info(f"===========================未收付已清缴，删除未收付明细===============================")
+                req_tool_jdy(del_url, del_info)
+
+def update_lw_no_money(data):
+    """更新未收付，添加已收付明细"""
+    url = f'{base_path}/api/v5/app/entry/data/update'
+    add_url = f'{base_path}/api/v5/app/entry/data/create'
+    del_url = f'{base_path}/api/v1/app/{lw_pay_app}/entry/{lw_uncollected_id}/data_delete'
+    for i in data:
+        if 'amount' == i:
+            continue
+        for j in data[i]['data']:
+            if j['fukuanshiyou'] != '驾驶员履约服务费':
+                continue
+            info = {
+                "app_id": lw_pay_app,
+                "entry_id": lw_uncollected_id,
+                "data_id": j['_id'],
+                "is_start_trigger": True,
+                "is_start_workflow": True,
+                "data": {
+                    "pay": {"value": j['pay']},
+                    "no_money": {"value": j['no_money']},
+                }
+            }
+            logger.info(f"更新未收{info}")
+            req_tool_jdy(url, info)
+            # 新增已收付明细
+            if 'flag' in j.keys() and float(j['flag_m']):
+                if not j['flag_m'] or not float(j['flag_m']):
+                    continue
+                fs_p = j['fs_p']['dept_no'] if j['fs_p'] else ""
+                add_info = {
+                    "app_id": lw_pay_app,
+                    "entry_id": lw_received_id,
+                    "is_start_trigger": True,
+                    "is_start_workflow": True,
+                    "data": {
+                        "code": {"value": j['code']}, "type": {"value": "收款"},
+                        "fukuanshiyou": {"value": j['fukuanshiyou']}, "month": {"value": j['month']},
+                        "yewubiaodanmingcheng": {"value": j['yewubiaodanmingcheng']},
+                        "yewubiaodanbianma": {"value": j['yewubiaodanbianma']},
+                        "sijixingming": {"value": j['sijixingming']},
+                        "sijishenfenzhenghao": {"value": j['id_card']},"shfid": {"value": j['shfid']},
+                        "sijisuozaigongsi": {"value": j['sijisuozaigongsi']}, "fs": {"value": j['fs']},
+                        "license_plate": {"value": j['car_num']},"abbreviation": {"value": j['abbreviation']}, "jine": {"value": j['money']},
+                        "pay": {"value": j['flag_m']},
+                        "fs_p": {"value": fs_p},  "status1": {"value": "已清缴"},
+                         "status": {"value": "已收款"}, "month1": {"value": j['month1']}
+                    }
+                }
+                logger.info(f"=====================新增已收付{data}")
+                req_tool_jdy(add_url, add_info)
+            logger.info(f"删除========={j['pay']}, {j['money']}")
+            if j['sijixingming'] == '姓名':
+                logger.info(f"j,{j}")
+            if j['pay'] == j['money']:
+                # 未收付已清缴，删除未收付明细
+                del_info = {
+                    "data_id": j["_id"],
+                    "is_start_trigger": True
+                }
+                logger.info(f"===========================履约服务费已清缴，删除未收付明细===============================")
+                req_tool_jdy(del_url, del_info)
+
+
+def update_info(cz, _balcace, balance, user_info):
+    # 余额 = 累计充值金额-累计抵扣金额
+    # 本次抵扣=本次充值+本次余额-剩余金额
+    di = cz + balance - _balcace
+    """更新个人账户余额"""
+    # if pay_amount:
+    #     # 支付完有剩余余额可直接更新
+    #     amount = pay_amount
+    # else:
+    #     # 查询未收付历史数据
+    #     details = query_pay_details(user_info['user']['username'])
+    #     amount = details['amount']
+    #     amount *= -1
+    url = f'{base_path}/api/v5/app/entry/data/list'
+    info = {
+        "app_id": pay_app,
+        "entry_id": accout_id,
+        "filter": {"rel": "and",
+                   "cond": [
+                       {
+                           "field": "id_card",
+                           "method": "eq",
+                           "value": [user_info['id']]
+                       },
+                       {
+                           "field": "date",
+                           "method": "empty"
+                       },
+                   ]}
+    }
+    # 查询个人余额账户表 没有新增，有更新
+    res = req_tool_jdy(url, info)
+    if res['data']:
+        # 更新
+        url = f'{base_path}/api/v5/app/entry/data/update'
+        pay = res['data'][-1]['pay'] + cz
+        di = di + (res['data'][-1]['deduction'] if res['data'][-1]['deduction'] else 0)
+        amount = pay - di  # 累计充值-累计抵扣
+        info = {
+            "app_id": pay_app,
+            "entry_id": accout_id,
+            "data_id": res['data'][-1]["_id"],
+            "is_start_workflow": True,
+            "is_start_trigger": True,
+            "data": {
+                "pay": {"value": pay}, "balance": {"value": amount},
+                "deduction": {"value": di}
+            }
+        }
+    else:
+        # 新增
+        amount = cz - di  # 本次充值-本次抵扣
+        if 'name' in user_info.keys():
+            name = user_info['name']
+        else:
+            name = ""
+        url = f'{base_path}/api/v5/app/entry/data/create'
+        info = {
+            "app_id": pay_app,
+            "entry_id": accout_id,
+            "is_start_workflow": True,
+            "is_start_trigger": True,
+            "data": {
+                "id_card": {"value": user_info['id']},
+                "name": {"value": name},
+                "pay": {"value": cz},
+                "deduction": {"value": di},
+                "account_type": {"value": "预收款"},
+                "balance": {"value": amount},
+                "jg": {"value": user_info['jg']},
+                "mode_type": {"value": "DP"},
+                "car_dept": {"value": "DP"},
+                "fs": {"value": user_info['fs']},
+                "fsfz": {"value": user_info['fsfz']},
+                "hphm": {"value": user_info['hphm']},
+                "shfid": {"value": user_info['shfid']},
+            }
+        }
+    req_tool_jdy(url, info)
+
+
+def add_payment(data, type=None):
+    lock.acquire()
+    logger.info(f"开始========data{data}, type{type}")
+    # user = get_user_info(data['id'])
+    # 充值成功后 回写充值明细
+    now_month = datetime.datetime.now().strftime("%Y-%m")
+    now_time = get_last_8_hour()
+    url = f'{base_path}/api/v5/app/entry/data/create'
+    if not type:
+        # 查询是否已存在
+        query_url = f'{base_path}/api/v5/app/entry/data/list'
+        _query_tmp = {
+            "app_id": pay_app,
+            "entry_id": pay_details_id,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "transactionid",
+                        "method": "eq",
+                        "value": [data['transaction_id']]
+                    }
+                ]
+            }
+        }
+        res = req_tool_jdy(query_url, _query_tmp)
+        if res['data']:
+            logger.info(f"充值明细已存在========{data['transaction_id']}")
+            lock.release()
+            return     
+        info = {
+            "app_id": pay_app,
+            "entry_id": pay_details_id,
+            "is_start_workflow": True,
+            "is_start_trigger": True,
+            "data": {
+                "id_card": {"value": data['id']}, "name": {"value": data['name']},
+                    "charge_amount": {"value": data['pay_amount']}, "pay_type": {"value": data['pay_type']},
+                    "coll_type": {"value": "网银"}, "month": {"value": now_month},"fsfz": {"value": data['fsfz']},
+                    "jg": {"value": data['jg']}, "fs": {"value": data['fs']},"mode_type": {"value": "DP"},"collect_pos": {"value": data['jg']},
+                    "hphm": {"value": data['hphm']},"shfid":{"value": data['shfid']},"zhtype": {"value": "预收款"},"type": {"value": "转入"},
+                    "charge_time": {"value": now_time}, "transactionid": {"value": data['transaction_id']}
+            }
+        }
+        if data['fsfz']:
+            info['data']["fsfz"] = {"value": data['fsfz']}
+        req_tool_jdy(url, info)
+    details = query_dp_pay_details(data['id'])
+    dates = list(details.keys())
+    dates.sort()
+    dates.remove('amount')
+    pay_amount = data['pay_amount']
+    # 查询余额
+    balance = querydpUser(data['id'])
+    pay_amount += balance['balance']
+    if pay_amount <= 0:
+        logger.info(f"余额为0结束========{data}")
+        lock.release()
+        return
+    logger.info(f"执行承包金add_payment{data}")
+    next_month = (datetime.datetime.now().date() - relativedelta(months=-1)).strftime("%Y-%m")
+    if next_month in dates:
+        _tmp = details[next_month]['data']
+        _tmp = sorted(_tmp, key=lambda x: x['sort'])
+        for i in _tmp:
+            if pay_amount:
+                i['flag'] = 1
+            if '承包金' in i['fukuanshiyou']:
+                # 承包金实际需要缴纳的
+                if pay_amount < i['money'] - i['pay']:
+                    # 修改 i['pay'] 充值金额，推送修改
+                    i['pay'] += pay_amount
+                    i['no_money'] = i['money'] - i['pay']
+                    i['flag_m'] = pay_amount
+                    pay_amount = 0
+                else:
+                    pay_amount -= (i['money'] - i['pay'])
+                    i['flag_m'] = (i['money'] - i['pay'])
+                    i['pay'] = i['money']
+                    i['no_money'] = 0
+
+            else:
+                if i['money'] != i['pay']:
+                    # 根据未支付的金额，扣除总金额
+                    df = i['money'] - i['pay']
+                    if pay_amount < df:
+                        # 修改 i['pay'] 充值金额，推送修改
+                        i['pay'] += pay_amount
+                        i['no_money'] = i['money'] - i['pay']
+                        i['flag_m'] = pay_amount
+                        pay_amount = 0
+                    else:
+                        pay_amount -= df
+                        i['pay'] = i['money']
+                        i['no_money'] = 0
+                        i['flag_m'] = df
+    if now_month in dates:
+        _tmp = details[now_month]['data']
+        _tmp = sorted(_tmp, key=lambda x: x['sort'])
+        for i in _tmp:
+            if pay_amount:
+                i['flag'] = 1
+            if '承包金' in i['fukuanshiyou']:
+                # 承包金实际需要缴纳的
+                if pay_amount < i['money'] - i['pay']:
+                    # 修改 i['pay'] 充值金额，推送修改
+                    i['pay'] += pay_amount
+                    i['no_money'] = i['money'] - i['pay']
+                    i['flag_m'] = pay_amount
+                    pay_amount = 0
+                else:
+                    pay_amount -= (i['money'] - i['pay'])
+                    i['flag_m'] = (i['money'] - i['pay'])
+                    i['pay'] = i['money']
+                    i['no_money'] = 0
+
+            else:
+                if i['money'] != i['pay']:
+                    # 根据未支付的金额，扣除总金额
+                    df = i['money'] - i['pay']
+                    if pay_amount < df:
+                        # 修改 i['pay'] 充值金额，推送修改
+                        i['pay'] += pay_amount
+                        i['no_money'] = i['money'] - i['pay']
+                        i['flag_m'] = pay_amount
+                        pay_amount = 0
+                    else:
+                        pay_amount -= df
+                        i['pay'] = i['money']
+                        i['no_money'] = 0
+                        i['flag_m'] = df
+    for i in dates:
+        if i == next_month or i == now_month:
+            continue
+        _tmp = details[i]['data']
+        _tmp = sorted(_tmp, key=lambda x: x['sort'])
+        for i in _tmp:
+            if pay_amount:
+                i['flag'] = 1
+            if '承包金' in i['fukuanshiyou']:
+                # 承包金实际需要缴纳的
+                if pay_amount < i['money'] - i['pay']:
+                    # 修改 i['pay'] 充值金额，推送修改
+                    i['pay'] += pay_amount
+                    i['no_money'] = i['money'] - i['pay']
+                    i['flag_m'] = pay_amount
+                    pay_amount = 0
+
+                else:
+                    pay_amount -= (i['money'] - i['pay'])
+                    i['flag_m'] = (i['money'] - i['pay'])
+                    i['pay'] = i['money']
+                    i['no_money'] = 0
+
+            else:
+                if i['money'] != i['pay']:
+                    # 根据未支付的金额，扣除总金额
+                    df = i['money'] - i['pay']
+                    if pay_amount < df:
+                        # 修改 i['pay'] 充值金额，推送修改
+                        i['pay'] += pay_amount
+                        i['no_money'] = i['money'] - i['pay']
+                        i['flag_m'] = pay_amount
+                        pay_amount = 0
+
+                    else:
+                        pay_amount -= df
+                        i['pay'] = i['money']
+                        i['no_money'] = 0
+                        i['flag_m'] = df
+                        # 根据抵扣规则，更新未支付的数据，将清缴数据新增至已收付明细
+    logger.info(f"更新未收付{details}")
+    update_no_money(details)
+    # 未收付更新完后，更新个人账户余额update_info
+    logger.info(f"更新个人账户余额update_info")
+    update_info(data['pay_amount'], pay_amount, balance['balance'], data)
+    lock.release()
+    logger.info(f"结束========")
+
+def add_payment_lw(data, type=None):
+    lock.acquire()
+    logger.info(f"开始========{data}")
+    logger.info(f"data{data}, type{type}")
+    # user = get_user_info(data['id'])
+    # 充值成功后 回写充值明细
+    now_month = datetime.datetime.now().strftime("%Y-%m")
+    now_time = get_last_8_hour()
+    url = f'{base_path}/api/v5/app/entry/data/create'
+    if not type:
+        # 查询是否已存在
+        query_url = f'{base_path}/api/v5/app/entry/data/list'
+        _query_tmp = {
+            "app_id": lw_pay_app,
+            "entry_id": lw_pay_details_id,
+            "filter": {
+                "rel": "and",
+                "cond": [
+                    {
+                        "field": "transactionid",
+                        "method": "eq",
+                        "value": [data['transaction_id']]
+                    }
+                ]
+            }
+        }
+        res = req_tool_jdy(query_url, _query_tmp)
+        if res['data']:
+            logger.info(f"充值明细已存在========{data}"['transaction_id'])
+            lock.release()
+            return
+        info = {
+            "app_id": lw_pay_app,
+            "entry_id": lw_pay_details_id,
+            "is_start_workflow": True,
+            "is_start_trigger": True,
+            "data": {
+                "id_card": {"value": data['id']}, "name": {"value": data['name']},
+                "price": {"value": data['pay_amount']}, "pay_type": {"value": data['pay_type']},
+                "month": {"value": now_month},"shfid": {"value": data['shfid']},
+                "jg": {"value": data['jg']}, "fs": {"value": data['fs']},
+                "hphm": {"value": data['hphm']},"pay_status": {"value": "付款成功"},
+                "charge_time": {"value": now_time}, "transactionid": {"value": data['transaction_id']}
+            }
+        }
+        if data['fsfz']:
+            info['data']["fsfz"] = {"value": data['fsfz']}
+        req_tool_jdy(url, info)
+    details = query_lw_pay_details(data['id'])
+    dates = list(details.keys())
+    dates.sort()
+    dates.remove('amount')
+    pay_amount = float(data['pay_amount'])
+
+    logger.info(f"执行履约服务费add_payment{data}")
+    next_month = (datetime.datetime.now().date() - relativedelta(months=-1)).strftime("%Y-%m")
+    # if next_month in dates:
+    #     _tmp = details[next_month]['data']
+    #     _tmp = sorted(_tmp, key=lambda x: x['sort'])
+    #     for i in _tmp:
+    #         if pay_amount:
+    #             i['flag'] = 1
+    #         if '承包金' in i['name']:
+    #             # 承包金实际需要缴纳的
+    #             if pay_amount < i['money'] - i['pay']:
+    #                 # 修改 i['pay'] 充值金额，推送修改
+    #                 i['pay'] += pay_amount
+    #                 i['no_money'] = i['money'] - i['pay']
+    #                 i['flag_m'] = pay_amount
+    #                 pay_amount = 0
+    #             else:
+    #                 pay_amount -= (i['money'] - i['pay'])
+    #                 i['flag_m'] = (i['money'] - i['pay'])
+    #                 i['pay'] = i['money']
+    #                 i['no_money'] = 0
+    #
+    #         else:
+    #             if i['money'] != i['pay']:
+    #                 # 根据未支付的金额，扣除总金额
+    #                 df = i['money'] - i['pay']
+    #                 if pay_amount < df:
+    #                     # 修改 i['pay'] 充值金额，推送修改
+    #                     i['pay'] += pay_amount
+    #                     i['no_money'] = i['money'] - i['pay']
+    #                     i['flag_m'] = pay_amount
+    #                     pay_amount = 0
+    #                 else:
+    #                     pay_amount -= df
+    #                     i['pay'] = i['money']
+    #                     i['no_money'] = 0
+    #                     i['flag_m'] = df
+    # if now_month in dates:
+    #     _tmp = details[now_month]['data']
+    #     _tmp = sorted(_tmp, key=lambda x: x['sort'])
+    #     for i in _tmp:
+    #         if pay_amount:
+    #             i['flag'] = 1
+    #         if '承包金' in i['name']:
+    #             # 承包金实际需要缴纳的
+    #             if pay_amount < i['money'] - i['pay']:
+    #                 # 修改 i['pay'] 充值金额，推送修改
+    #                 i['pay'] += pay_amount
+    #                 i['no_money'] = i['money'] - i['pay']
+    #                 i['flag_m'] = pay_amount
+    #                 pay_amount = 0
+    #             else:
+    #                 pay_amount -= (i['money'] - i['pay'])
+    #                 i['flag_m'] = (i['money'] - i['pay'])
+    #                 i['pay'] = i['money']
+    #                 i['no_money'] = 0
+    #
+    #         else:
+    #             if i['money'] != i['pay']:
+    #                 # 根据未支付的金额，扣除总金额
+    #                 df = i['money'] - i['pay']
+    #                 if pay_amount < df:
+    #                     # 修改 i['pay'] 充值金额，推送修改
+    #                     i['pay'] += pay_amount
+    #                     i['no_money'] = i['money'] - i['pay']
+    #                     i['flag_m'] = pay_amount
+    #                     pay_amount = 0
+    #                 else:
+    #                     pay_amount -= df
+    #                     i['pay'] = i['money']
+    #                     i['no_money'] = 0
+    #                     i['flag_m'] = df
+    for i in dates:
+        # if i == next_month or i == now_month:
+        #     continue
+        _tmp = details[i]['data']
+        _tmp = sorted(_tmp, key=lambda x: x['sort'])
+        for i in _tmp:
+            if pay_amount:
+                i['flag'] = 1
+    #         if '承包金' in i['name']:
+    #             # 承包金实际需要缴纳的
+    #             if pay_amount < i['money'] - i['pay']:
+    #                 # 修改 i['pay'] 充值金额，推送修改
+    #                 i['pay'] += pay_amount
+    #                 i['no_money'] = i['money'] - i['pay']
+    #                 i['flag_m'] = pay_amount
+    #                 pay_amount = 0
+    #
+    #             else:
+    #                 pay_amount -= (i['money'] - i['pay'])
+    #                 i['flag_m'] = (i['money'] - i['pay'])
+    #                 i['pay'] = i['money']
+    #                 i['no_money'] = 0
+    #
+    #         else:
+            if i['money'] != i['pay']:
+                # 根据未支付的金额，扣除总金额
+                df = i['money'] - i['pay']
+                if pay_amount < df:
+                    # 修改 i['pay'] 充值金额，推送修改
+                    logger.info(f"==========================================================支付小于待付")
+                    i['pay'] += pay_amount
+                    i['no_money'] = i['money'] - i['pay']
+                    i['flag_m'] = pay_amount
+                    pay_amount = 0
+                else:
+                    logger.info(f"==========================================================支付不小于待付")
+                    pay_amount -= df
+                    i['pay'] = i['money']
+                    i['no_money'] = 0
+                    i['flag_m'] = df
+                        # 根据抵扣规则，更新未支付的数据，将清缴数据新增至已收付明细
+    logger.info(f"更新未收付{details}")
+    update_lw_no_money(details)
+    lock.release()
+    logger.info(f"结束========")
+
+def rsa_long_decrypt(priv_key, msg, length=256):
+    """
+    1024bit的证书用128，2048bit证书用256位
+    """
+    try:
+        privobj = PKCS1_v1_5.new(priv_key)
+        res = []
+        b64_msg = base64.b64decode(msg)
+        for i in range(0, len(b64_msg), length):
+            chunk = b64_msg[i:i + length]
+            decrypted_chunk = privobj.decrypt(chunk, 'xyz').decode('GBK')
+            res.append(decrypted_chunk)
+        logger.info(f"解密回调完成：{res}")
+    except Exception as e:
+        logger.error(f"解密回调失败：{e}")
+        return jsonify(error=str(e)), 500
+    return "".join(res)
+
+def decode_notify_data(res_json):
+    try:
+        ciphertext = res_json['resource']['ciphertext']
+        nonce = res_json['resource']['nonce']
+        associated_data = res_json['resource']['associated_data']
+        cipher = AES.new(v3_SECRET.encode(), AES.MODE_GCM, nonce=nonce.encode())
+        cipher.update(associated_data.encode())
+        en_data = b64decode(ciphertext.encode('utf-8'))
+        auth_tag = en_data[-16:]
+        _en_data = en_data[:-16]
+        plaintext = cipher.decrypt_and_verify(_en_data, auth_tag)
+        decodejson = json.loads(plaintext.decode())
+    except Exception as e:
+        logger.error(f"解密回调失败：{e}")
+        return None
+    return decodejson
+
+
+def get_wx_token():
+    url = f'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpid}&corpsecret={SECRET}'
+    res = req_tool_vx(url, flag=1)
+    return res['access_token']
+
+def get_zy_wx_token():
+    url = f'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={zy_corpid}&corpsecret={ZY_SECRET}'
+    res = req_tool_vx(url, flag=1)
+    return res['access_token']
+
+
+def query_wx_fj_info(id):
+    """查询企微中的附加信息"""
+    token = get_wx_token()
+    url = f'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token={token}&userid={id}'
+    res = req_tool_vx(url, flag=1)
+    val = ""
+    logger.info(f"query_wx_fj_info,res{res},id{id}")
+    for i in res['extattr']['attrs']:
+        if i['name'] == '附加信息':
+            val = i['value']
+    return val
+
+
+def query_wx_userid(code):
+    """查询企微中的userid"""
+    token = get_wx_token()
+    url = f'https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token={token}&code={code}'
+    res = req_tool_vx(url, flag=1)
+    return res['userid']
+
+def query_zy_wx_fj_info(id):
+    """查询企微中的附加信息"""
+    token = get_zy_wx_token()
+    url = f'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token={token}&userid={id}'
+    res = req_tool_vx(url, flag=1)
+    val = ""
+    logger.info(f"query_wx_fj_info{res},{id}")
+    for i in res['extattr']['attrs']:
+        if i['name'] == '附加信息':
+            val = i['value']
+    return val
+
+
+def query_zy_wx_userid(code):
+    """查询企微中的userid"""
+    token = get_zy_wx_token()
+    url = f'https://qyapi.weixin.qq.com/cgi-bin/auth/getuserinfo?access_token={token}&code={code}'
+    res = req_tool_vx(url, flag=1)
+    return res['userid']
-- 
2.49.0