From ad0d323a813de28d95321cf254d39b44b4d5f7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=96=E5=8F=AB?= <392494244@qq.com>
Date: Thu, 2 Nov 2023 19:48:22 +0800
Subject: [PATCH] 1

---
 .gitignore                                  |   2 +-
 .idea/workspace.xml                         | 387 +++++++++++++++++++-
 application/common/logic/PayNotifyLogic.php |  77 ++--
 application/common/model/NoticeSetting.php  |  22 +-
 4 files changed, 424 insertions(+), 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3610fb..99cd4a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 /public/upgrade/*
 !/public/upgrade/version.json
 vendor/
-/.idea
\ No newline at end of file
+.idea
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8435669..16f8145 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4256ed8b-19a0-40ba-b9ef-b8e8a4c1f799" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/cxybn.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/cxybn.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/NoticeSetting.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/NoticeSetting.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -12,25 +12,126 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
     <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
     <execution>
       <executable />
     </execution>
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/behavior/Notice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="9" column="6" lean-forward="true" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
+            <state relative-caret-position="289">
+              <caret line="62" column="57" lean-forward="true" selection-start-line="62" selection-start-column="57" selection-end-line="62" selection-end-column="57" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/api/logic/LoginLogic.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="329">
+              <caret line="610" column="30" selection-start-line="610" selection-start-column="30" selection-end-line="610" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/server/WxMessageServer.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="337">
+              <caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/tags.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="525">
+              <caret line="54" column="34" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="637">
+              <caret line="130" column="15" lean-forward="true" selection-start-line="130" selection-start-column="15" selection-end-line="130" selection-end-column="15" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/model/OrderLog.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="329">
+              <caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/model/Order.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4336">
+              <caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/model/NoticeSetting.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="354">
+              <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/model/Pay.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="329">
+              <caret line="40" column="21" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/api/logic/OrderLogic.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="329">
+              <caret line="484" column="27" selection-start-line="484" selection-start-column="27" selection-end-line="484" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>https://api.weixin.qq.com/cgi-bin/message/template/send?</find>
+      <find>\think\Hook::add</find>
+      <find>\think\Hook::</find>
+      <find>sms_send</find>
+      <find>notice</find>
+      <find>cancel_order</find>
+      <find>余额</find>
+      <find>support</find>
+      <find>余额支付</find>
+    </findStrings>
+    <replaceStrings>
+      <replace />
+    </replaceStrings>
+    <dirStrings>
+      <dir>D:\phpstudy_pro\WWW\cxybn</dir>
+      <dir>D:\phpstudy_pro\WWW\cxybn\application</dir>
+    </dirStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -38,6 +139,8 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/application/common/model/NoticeSetting.php" />
+        <option value="$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php" />
       </list>
     </option>
   </component>
@@ -124,6 +227,24 @@
               <item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
               <item name="cxybn" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
+              <item name="cxybn" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
+              <item name="cxybn" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="cxybn" type="b2602c69:ProjectViewProjectNode" />
+              <item name="cxybn" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -159,25 +280,21 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1698048469265</updated>
-      <workItem from="1698048470415" duration="691000" />
+      <workItem from="1698048470415" duration="2404000" />
+      <workItem from="1698909025553" duration="3767000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="691000" />
+    <option name="totallyTimeSpent" value="6171000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Favorites" side_tool="true" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17857143" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18017058" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -185,10 +302,15 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Database" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Database Changes" order="8" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32917467" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Database" order="3" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -198,7 +320,234 @@
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
-          <caret line="9" column="6" lean-forward="true" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
+          <caret line="9" column="6" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/WechatMiniExpressSendSync.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-650">
+          <caret line="12" column="6" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/WechatMerchantTransfer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-661">
+          <caret line="34" column="6" selection-start-line="34" selection-start-column="6" selection-end-line="34" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/UserDistribution.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-811">
+          <caret line="27" column="6" selection-start-line="27" selection-start-column="6" selection-end-line="27" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/Update.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="14">
+          <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/TeamEnd.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1000">
+          <caret line="37" column="6" selection-start-line="37" selection-start-column="6" selection-end-line="37" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/OrderFinish.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-611">
+          <caret line="38" column="6" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/DistributionOrder.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-825">
+          <caret line="38" column="6" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/command/Crontab.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-361">
+          <caret line="30" column="6" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/Notice.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="24" column="6" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/Sms.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/WeChat.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="24" column="6" selection-start-line="24" selection-start-column="6" selection-end-line="24" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/Subscribe.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="34" column="36" selection-start-line="34" selection-start-column="36" selection-end-line="34" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/logic/SubscribeLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="27" column="27" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/controller/NoticeSetting.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="489">
+          <caret line="44" column="58" selection-start-line="44" selection-start-column="58" selection-end-line="44" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/logic/NoticeSettingLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="44" column="21" lean-forward="true" selection-start-line="44" selection-start-column="21" selection-end-line="44" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/model/Client_.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-261">
+          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/OfficialAccount/TemplateMessage/Client.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="337">
+          <caret line="136" column="20" selection-start-line="136" selection-start-column="20" selection-end-line="136" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/tags.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/Order.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="58" column="40" lean-forward="true" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/server/BalancePayServer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="263">
+          <caret line="29" column="22" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/logic/PaymentLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="587">
+          <caret line="102" column="42" selection-start-line="102" selection-start-column="42" selection-end-line="102" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/logic/OrderRefundLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="65" column="24" lean-forward="true" selection-start-line="65" selection-end-line="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/logic/OrderLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="484" column="27" selection-start-line="484" selection-start-column="27" selection-end-line="484" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/tags.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="525">
+          <caret line="54" column="34" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/server/WxMessageServer.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="337">
+          <caret line="56" column="20" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/logic/LoginLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="610" column="30" selection-start-line="610" selection-start-column="30" selection-end-line="610" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/behavior/Notice.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="62" column="57" lean-forward="true" selection-start-line="62" selection-start-column="57" selection-end-line="62" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/model/OrderLog.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="36" column="10" selection-start-line="36" selection-start-column="10" selection-end-line="36" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/model/NoticeSetting.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="354">
+          <caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/model/Order.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4336">
+          <caret line="38" column="10" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/model/Pay.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="40" column="21" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/logic/PayNotifyLogic.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="637">
+          <caret line="130" column="15" lean-forward="true" selection-start-line="130" selection-start-column="15" selection-end-line="130" selection-end-column="15" />
         </state>
       </provider>
     </entry>
diff --git a/application/common/logic/PayNotifyLogic.php b/application/common/logic/PayNotifyLogic.php
index 91806fd..38e7985 100644
--- a/application/common/logic/PayNotifyLogic.php
+++ b/application/common/logic/PayNotifyLogic.php
@@ -64,7 +64,7 @@ class PayNotifyLogic
         $order_model = new Order();
         $order = $order_model
             ->with('order_goods')
-            ->where('order_sn',$order_sn)
+            ->where('order_sn', $order_sn)
             ->find();
 
         //增加会员消费累计额度
@@ -73,7 +73,6 @@ class PayNotifyLogic
         $user->save();
 
 
-
         $order->pay_status = Pay::ISPAID;
         $order->pay_time = $time;
         $order->order_status = Order::STATUS_WAIT_DELIVERY;
@@ -83,7 +82,7 @@ class PayNotifyLogic
         $order->save();
 
         //扣除库存
-        $deduct_type = ConfigServer::get('trading','deduct_type', 1);
+        $deduct_type = ConfigServer::get('trading', 'deduct_type', 1);
         if ($deduct_type == 0) {
             //扣除库存,增加销量
             OrderGoodsLogic::decStock($order['order_goods']);
@@ -99,12 +98,12 @@ class PayNotifyLogic
         );
 
         //拼团订单,更新拼团信息
-        if ($order['order_type'] == Order::TEAM_ORDER){
+        if ($order['order_type'] == Order::TEAM_ORDER) {
             TeamLogic::updateTeam($order['id']);
         }
 
         // 普通订单参与分销
-        if ($order['order_type'] == Order::NORMAL_ORDER){
+        if ($order['order_type'] == Order::NORMAL_ORDER) {
             // 生成分销订单
             DistributionOrderGoodsLogic::add($order['id']);
 
@@ -122,30 +121,40 @@ class PayNotifyLogic
             'scene' => NoticeSetting::ORDER_PAY_NOTICE,
         ]);
 
+        // 余额支付的话  发送微信模板消息
+        if ($order->pay_way == Pay::BALANCE_PAY) {
+
+            Hook::listen('notice', [
+                'user_id' => $user['id'],
+                'order_id' => $order['id'],
+                'scene' => NoticeSetting::MONEY_PAY_NOTICE,
+            ]);
+
+        }
 
         //短信通知
         Hook::listen('sms_send', [
-            'key'       => NoticeSetting::ORDER_PAY_NOTICE,
-            'mobile'    => $order->mobile,
-            'user_id'   => $user->id,
-            'params'    => [
-                'nickname'      => $user->nickname,
-                'order_sn'      => $order->order_sn,
-                'order_amount'  => $order->order_amount,
-                'time'          => date('Y-m-d H:i', strtotime($order->create_time)),
-                'total_num'     => $order->total_num.'件',
-                'goods_name'    => omit_str(($order->order_goods[0]['goods_name'] ?? '商品'), 8)
+            'key' => NoticeSetting::ORDER_PAY_NOTICE,
+            'mobile' => $order->mobile,
+            'user_id' => $user->id,
+            'params' => [
+                'nickname' => $user->nickname,
+                'order_sn' => $order->order_sn,
+                'order_amount' => $order->order_amount,
+                'time' => date('Y-m-d H:i', strtotime($order->create_time)),
+                'total_num' => $order->total_num . '件',
+                'goods_name' => omit_str(($order->order_goods[0]['goods_name'] ?? '商品'), 8)
             ]
         ]);
 
         $order_contact_mobile = ConfigServer::get('order_message', 'order_contact_mobile');
         //平台短信通知
-        if($order_contact_mobile) {
-            Hook::listen('sms_send',[
-                'key'       => NoticeSetting::USER_PAID_NOTICE_PLATFORM,
-                'mobile'    => $order_contact_mobile,
-                'params'    => [
-                    'order_sn'      => $order['order_sn'],
+        if ($order_contact_mobile) {
+            Hook::listen('sms_send', [
+                'key' => NoticeSetting::USER_PAID_NOTICE_PLATFORM,
+                'mobile' => $order_contact_mobile,
+                'params' => [
+                    'order_sn' => $order['order_sn'],
                 ],
             ]);
         }
@@ -153,50 +162,52 @@ class PayNotifyLogic
         // 赠送成长值和积分
         Hook::listen('give_reward', [
             'order_id' => $order['id'],
-            'scene'    => 1, //1=下单支付场景
+            'scene' => 1, //1=下单支付场景
         ]);
 
         // 钩子-记录足迹(下单结算)
         Hook::listen('footprint', [
-            'type'       => Footprint::place_order,
-            'user_id'    => $user['id'],
+            'type' => Footprint::place_order,
+            'user_id' => $user['id'],
             'foreign_id' => $order['id'], //订单ID
             'total_money' => $order['order_amount'] //订单应付金额
         ]);
 
         //打印订单
         Hook::listen('printer', [
-            'order_id'       => $order['id'],
+            'order_id' => $order['id'],
         ]);
 
     }
+
     /**
      * note 充值回调
      * create_time 2020/10/26 18:53
      */
-    private static function recharge($order_sn,$extra = []){
+    private static function recharge($order_sn, $extra = [])
+    {
         $new = time();
-        $order = Db::name('recharge_order')->where(['order_sn'=>$order_sn])->find();
+        $order = Db::name('recharge_order')->where(['order_sn' => $order_sn])->find();
         $update_data['pay_time'] = $new;
         $update_data['pay_status'] = Pay::ISPAID;
         if (isset($extra['transaction_id'])) {
             $update_data['transaction_id'] = $extra['transaction_id'];
         }
-        Db::name('recharge_order')->where(['id'=>$order['id']])->update($update_data);
+        Db::name('recharge_order')->where(['id' => $order['id']])->update($update_data);
         $user = User::get($order['user_id']);
-        $total_money = $order['order_amount']+$order['give_money'];
+        $total_money = $order['order_amount'] + $order['give_money'];
         $total_integral = $order['give_integral'];
         $user->user_money = ['inc', $total_money];
         $user->user_integral = ['inc', $total_integral];
         $user->user_growth = ['inc', $order['give_growth']];
-        $user->total_recharge_amount = ['inc',$total_money];
+        $user->total_recharge_amount = ['inc', $total_money];
         $user->save();
         //记录余额
-        $total_money > 0 && AccountLogLogic::AccountRecord($user->id,$total_money,1, AccountLog::recharge_money);
+        $total_money > 0 && AccountLogLogic::AccountRecord($user->id, $total_money, 1, AccountLog::recharge_money);
         //记录积分
-        $total_integral > 0 && AccountLogLogic::AccountRecord($user->id,$total_integral,1, AccountLog::recharge_give_integral);
+        $total_integral > 0 && AccountLogLogic::AccountRecord($user->id, $total_integral, 1, AccountLog::recharge_give_integral);
         //记录成长值
-        $order['give_growth'] > 0 &&AccountLogLogic::AccountRecord($user->id,$order['give_growth'],1, AccountLog::recharge_give_growth);
+        $order['give_growth'] > 0 && AccountLogLogic::AccountRecord($user->id, $order['give_growth'], 1, AccountLog::recharge_give_growth);
     }
 
 }
\ No newline at end of file
diff --git a/application/common/model/NoticeSetting.php b/application/common/model/NoticeSetting.php
index 6c6db91..69985fa 100644
--- a/application/common/model/NoticeSetting.php
+++ b/application/common/model/NoticeSetting.php
@@ -49,6 +49,8 @@ class NoticeSetting extends Model
 
 
     //通知会员
+    const MONEY_PAY_NOTICE = 99;//余额变动
+
     const ORDER_PAY_NOTICE = 100;//订单已支付
     const ORDER_DELIVERY_NOTICE = 101;//订单已发货
     const PLATFORM_PASS_REFUND_NOTICE = 102;//平台通过售后退款通知
@@ -69,7 +71,6 @@ class NoticeSetting extends Model
     const AFTER_SALE_NOTICE_PLATFORM = 201;//会员发起售后退款通知
 
 
-
     //订单相关场景
     const ORDER_SCENE = [
         self::ORDER_PAY_NOTICE,
@@ -133,7 +134,6 @@ class NoticeSetting extends Model
     ];
 
 
-
     /**
      * Notes: 获取场景描述
      * @param $state
@@ -170,16 +170,16 @@ class NoticeSetting extends Model
     /**
      * Notes: 根据场景获取跳转地址
      * @param $scene
-     * @author 段誉(2021/4/27 17:01)
      * @return array
+     * @author 段誉(2021/4/27 17:01)
      */
     public static function getPathByScene($scene, $extra_id)
     {
         $page = '/pages/index/index'; // 小程序主页路径
         $url = '/mobile/pages/index/index'; // 公众号主页路径
         if (in_array($scene, self::ORDER_SCENE)) {
-            $url = '/mobile/pages/order_details/order_details?id='.$extra_id;
-            $page = '/pages/order_details/order_details?id='.$extra_id;
+            $url = '/mobile/pages/order_details/order_details?id=' . $extra_id;
+            $page = '/pages/order_details/order_details?id=' . $extra_id;
         }
         return ['url' => $url, 'page' => $page];
     }
@@ -189,8 +189,8 @@ class NoticeSetting extends Model
      * Notes: 场景名称
      * @param $value
      * @param $data
-     * @author 段誉(2021/4/26 16:56)
      * @return array|mixed|string
+     * @author 段誉(2021/4/26 16:56)
      */
     public function getSceneAttr($value, $data)
     {
@@ -202,8 +202,8 @@ class NoticeSetting extends Model
      * Notes: 场景变量
      * @param $value
      * @param $data
-     * @author 段誉(2021/4/26 17:07)
      * @return mixed
+     * @author 段誉(2021/4/26 17:07)
      */
     public function getVariableAttr($value, $data)
     {
@@ -215,8 +215,8 @@ class NoticeSetting extends Model
      * Notes: 系统消息
      * @param $value
      * @param $data
-     * @author 段誉(2021/4/26 17:18)
      * @return array|mixed
+     * @author 段誉(2021/4/26 17:18)
      */
     public function getSystemNoticeAttr($value, $data)
     {
@@ -227,8 +227,8 @@ class NoticeSetting extends Model
      * Notes: 短信消息
      * @param $value
      * @param $data
-     * @author 段誉(2021/4/26 17:25)
      * @return array|mixed
+     * @author 段誉(2021/4/26 17:25)
      */
     public function getSmsNoticeAttr($value, $data)
     {
@@ -240,8 +240,8 @@ class NoticeSetting extends Model
      * Notes: 公众号消息
      * @param $value
      * @param $data
-     * @author 段誉(2021/4/26 17:25)
      * @return array|mixed
+     * @author 段誉(2021/4/26 17:25)
      */
     public function getOaNoticeAttr($value, $data)
     {
@@ -252,8 +252,8 @@ class NoticeSetting extends Model
      * Notes: 小程序消息
      * @param $value
      * @param $data
-     * @author 段誉(2021/4/26 17:25)
      * @return array|mixed
+     * @author 段誉(2021/4/26 17:25)
      */
     public function getMnpNoticeAttr($value, $data)
     {