修改分账接口，增加分账金额

.idea/workspace.xml

@@ -3,12 +3,10 @@
   <component name="ChangeListManager">
     <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/common/util/ClientCustomSSL.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ClientCustomSSL.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttpsUtil.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/pay/impl/WeChatPayJsapiServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/service/pay/impl/WeChatPayJsapiServiceImpl.java" 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/service/sepAccount/impl/SepAccountServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -67,15 +65,17 @@
     <session id="-865853374">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
+          <entry key="project.closed" value="1" />
+          <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.17" value="1" />
           <entry key="project.open.time.4" value="1" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.opened" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="class" value="8" />
-          <entry key="java" value="82" />
+          <entry key="class" value="16" />
+          <entry key="java" value="100" />
           <entry key="md" value="1" />
           <entry key="xml" value="1" />
           <entry key="yml" value="1" />
@@ -83,8 +83,8 @@
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="8" />
-          <entry key="JAVA" value="82" />
+          <entry key="CLASS" value="16" />
+          <entry key="JAVA" value="100" />
           <entry key="Markdown" value="1" />
           <entry key="XML" value="1" />
           <entry key="YAML" value="1" />
@@ -93,13 +93,13 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="7" />
-          <entry key="java" value="11578" />
+          <entry key="java" value="13422" />
           <entry key="xml" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="11578" />
+          <entry key="JAVA" value="13422" />
           <entry key="PLAIN_TEXT" value="7" />
           <entry key="XML" value="2" />
         </counts>
@@ -107,132 +107,7 @@
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <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="410">
-              <caret line="63" column="37" lean-forward="true" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
-              <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="153">
-              <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" 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="360">
-              <caret line="420" column="48" selection-start-line="420" selection-start-column="48" selection-end-line="420" selection-end-column="48" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="method#handleSepUserData#0;class#SepAccountServiceImpl#0" />
-                <element signature="method#initSepUser#0;class#SepAccountServiceImpl#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="162">
-              <caret line="28" column="29" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="29" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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="241">
-              <caret line="36" column="16" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="16" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#6482#6483#0" expanded="true" />
-                <element signature="e#6517#6518#0" expanded="true" />
-                <element signature="e#6561#6562#0" expanded="true" />
-                <element signature="e#6601#6602#0" expanded="true" />
-                <element signature="e#6639#6640#0" expanded="true" />
-                <element signature="e#6677#6678#0" expanded="true" />
-                <element signature="e#6727#6728#0" expanded="true" />
-                <element signature="e#6773#6774#0" expanded="true" />
-                <element signature="e#6807#6808#0" expanded="true" />
-                <element signature="e#6844#6845#0" expanded="true" />
-                <element signature="e#6889#6890#0" expanded="true" />
-                <element signature="e#6933#6934#0" expanded="true" />
-                <element signature="e#6975#6976#0" expanded="true" />
-                <element signature="e#7017#7018#0" expanded="true" />
-                <element signature="e#7075#7076#0" expanded="true" />
-                <element signature="e#7129#7130#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/impl/client/HttpClients.class">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/impl/client/HttpClientBuilder.class">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="453">
-              <caret line="149" column="36" selection-start-line="149" selection-start-column="36" selection-end-line="149" selection-end-column="36" />
-              <folding>
-                <element signature="e#6971#6972#0" expanded="true" />
-                <element signature="e#7017#7018#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/impl/client/CloseableHttpClient.class">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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">
-              <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/conn/ssl/SSLConnectionSocketFactory.class">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="109" column="11" selection-start-line="109" selection-start-column="11" selection-end-line="109" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -247,6 +122,8 @@
     <findStrings>
       <find>HMAC-SHA256</find>
       <find>SepAccountEnums</find>
+      <find>handleSepUserData</find>
+      <find>addReceiver</find>
     </findStrings>
     <dirStrings>
       <dir>F:\康体佳\微信支付\comtika-we-chat-pay</dir>
@@ -276,7 +153,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/WeChatUploadUtil.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/service/upload/impl/UploadServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/UserSepReceiver.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/parameter/ProjectConstant.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaWeChatUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/util/HMACSHA256.java" />
@@ -289,13 +165,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepReceiverHelp.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/dao/sepAccount/SepUserDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/common/enums/RegisterStatus.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/SepAccountHandleHelp.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserQueryHelp.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/dao/sepAccount/SepRecordDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/dao/sepAccount/SepUserRecordDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUserRecord.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java" />
         <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" />
@@ -303,12 +177,15 @@
         <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/service/sepAccount/impl/SepAccountServiceImpl.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/common/util/ComtikaHttpsUtil.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/service/sepAccount/impl/SepAccountServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -366,7 +243,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -374,96 +251,12 @@
               <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
               <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-              <item name="common" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-              <item name="sepAccount" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="sepAccount" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="comtika-we-chat-pay" type="b2602c69:ProjectViewProjectNode" />
-              <item name="comtika-we-chat-pay" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="wechat" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="sepAccount" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -473,8 +266,8 @@
     <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="1587261897742" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1587804789236" />
+    <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" />
     <property name="settings.editor.selected.configurable" value="Errors" />
@@ -500,7 +293,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.SepAccountTest">
+  <component name="RunManager" selected="Spring Boot.WeChatPayServersApplication">
     <configuration name="ComtikaHttpsUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.wechat.common.util.ComtikaHttpsUtil" />
       <module name="WeChatPayProject" />
@@ -575,10 +368,10 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Spring Boot.WeChatPayServersApplication" />
         <item itemvalue="Application.SepAccountTest" />
         <item itemvalue="Application.SepAccountServiceImpl" />
         <item itemvalue="Application.ComtikaHttpsUtil" />
-        <item itemvalue="Spring Boot.WeChatPayServersApplication" />
         <item itemvalue="Application.UploadServiceImpl" />
       </list>
     </recent_temporary>
@@ -596,16 +389,16 @@
       <workItem from="1585659008051" duration="4876000" />
       <workItem from="1585967285544" duration="5041000" />
       <workItem from="1587170301385" duration="35482000" />
-      <workItem from="1587260239263" duration="1636000" />
+      <workItem from="1587260239263" duration="2607000" />
+      <workItem from="1587798812965" duration="5955000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47035000" />
+    <option name="totallyTimeSpent" value="53961000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="754" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Image Layers" order="0" />
       <window_info id="UI Designer" order="1" />
@@ -613,18 +406,18 @@
       <window_info id="Capture Tool" order="3" />
       <window_info id="Web" order="4" side_tool="true" />
       <window_info id="Designer" order="5" />
-      <window_info content_ui="combo" id="Project" order="6" weight="0.3827534" />
+      <window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.21406959" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" order="0" weight="0.06451613" />
+      <window_info anchor="bottom" id="Terminal" order="0" weight="0.32580644" />
       <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="2" weight="0.61612904" />
+      <window_info anchor="bottom" id="Messages" order="2" weight="0.5596774" />
       <window_info anchor="bottom" id="Java Enterprise" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="4" show_stripe_button="false" />
       <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.18387097" />
-      <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
+      <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 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" />
@@ -634,11 +427,11 @@
       <window_info anchor="right" id="Database" order="2" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info anchor="right" id="Theme Preview" order="4" />
-      <window_info anchor="right" id="Bean Validation" order="5" />
-      <window_info anchor="right" id="Palette" order="6" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="7" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="5" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
+      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32980332" />
     </layout>
     <layout-to-restore>
       <window_info id="Image Layers" order="0" />
@@ -649,15 +442,15 @@
       <window_info id="Designer" order="5" />
       <window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.3827534" />
       <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" order="0" weight="0.06451613" />
+      <window_info anchor="bottom" id="Terminal" order="0" visible="true" weight="0.32580644" />
       <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="2" weight="0.61612904" />
+      <window_info anchor="bottom" id="Messages" order="2" weight="0.5596774" />
       <window_info anchor="bottom" id="Java Enterprise" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="4" show_stripe_button="false" />
       <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.18387097" />
+      <window_info anchor="bottom" id="Run" order="8" weight="0.0" />
       <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
       <window_info anchor="bottom" id="Find" order="10" weight="0.32419354" />
       <window_info anchor="bottom" id="Cvs" order="11" weight="0.25" />
@@ -681,52 +474,41 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="debuggerHistoryManager">
+    <expressions id="evaluateExpression">
+      <expression>
+        <expression-string>hr.getWxAccount()</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>private KtjSepUser initSepUser(SepReceiverHelp hr,String groupName,String subMchId){</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>delDBUser</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>s.getAccount()</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>tmpGroupName</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>hr</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+    </expressions>
+  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/resources/SQL config/pay/weChatPayJsapi.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="85">
-            <caret line="5" column="24" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="24" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/dao/merchant/MiniProgramDetailsDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/dao/merchant/MerchantDetailsDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="9" column="62" lean-forward="true" selection-start-line="9" selection-start-column="62" selection-end-line="9" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/entity/register/RegisterData.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>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/entity/merchant/KtjMerchantDetails.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="152" column="22" lean-forward="true" selection-start-line="152" selection-start-column="22" selection-end-line="152" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/entity/merchant/WeChatMerchant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="13" column="27" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/controller/WeChatPayJsapiController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-119">
@@ -745,11 +527,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-154">
           <caret line="48" column="69" lean-forward="true" selection-start-line="48" selection-start-column="69" selection-end-line="48" selection-end-column="69" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1147#1148#0" expanded="true" />
-            <element signature="e#1190#1191#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -784,13 +561,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/conn/ssl/SSLContextBuilder.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="93" column="29" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/parameter/ProjectConstant.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
@@ -818,12 +588,12 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
           <caret line="104" column="21" selection-start-line="104" selection-start-column="21" selection-end-line="104" selection-end-column="21" />
         </state>
       </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/util/WeChatUtil.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -839,20 +609,6 @@
         </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/dao/sepAccount/SepUserDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepAccountHandleHelp.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/enums/SepAccountEnums.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -865,13 +621,6 @@
         </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="119">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/pay/impl/WeChatPayJsapiServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -879,17 +628,6 @@
         </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="-340">
-          <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#2014#2015#0" expanded="true" />
-            <element signature="e#2062#2063#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/dao/order/KtjJsapiOrderDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
@@ -904,13 +642,6 @@
         </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="-102">
-          <caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/client/utils/DateUtils.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
@@ -950,13 +681,6 @@
         </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="102">
-          <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/KtjSepUserRecord.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
@@ -988,119 +712,190 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/entity/sepAccount/help/SepUserHandleHelp.java">
+    <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="476">
-          <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
-          <folding>
-            <element signature="e#776#777#0" expanded="true" />
-            <element signature="e#805#806#0" expanded="true" />
-            <element signature="e#850#851#0" expanded="true" />
-            <element signature="e#886#887#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="187">
+          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/controller/sepAccount/SepAccountController.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/impl/client/CloseableHttpClient.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
+        </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/HttpClientBuilder.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="453">
+          <caret line="149" column="36" selection-start-line="149" selection-start-column="36" selection-end-line="149" selection-end-column="36" />
+        </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/HttpClients.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/conn/ssl/SSLContexts.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="372">
+          <caret line="45" column="28" lean-forward="true" selection-start-line="45" selection-start-column="18" selection-end-line="45" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/conn/ssl/SSLContextBuilder.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-714">
+          <caret line="93" column="28" selection-start-line="93" selection-start-column="11" selection-end-line="93" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://H:/JAVA/jdk1.8.0_77/jre/lib/rt.jar!/javax/net/ssl/SSLContextSpi.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://H:/JAVA/jdk1.8.0_77/jre/lib/jsse.jar!/sun/security/ssl/SSLContextImpl.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="585" column="42" selection-start-line="585" selection-start-column="30" selection-end-line="585" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://H:/JAVA/jdk1.8.0_77/jre/lib/rt.jar!/javax/net/ssl/SSLContext.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="205">
+          <caret line="35" column="57" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://H:/JAVA/jdk1.8.0_77/jre/lib/rt.jar!/javax/net/ssl/HostnameVerifier.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="63" column="37" lean-forward="true" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
+        <state relative-caret-position="68">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/conn/ssl/SSLConnectionSocketFactory.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="129" column="59" selection-start-line="129" selection-start-column="49" selection-end-line="129" selection-end-column="59" />
+        </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/service/sepAccount/ISepAccountService.java">
+    <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="153">
-          <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
+        <state relative-caret-position="170">
+          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/service/sepAccount/impl/SepAccountServiceImpl.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="360">
-          <caret line="420" column="48" selection-start-line="420" selection-start-column="48" selection-end-line="420" selection-end-column="48" />
+        <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" />
-            <element signature="method#handleSepUserData#0;class#SepAccountServiceImpl#0" />
-            <element signature="method#initSepUser#0;class#SepAccountServiceImpl#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/conn/ssl/SSLConnectionSocketFactory.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/WeChatPayServersApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="109" column="11" selection-start-line="109" selection-start-column="11" selection-end-line="109" selection-end-column="11" />
+        <state relative-caret-position="34">
+          <caret line="4" column="66" lean-forward="true" selection-start-line="4" selection-start-column="66" selection-end-line="4" selection-end-column="66" />
         </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">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/dao/sepAccount/SepUserDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+        <state relative-caret-position="102">
+          <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
         </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/CloseableHttpClient.class">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
+        <state relative-caret-position="100">
+          <caret line="101" selection-start-line="101" selection-end-line="101" />
         </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/HttpClientBuilder.class">
+    <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="453">
-          <caret line="149" column="36" selection-start-line="149" selection-start-column="36" selection-end-line="149" selection-end-column="36" />
+        <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">
+      <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>
+    <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="-748">
+          <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#6971#6972#0" expanded="true" />
-            <element signature="e#7017#7018#0" 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="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/org/apache/http/impl/client/HttpClients.class">
+    <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="102">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/wechat/common/util/ComtikaHttpsUtil.java">
+    <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>
+      </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="162">
-          <caret line="28" column="29" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="29" />
+        <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" />
           <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/service/sepAccount/impl/SepAccountTest.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="241">
-          <caret line="36" column="16" lean-forward="true" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="16" />
+        <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" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#6482#6483#0" expanded="true" />
-            <element signature="e#6517#6518#0" expanded="true" />
-            <element signature="e#6561#6562#0" expanded="true" />
-            <element signature="e#6601#6602#0" expanded="true" />
-            <element signature="e#6639#6640#0" expanded="true" />
-            <element signature="e#6677#6678#0" expanded="true" />
-            <element signature="e#6727#6728#0" expanded="true" />
-            <element signature="e#6773#6774#0" expanded="true" />
-            <element signature="e#6807#6808#0" expanded="true" />
-            <element signature="e#6844#6845#0" expanded="true" />
-            <element signature="e#6889#6890#0" expanded="true" />
-            <element signature="e#6933#6934#0" expanded="true" />
-            <element signature="e#6975#6976#0" expanded="true" />
-            <element signature="e#7017#7018#0" expanded="true" />
-            <element signature="e#7075#7076#0" expanded="true" />
-            <element signature="e#7129#7130#0" expanded="true" />
           </folding>
         </state>
       </provider>

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

@@ -42,7 +42,7 @@ public class SepAccountController extends BaseController {
             if(StringUtil.isEmpty(help.getSepRate()))
                 return RespWrapper.makeFailResp("分账费率不能为空");
             Float fl = Float.valueOf(help.getSepRate());
-            num = (int) (fl.floatValue()*100);
+            num += (int) (fl.floatValue()*100);
         }
         if(num > 30) return RespWrapper.makeFailResp("分账订单金额不能超过30%");
         return iSepAccountService.addSepReceive(userSepReceiver);

src/main/java/com/wechat/entity/sepAccount/KtjSepUser.java

@@ -7,6 +7,7 @@ import org.beetl.sql.core.annotatoin.AutoID;
  */
 public class KtjSepUser {
 
+
     @AutoID
     private Integer id;
     /**
@@ -59,6 +60,15 @@ public class KtjSepUser {
     private String subMchId;//商户id
     private String groupName;//分组
     private String sepRate;//分账比例
+    private Boolean status;// 是否停用，停用后查询不出来
+
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
 
     public Integer getId() {
         return id;

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

@@ -1,5 +1,6 @@
 package com.wechat.entity.sepAccount.help;
 
+
 import java.util.List;
 
 /**
@@ -30,7 +31,4 @@ public class UserSepReceiver {
         return subMchId;
     }
 
-    public void setSubMchId(String subMchId) {
-        this.subMchId = subMchId;
-    }
 }

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

@@ -51,7 +51,11 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
 
     @Override
     public RespWrapper<Boolean> addSepReceive(UserSepReceiver userSepReceiver) {
-        // 1、校验该商户是否已经添加分账功能
+        if (userSepReceiver.getGroupName() == null)
+            userSepReceiver.setGroupName(DEFAULT_GROUP_NAME);
+        // 这里一套太难啦，修改为 只向微信添加访问人的数据
+        return doFadAddSepReceive(userSepReceiver);
+        /*// 1、校验该商户是否已经添加分账功能
         RespWrapper<Boolean> checkSepFun = checkSepFunction(userSepReceiver.getSubMchId());
         if(!checkSepFun.isSuccess()) return checkSepFun;
         // 2、查询所有已经添加的分账用户
@@ -76,12 +80,12 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
         if(groupSepUserMap.isEmpty()){
             handleSepUserData(saveDBAndWx,saveDB,accountMap,userSepReceiver,groupName);
         }else {
-            /**
+            *//**
              * 如果分组不为空
              * 1、新增的数据在分组中，则更新分组内对应的数据
              * 2、不在分组，并且在其他的分组中，需要新数据库
              * 3、不在分组，并且不在其他分组中，需新增数据库，并请求微信新增
-             */
+             *//*
             // 需要删除的数据为
             Map<String,SepReceiverHelp> tmpGroupName = new HashMap<>();
             userSepReceiver.getSepUserList().forEach(s->{
@@ -104,15 +108,19 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
             sepUserDao.insertBatch(saveDB);
         if(!saveDBAndWx.isEmpty()){
             for(KtjSepUser ktjSepUser:saveDBAndWx){
-                RespWrapper<Map<String, Object>> ck = addReceiver(ktjSepUser, userSepReceiver.getSubMchId());
-                if(!ck.isSuccess()) return RespWrapper.makeFailResp(ck.getMsg());
+                logger.info("需要调用微信添加接口方法:{}",ktjSepUser);
+                // todo
+                //RespWrapper<Map<String, Object>> ck = addReceiver(ktjSepUser, userSepReceiver.getSubMchId());
+                //if(!ck.isSuccess()) return RespWrapper.makeFailResp(ck.getMsg());
             }
             sepUserDao.insertBatch(saveDBAndWx);
         }
         if(!delWXUser.isEmpty()){
             for(KtjSepUser ktjSepUser:saveDBAndWx){
-                RespWrapper<Map<String, Object>> ck = delReceiver(ktjSepUser, userSepReceiver.getSubMchId());
-                if(!ck.isSuccess()) return RespWrapper.makeFailResp(ck.getMsg());
+                logger.info("需要调用微信删除接口方法:{}",ktjSepUser);
+                // todo
+                //RespWrapper<Map<String, Object>> ck = delReceiver(ktjSepUser, userSepReceiver.getSubMchId());
+                //if(!ck.isSuccess()) return RespWrapper.makeFailResp(ck.getMsg());
             }
         }
         delDBUser.forEach(s->{
@@ -123,7 +131,142 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
         saveDBAndWx.clear();
         delWXUser.clear();
         delDBUser.clear();
+        return RespWrapper.makeSuccessResp(true);*/
+    }
+
+    private RespWrapper<Boolean> doFadAddSepReceive(UserSepReceiver userSepReceiver) {
+        // 1、判断是否有分账能力
+        RespWrapper<Boolean> checkSepFun = checkSepFunction(userSepReceiver.getSubMchId());
+        if(!checkSepFun.isSuccess()) return checkSepFun;
+        // 查询该商户下配置的所有分账人
+        KtjSepUser user = new KtjSepUser();
+        user.setSubMchId(userSepReceiver.getSubMchId());
+        List<KtjSepUser> template = sepUserDao.template(user);
+        String groupName = userSepReceiver.getGroupName();
+        List<SepReceiverHelp> sepUserList = userSepReceiver.getSepUserList();
+        List<KtjSepUser> remoteWx = new ArrayList<>();
+        int size = sepUserList.size();
+        List<KtjSepUser> addDB = new ArrayList<>(size);
+        if(!template.isEmpty()){
+            Map<String,SepReceiverHelp> condition = new HashMap<>(size);
+            sepUserList.forEach(s->{condition.put(s.getWxAccount(),s);});
+            // 这里代表已经处理好的数据
+            Map<String,Boolean> handleData = new HashMap<>(size);// 这里是已经处理的数据
+            // 存在同组的数据时
+            List<KtjSepUser> collect = template.stream().filter(s -> groupName.equals(s.getGroupName())).collect(Collectors.toList());
+            // 相同组的数据已经处理完成
+            handleAlikeGroupData(collect,condition,handleData);
+            if(size == handleData.size()) return RespWrapper.makeSuccessResp(true);
+            // 不同组的数据
+            collect = template.stream().filter(s -> !groupName.equals(s.getGroupName())).collect(Collectors.toList());
+            //处理不同组的数据
+            handleNoLikeGroupData(addDB,collect,condition,handleData,groupName);
+            if(size != handleData.size()){
+                // 这里还有些需要调用微信
+                sepUserList.forEach(s->{
+                    if(!handleData.containsKey(s.getWxAccount())){
+                        KtjSepUser ktjSepUser = initSepUser(s, groupName, userSepReceiver.getSubMchId());
+                        addDB.add(ktjSepUser);
+                        remoteWx.add(ktjSepUser);
+                        handleData.put(s.getWxAccount(),true);
+                    }
+                });
+            }
+        }else {
+            sepUserList.forEach(s->{
+                KtjSepUser ktjSepUser = initSepUser(s, groupName, userSepReceiver.getSubMchId());
+                addDB.add(ktjSepUser);
+                remoteWx.add(ktjSepUser);
+            });
+        }
+        for(KtjSepUser ktjSepUser:remoteWx){
+            // logger.info("需要调用微信添加接口方法:{}",ktjSepUser);
+            // todo
+            RespWrapper<Map<String, Object>> ck = addReceiver(ktjSepUser, userSepReceiver.getSubMchId());
+            if(!ck.isSuccess()) return RespWrapper.makeFailResp(ck.getMsg());
+        }
+        if(!addDB.isEmpty()){
+            sepUserDao.insertBatch(addDB);
+        }
+        addDB.clear();
         return RespWrapper.makeSuccessResp(true);
+
+    }
+    //处理不同组的数据
+    private void  handleNoLikeGroupData(List<KtjSepUser> addDB,List<KtjSepUser> collect, Map<String, SepReceiverHelp> condition, Map<String, Boolean> handleData, String groupName) {
+        if(collect == null) return;
+        collect.forEach(s->{
+            // 已经处理的数据
+            if(handleData.containsKey(s.getAccount())) return;
+            if(condition.containsKey(s.getAccount())){
+                // 这里存在，需要复制
+                SepReceiverHelp help = condition.get(s.getAccount());
+                addDB.add(copySepUse(groupName,help,s));
+                handleData.put(s.getAccount(),true);//已经处理数据
+            }
+        });
+    }
+    private KtjSepUser copySepUse(String groupName,SepReceiverHelp help,KtjSepUser old){
+        KtjSepUser user = new KtjSepUser();
+        user.setStatus(true);
+        user.setSepRate(help.getSepRate());
+        user.setAccount(help.getWxAccount());
+        user.setGroupName(groupName);
+        user.setName(help.getNickName());
+        user.setRelationType(old.getRelationType());
+        user.setSubMchId(old.getSubMchId());
+        user.setType(old.getType());
+        user.setCustomRelation(old.getCustomRelation());
+        return user;
+    }
+
+    private KtjSepUser initSepUser(SepReceiverHelp hr,String groupName,String subMchId){
+        KtjSepUser kt = new KtjSepUser();
+        kt.setAccount(hr.getWxAccount());
+        kt.setSepRate(hr.getSepRate());
+        kt.setGroupName(groupName);
+        kt.setName(hr.getNickName());
+        kt.setType("PERSONAL_WECHATID");
+        kt.setSubMchId(subMchId);
+        kt.setRelationType("DISTRIBUTOR");
+        kt.setStatus(true);
+        return kt;
+    }
+
+    // 处理相同组的数据
+    private void handleAlikeGroupData(List<KtjSepUser> collect,Map<String,SepReceiverHelp> condition,Map<String,Boolean> handleData){
+        if(collect == null)return;
+        // 处理同组数据
+        collect.forEach(s->{
+            String key = s.getAccount();
+            if (handleData.containsKey(key))
+                return;
+            // 如果是在同组，并且账号一样，判断费率是否一样
+            if (condition.containsKey(key)) {
+                boolean isUpdateDB = false;
+                SepReceiverHelp help = condition.get(key);
+                String newRate = help.getSepRate();
+                if (newRate.equals(s.getSepRate())) {
+                    // 费率一样，不用更新数据库
+                    if(!s.getStatus()){
+                        s.setStatus(true);
+                        isUpdateDB = true;
+                    }
+                }else {// 需要更新数据库
+                    s.setSepRate(newRate);
+                    s.setStatus(true);
+                    isUpdateDB = true;
+                }
+                if(isUpdateDB) sepUserDao.updateTemplateById(s);
+                handleData.put(key,true);//处理的数据
+            }else {
+                //这里是旧的数据，判断状态是否为false 如果为true 更新数据库
+                if(s.getStatus()){
+                    s.setStatus(false);
+                    sepUserDao.updateTemplateById(s);
+                }
+            }
+        });
     }
 
     @Override
@@ -134,6 +277,7 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
         String groupName = help.getGroupName();
         if(StringUtil.isEmpty(help.getGroupName())) groupName = DEFAULT_GROUP_NAME;
         KtjSepUser user = new KtjSepUser();
+        user.setStatus(true);
         user.setSubMchId(help.getSubMchId());
         user.setGroupName(groupName);
         List<KtjSepUser> template = sepUserDao.template(user);
@@ -360,19 +504,21 @@ public class SepAccountServiceImpl implements ISepAccountService, DisposableBean
             }
         }
     }
+    private KtjSepUser doInitSepUser(KtjSepUser ktjSepUser,SepReceiverHelp hr,String groupName,String subMchId){
+        // 第2种情况
+        if(ktjSepUser == null){
+            return initSepUser(hr,groupName,subMchId);
+        }else {
+            // 第1种情况
+            ktjSepUser.setGroupName(groupName);
+            ktjSepUser.setSepRate(hr.getSepRate());
+            ktjSepUser.setId(null);
+        }
+        return ktjSepUser;
+    }
+
 
 
-    private KtjSepUser initSepUser(SepReceiverHelp hr,String groupName,String subMchId){
-        KtjSepUser kt = new KtjSepUser();
-        kt.setName(hr.getWxAccount());
-        kt.setSepRate(hr.getSepRate());
-        kt.setGroupName(groupName);
-        kt.setName(hr.getNickName());
-        kt.setType("PERSONAL_WECHATID");
-        kt.setSubMchId(subMchId);
-        kt.setRelationType("DISTRIBUTOR");
-        return kt;
-    }
 
     // 获取其他分组的引用
     private Map<String, KtjSepUser> findWxAccountMap(List<KtjSepUser> template,String groupName) {