diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a6cb2f7..55ee847 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,6 +4,8 @@ <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> </list> <ignored path="$PROJECT_DIR$/target/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -32,81 +34,61 @@ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="122"> - <caret line="226" column="40" lean-forward="true" selection-start-line="226" selection-start-column="40" selection-end-line="226" selection-end-column="40" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="322"> - <caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> + <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="194"> - <caret line="39" column="13" lean-forward="false" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" /> + <state relative-caret-position="368"> + <caret line="226" column="13" lean-forward="false" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> + <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="283"> - <caret line="460" column="55" lean-forward="true" selection-start-line="460" selection-start-column="55" selection-end-line="460" selection-end-column="55" /> + <state relative-caret-position="-575"> + <caret line="71" column="55" lean-forward="true" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> + <file leaf-file-name="IoAccountController.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="148"> - <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="13" selection-end-column="57" /> + <state relative-caret-position="240"> + <caret line="30" column="53" lean-forward="true" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="IOAccountTask.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java"> + <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1449"> - <caret line="82" column="16" lean-forward="false" selection-start-line="82" selection-start-column="16" selection-end-line="82" selection-end-column="65" /> + <state relative-caret-position="292"> + <caret line="62" column="56" lean-forward="true" selection-start-line="62" selection-start-column="56" selection-end-line="62" selection-end-column="56" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> + <file leaf-file-name="AccountCheck.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="574"> - <caret line="81" column="0" lean-forward="true" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" /> + <state relative-caret-position="552"> + <caret line="37" column="32" lean-forward="true" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"> + <file leaf-file-name="IOAccountServiceImpl.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="433"> - <caret line="77" column="75" lean-forward="false" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="75" /> + <state relative-caret-position="608"> + <caret line="99" column="44" lean-forward="true" selection-start-line="99" selection-start-column="44" selection-end-line="99" selection-end-column="44" /> <folding /> </state> </provider> @@ -210,7 +192,6 @@ <option value="$PROJECT_DIR$/src/main/java/userio/task/IOAccountCheck.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" /> - <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" /> <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" /> @@ -219,12 +200,13 @@ <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/IOAccount4Web.java" /> - <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> + <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> </list> </option> @@ -698,216 +680,10 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tkio" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="task" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tkio" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="service" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tkio" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="service" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="impl" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tkio" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tkio" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="controller" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="dic" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="common" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="manager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="common" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="controller" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </pane> <pane id="Scratches" /> @@ -1416,13 +1192,6 @@ <workItem from="1523843445576" duration="7238000" /> <workItem from="1523876594256" duration="75800000" /> </task> - <task id="LOCAL-00077" summary="app排序"> - <created>1517473084319</created> - <option name="number" value="00077" /> - <option name="presentableId" value="LOCAL-00077" /> - <option name="project" value="LOCAL" /> - <updated>1517473084319</updated> - </task> <task id="LOCAL-00078" summary="app排序"> <created>1517476493409</created> <option name="number" value="00078" /> @@ -1759,11 +1528,18 @@ <option name="project" value="LOCAL" /> <updated>1524648418462</updated> </task> - <option name="localTasksCounter" value="126" /> + <task id="LOCAL-00126" summary="2 "> + <created>1524651945184</created> + <option name="number" value="00126" /> + <option name="presentableId" value="LOCAL-00126" /> + <option name="project" value="LOCAL" /> + <updated>1524651945184</updated> + </task> + <option name="localTasksCounter" value="127" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="499328000" /> + <option name="totallyTimeSpent" value="502350000" /> </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> @@ -1910,7 +1686,7 @@ <option name="timeStamp" value="1" /> </line-breakpoint> </breakpoints> - <option name="time" value="38" /> + <option name="time" value="39" /> </breakpoint-manager> <watches-manager /> </component> @@ -2040,14 +1816,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-195"> - <caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="207"> @@ -2118,14 +1886,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="237"> - <caret line="71" column="88" lean-forward="false" selection-start-line="71" selection-start-column="88" selection-end-line="71" selection-end-column="88" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="230"> @@ -2204,22 +1964,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="470"> - <caret line="40" column="5" lean-forward="false" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="148"> - <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="13" selection-end-column="57" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="184"> @@ -2246,14 +1990,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="183"> - <caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/userio/model/SalesManLeader.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="115"> @@ -2286,14 +2022,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-576"> - <caret line="44" column="16" lean-forward="false" selection-start-line="44" selection-start-column="16" selection-end-line="44" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1449"> @@ -2310,50 +2038,98 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-2707"> + <caret line="26" column="10" lean-forward="true" selection-start-line="26" selection-start-column="10" selection-end-line="26" selection-end-column="10" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="191"> + <caret line="217" column="44" lean-forward="false" selection-start-line="217" selection-start-column="44" selection-end-line="217" selection-end-column="44" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="183"> + <caret line="37" column="18" lean-forward="false" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="366"> + <caret line="54" column="9" lean-forward="false" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="574"> - <caret line="81" column="0" lean-forward="true" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" /> + <state relative-caret-position="390"> + <caret line="599" column="0" lean-forward="false" selection-start-line="599" selection-start-column="0" selection-end-line="600" selection-end-column="46" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2707"> - <caret line="26" column="10" lean-forward="true" selection-start-line="26" selection-start-column="10" selection-end-line="26" selection-end-column="10" /> + <state relative-caret-position="240"> + <caret line="30" column="53" lean-forward="true" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-575"> + <caret line="71" column="55" lean-forward="true" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="322"> - <caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" /> + <state relative-caret-position="292"> + <caret line="62" column="56" lean-forward="true" selection-start-line="62" selection-start-column="56" selection-end-line="62" selection-end-column="56" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="122"> - <caret line="226" column="40" lean-forward="true" selection-start-line="226" selection-start-column="40" selection-end-line="226" selection-end-column="40" /> + <state relative-caret-position="608"> + <caret line="99" column="44" lean-forward="true" selection-start-line="99" selection-start-column="44" selection-end-line="99" selection-end-column="44" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="194"> - <caret line="39" column="13" lean-forward="false" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" /> + <state relative-caret-position="184"> + <caret line="11" column="24" lean-forward="false" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="552"> + <caret line="37" column="32" lean-forward="true" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="283"> - <caret line="460" column="55" lean-forward="true" selection-start-line="460" selection-start-column="55" selection-end-line="460" selection-end-column="55" /> + <state relative-caret-position="368"> + <caret line="226" column="13" lean-forward="false" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" /> <folding /> </state> </provider> diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java index fe89682..d88d0b6 100644 --- a/src/main/java/common/service/impl/ContractServiceImpl.java +++ b/src/main/java/common/service/impl/ContractServiceImpl.java @@ -209,17 +209,20 @@ public class ContractServiceImpl implements ContractService{ resource.setPayMoney(0L); resource.setInvoice(0L); Long extraFlow = resource.getExtraFlow(); + if(resource.getType().equals("main")) { - if(!(extraFlow.longValue() == 0)){ - if(resource.getPlatform().equals("tkio")){ - IncrementFlow flow = new IncrementFlow(); - Account account = accountRepository.findByEmail(resource.getEmail()); - flow.setAccount(account.getId()); - flow.setFlow(extraFlow); - flow.setEndDate(resource.getEndDate()); - flow.setStartDate(resource.getStartDate()); - flow.setContractCode(resource.getContractCode()); - incrementFlowRepository.save(flow); + if(resource.getPlatform().equals("tkio")){ + if(!(extraFlow.longValue() == 0)){ + if(resource.getPlatform().equals("tkio")){ + IncrementFlow flow = new IncrementFlow(); + Account account = accountRepository.findByEmail(resource.getEmail()); + flow.setAccount(account.getId()); + flow.setFlow(extraFlow); + flow.setEndDate(resource.getEndDate()); + flow.setStartDate(resource.getStartDate()); + flow.setContractCode(resource.getContractCode()); + incrementFlowRepository.save(flow); + } } } if (DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) < 0) { @@ -458,18 +461,20 @@ public class ContractServiceImpl implements ContractService{ contract.setCreateName(saleMap.containsKey(contract.getCreateAccount()) ? saleMap.get(contract.getCreateAccount()) : ""); Boolean flag = null; - if(contract.getPriceLevel().longValue() == 1l){ - flag = checkTime(contract.getEmail(), contract.getPlatform(),contract.getType(), "black"); - }else{ - flag = checkTime(contract.getEmail(), contract.getPlatform(),contract.getType(), "analysis"); - } + if(!contract.getType().equals(ContractTypeEnum.MAIN.getKey())) { + //人群分析 + if (null == contract.getEndDate()) { + flag = checkTime(contract.getEmail(), contract.getPlatform(), contract.getType(), "black"); + } else { + flag = checkTime(contract.getEmail(), contract.getPlatform(), contract.getType(), "analysis"); + } - if(flag){ - contract.setContractType("0"); - }else{ - contract.setContractType("1"); + if (flag) { + contract.setContractType("0"); + } else { + contract.setContractType("1"); + } } - return contract; } diff --git a/src/main/java/tkio/task/AccountCheck.java b/src/main/java/tkio/task/AccountCheck.java index e22197a..4be4702 100644 --- a/src/main/java/tkio/task/AccountCheck.java +++ b/src/main/java/tkio/task/AccountCheck.java @@ -28,6 +28,7 @@ public class AccountCheck { public void task(){ List<Account> accountList = accountRepository.findRootParentsByPubDate(DateUtil.getBeforeDays(30)); logger.error("startDate :" + DateUtil.getBeforeDays(30)); + logger.error("startDate :" + accountList); if(ValidateUtil.isValid(accountList)){ List<Account> list = new ArrayList<>(); for(Account a: accountList){ diff --git a/src/main/resources/spring/applicationContext-schedule.xml b/src/main/resources/spring/applicationContext-schedule.xml index 492a2ce..2ec540d 100644 --- a/src/main/resources/spring/applicationContext-schedule.xml +++ b/src/main/resources/spring/applicationContext-schedule.xml @@ -60,7 +60,7 @@ <bean id="accountTaskCheck" class="tkio.task.AccountCheck"></bean> <task:scheduled-tasks> <!--//定时同步短链数据(每5分钟执行一次)--> - <task:scheduled ref="accountTaskCheck" method="task" cron="0 5 17 * * ?"/> + <task:scheduled ref="accountTaskCheck" method="task" cron="0 */2 * * * ?"/> </task:scheduled-tasks> </beans>