微信支付优化

.idea/workspace.xml

@@ -4,8 +4,8 @@
     <list default="true" id="5f8773c2-5a61-46f3-970b-7546734b3165" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/ISepAccountService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/ISepAccountService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
@@ -65,17 +65,18 @@
     <session id="-865853374">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="1" />
+          <entry key="project.closed" value="2" />
           <entry key="project.open.time.1" value="1" />
+          <entry key="project.open.time.107" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.4" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="16" />
-          <entry key="java" value="100" />
+          <entry key="java" value="110" />
           <entry key="md" value="1" />
           <entry key="xml" value="1" />
           <entry key="yml" value="1" />
@@ -84,7 +85,7 @@
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="16" />
-          <entry key="JAVA" value="100" />
+          <entry key="JAVA" value="110" />
           <entry key="Markdown" value="1" />
           <entry key="XML" value="1" />
           <entry key="YAML" value="1" />
@@ -93,13 +94,13 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="7" />
-          <entry key="java" value="13422" />
+          <entry key="java" value="13619" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="13422" />
+          <entry key="JAVA" value="13619" />
           <entry key="PLAIN_TEXT" value="7" />
           <entry key="XML" value="2" />
         </counts>
@@ -107,7 +108,104 @@
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="208">
+              <caret line="27" selection-start-line="27" selection-end-line="27" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2771">
+              <caret line="193" column="63" selection-start-line="193" selection-start-column="46" selection-end-line="193" selection-end-column="63" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/ISepAccountService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5984">
+              <caret line="381" column="13" selection-start-line="381" selection-start-column="13" selection-end-line="381" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepRecord.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="11" column="26" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+              <folding>
+                <element signature="e#1437#1438#0" expanded="true" />
+                <element signature="e#1466#1467#0" expanded="true" />
+                <element signature="e#1511#1512#0" expanded="true" />
+                <element signature="e#1547#1548#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="187">
+              <caret line="11" column="27" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepReceiverHelp.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="5" column="28" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -173,19 +271,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/core/Time.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/core/TimeUnit.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/core/KtjTimeUnit.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/ISepAccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/WeChatPayServersApplication.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ClientCustomSSL.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttps.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttpsUtls.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttpsUtil.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/ISepAccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java" />
       </list>
     </option>
   </component>
@@ -243,6 +341,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
@@ -256,7 +355,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -266,7 +364,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587804789236" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587826833331" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../../ctkcloud" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -390,15 +488,16 @@
       <workItem from="1585967285544" duration="5041000" />
       <workItem from="1587170301385" duration="35482000" />
       <workItem from="1587260239263" duration="2607000" />
-      <workItem from="1587798812965" duration="5955000" />
+      <workItem from="1587798812965" duration="13105000" />
+      <workItem from="1588592079304" duration="1176000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="53961000" />
+    <option name="totallyTimeSpent" value="62287000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="754" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="754" extended-state="7" />
     <layout>
       <window_info id="Image Layers" order="0" />
       <window_info id="UI Designer" order="1" />
@@ -406,7 +505,7 @@
       <window_info id="Capture Tool" order="3" />
       <window_info id="Web" order="4" side_tool="true" />
       <window_info id="Designer" order="5" />
-      <window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.21406959" />
+      <window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.27836612" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="0" weight="0.32580644" />
       <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
@@ -416,8 +515,8 @@
       <window_info anchor="bottom" id="Version Control" order="5" />
       <window_info anchor="bottom" id="Spring" order="6" />
       <window_info anchor="bottom" id="Message" order="7" />
-      <window_info anchor="bottom" id="Run" order="8" weight="0.5193548" />
-      <window_info anchor="bottom" id="Debug" order="9" visible="true" weight="0.38225806" />
+      <window_info active="true" anchor="bottom" id="Run" order="8" visible="true" weight="0.17258064" />
+      <window_info anchor="bottom" id="Debug" order="9" weight="0.38225806" />
       <window_info anchor="bottom" id="Find" order="10" weight="0.32419354" />
       <window_info anchor="bottom" id="Cvs" order="11" weight="0.25" />
       <window_info anchor="bottom" id="TODO" order="12" />
@@ -541,9 +640,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="136">
           <caret line="8" column="23" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="23" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -565,11 +661,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
           <caret line="34" column="48" selection-start-line="34" selection-start-column="25" selection-end-line="34" selection-end-column="48" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#156#157#0" expanded="true" />
-            <element signature="e#232#233#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -614,10 +705,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
           <caret line="2" column="27" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="27" />
-          <folding>
-            <element signature="e#542#543#0" expanded="true" />
-            <element signature="e#568#569#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -675,9 +762,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="272">
           <caret line="16" column="14" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="14" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -685,16 +769,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="4" column="29" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="29" />
-          <folding>
-            <element signature="e#380#381#0" expanded="true" />
-            <element signature="e#412#413#0" expanded="true" />
-            <element signature="e#462#463#0" expanded="true" />
-            <element signature="e#504#505#0" expanded="true" />
-            <element signature="e#899#900#0" expanded="true" />
-            <element signature="e#945#946#0" expanded="true" />
-            <element signature="e#1059#1060#0" expanded="true" />
-            <element signature="e#1099#1100#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -705,13 +779,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepRecord.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="26" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/impl/client/DefaultHttpClient.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -789,16 +856,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttpsUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="61" column="40" lean-forward="true" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/enums/RegisterStatus.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -806,16 +863,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="49">
-          <caret line="251" column="103" selection-start-line="251" selection-start-column="84" selection-end-line="251" selection-end-column="103" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/WeChatPayServersApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
@@ -837,69 +884,91 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepReceiverHelp.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttpsUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="629">
+          <caret line="61" column="40" lean-forward="true" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-748">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="208">
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
           <folding>
-            <element signature="e#1437#1438#0" expanded="true" />
-            <element signature="e#1466#1467#0" expanded="true" />
-            <element signature="e#1511#1512#0" expanded="true" />
-            <element signature="e#1547#1548#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="2771">
+          <caret line="193" column="63" selection-start-line="193" selection-start-column="46" selection-end-line="193" selection-end-column="63" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/ISepAccountService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="14" column="34" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
+        <state relative-caret-position="187">
+          <caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1054">
-          <caret line="182" column="15" selection-start-line="182" selection-start-column="15" selection-end-line="182" selection-end-column="15" />
+        <state relative-caret-position="5984">
+          <caret line="381" column="13" selection-start-line="381" selection-start-column="13" selection-end-line="381" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#23490#23491#0" expanded="true" />
-            <element signature="e#23537#23538#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="66" column="37" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="37" />
+        <state relative-caret-position="187">
+          <caret line="11" column="26" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1437#1438#0" expanded="true" />
+            <element signature="e#1466#1467#0" expanded="true" />
+            <element signature="e#1511#1512#0" expanded="true" />
+            <element signature="e#1547#1548#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="27" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepReceiverHelp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/com/wechat/controller/sepAccount/SepAccountController.java

@@ -26,6 +26,7 @@ public class SepAccountController extends BaseController {
     @Autowired
     private ISepAccountService iSepAccountService;
 
+
     @ApiOperation(value = "新增分账人接口")
     @PostMapping("addSepReceive")
     public RespWrapper<Boolean> addSepReceive(@RequestBody UserSepReceiver userSepReceiver){
@@ -63,9 +64,23 @@ public class SepAccountController extends BaseController {
             return RespWrapper.makeFailResp("微信支付订单号不能为空");
         return iSepAccountService.sepAccountHandle(handleHelp);
     }
+
+    /**
+     *         FINISHED 分账成功
+     *    case "ACCEPTED":
+     *        return RespWrapper.makeFailResp("受理成功");
+     *    case "PROCESSING":
+     *        return RespWrapper.makeFailResp("处理中");
+     *    case "FINISHED":
+     *        return RespWrapper.makeSuccessResp(true);
+     *    case "CLOSED":
+     *        return RespWrapper.makeFailResp("处理失败，已关单");
+     * @param outOrderNo
+     * @return
+     */
     @ApiOperation(value = "根据outOrderNo编号查询分账结果")
     @GetMapping("findSepAccountResult/{outOrderNo}")
-    public RespWrapper<Boolean> findSepAccountResult(@PathVariable("outOrderNo")String outOrderNo){
+    public RespWrapper<String> findSepAccountResult(@PathVariable("outOrderNo")String outOrderNo){
         return iSepAccountService.findSepAccountResult(outOrderNo);
     }
     @ApiOperation(value = "完结分账")

src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java

@@ -7,7 +7,15 @@ public class SepUserHandleHelp {
 
     private Integer amount;//分账金额 分账时使用，如果不传使用支付金额
     private String transactionId;//微信支付编号
+   /* private String outOrderNo;//分账编号
 
+    public String getOutOrderNo() {
+        return outOrderNo;
+    }
+
+    public void setOutOrderNo(String outOrderNo) {
+        this.outOrderNo = outOrderNo;
+    }*/
 
     public String getTransactionId() {
         return transactionId;

src/main/java/com/wechat/service/sepAccount/ISepAccountService.java

@@ -16,7 +16,7 @@ public interface ISepAccountService {
 
     RespWrapper<String> sepAccountHandle(SepUserHandleHelp handleHelp);
 
-    RespWrapper<Boolean> findSepAccountResult(String outOrderNo);
+    RespWrapper<String> findSepAccountResult(String outOrderNo);
 
     RespWrapper<Boolean> noSepAccountHandle(SepUserHandleHelp handleHelp);
 

src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java

@@ -361,14 +361,30 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
         return RespWrapper.makeSuccessResp(outOrderNo);
     }
 
+    /**
+     *  switch (status) {
+     *              FINISHED
+     *             case "ACCEPTED":
+     *                 return RespWrapper.makeFailResp("受理成功");
+     *             case "PROCESSING":
+     *                 return RespWrapper.makeFailResp("处理中");
+     *             case "FINISHED":
+     *                 return RespWrapper.makeSuccessResp(true);
+     *             case "CLOSED":
+     *                 return RespWrapper.makeFailResp("处理失败，已关单");
+     *         }
+     *         return RespWrapper.makeFailResp("未知原因：" + status);
+     * @param outOrderNo
+     * @return
+     */
     @Override
-    public RespWrapper<Boolean> findSepAccountResult(String outOrderNo) {
+    public RespWrapper<String> findSepAccountResult(String outOrderNo) {
         KtjSepRecord record = new KtjSepRecord();
         record.setOutOrderNo(outOrderNo);
         record = sepRecordDao.templateOne(record);
         if (record == null) return RespWrapper.makeFailResp("订单编号错误");
         if("FINISHED".equals(record.getStatus()))
-            return RespWrapper.makeSuccessResp(true);
+            return RespWrapper.makeSuccessResp("FINISHED");
         Map<String, Object> condition = new HashMap<>();
         condition.put("sub_mch_id", record.getSubMchId());//sub_mchId
         condition.put("transaction_id", record.getTransactionId());
@@ -376,17 +392,11 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
         RespWrapper<Map<String, Object>> ck = doWxRequest(SepAccountEnums.查询分账结果, condition, false);
         if (!ck.isSuccess()) return RespWrapper.makeFailResp(ck.getMsg());
         String status = (String) ck.getData().get("status");
-        switch (status) {
-            case "ACCEPTED":
-                return RespWrapper.makeFailResp("受理成功");
-            case "PROCESSING":
-                return RespWrapper.makeFailResp("处理中");
-            case "FINISHED":
-                return RespWrapper.makeSuccessResp(true);
-            case "CLOSED":
-                return RespWrapper.makeFailResp("处理失败，已关单");
+        if(!record.getStatus().equals(status)){
+            record.setStatus(status);
+            sepRecordDao.updateTemplateById(record);
         }
-        return RespWrapper.makeFailResp("未知原因：" + status);
+        return RespWrapper.makeSuccessResp(status);
     }
 
     @Override