diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 814dcd4..416103d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="app排序"> + <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/repository/ContractMoneyRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" /> + <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/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" afterPath="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" /> </list> <ignored path="$PROJECT_DIR$/target/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -27,46 +30,18 @@ <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="283"> - <caret line="123" column="54" lean-forward="false" selection-start-line="123" selection-start-column="54" selection-end-line="123" selection-end-column="54" /> + <state relative-caret-position="306"> + <caret line="38" column="63" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="63" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> + <file leaf-file-name="ResultStatus.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="736"> - <caret line="45" column="44" lean-forward="false" selection-start-line="45" selection-start-column="44" selection-end-line="45" selection-end-column="44" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#1721#1722#0" expanded="false" /> - <element signature="e#1778#1779#0" expanded="false" /> - <element signature="e#2760#2761#0" expanded="false" /> - <element signature="e#2817#2818#0" expanded="false" /> - </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"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="207"> - <caret line="13" column="24" lean-forward="false" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false"> - <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="23"> - <caret line="275" column="41" lean-forward="false" selection-start-line="275" selection-start-column="41" selection-end-line="275" selection-end-column="41" /> + <state relative-caret-position="194"> + <caret line="12" column="4" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" /> <folding /> </state> </provider> @@ -75,63 +50,49 @@ <file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="274"> - <caret line="38" column="24" lean-forward="false" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" /> + <state relative-caret-position="183"> + <caret line="13" column="16" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" /> <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="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="321"> - <caret line="366" column="64" lean-forward="false" selection-start-line="366" selection-start-column="64" selection-end-line="366" selection-end-column="64" /> + <state relative-caret-position="1035"> + <caret line="172" column="0" lean-forward="true" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ContractMoneyRepository.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java"> + <file leaf-file-name="TrackAccountController.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="297"> - <caret line="21" column="29" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> + <state relative-caret-position="504"> + <caret line="37" column="8" lean-forward="false" selection-start-line="37" selection-start-column="8" selection-end-line="37" selection-end-column="65" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="TrackAccountServiceImpl.java" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> + <file leaf-file-name="TrackAccountService.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="332"> - <caret line="257" column="59" lean-forward="false" selection-start-line="257" selection-start-column="59" selection-end-line="257" selection-end-column="59" /> + <state relative-caret-position="194"> + <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SalesManLeaderRepository.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="368"> - <caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="40" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"> + <file leaf-file-name="TrackAccountServiceImpl.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="598"> - <caret line="32" column="32" lean-forward="false" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="32" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> + <state relative-caret-position="309"> + <caret line="119" column="9" lean-forward="false" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" /> + <folding /> </state> </provider> </entry> @@ -190,7 +151,6 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/src/main/java/common/service/SaleAuthService.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/ContractBody.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" /> @@ -212,8 +172,6 @@ <option value="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/TrackAccount4WebRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" /> - <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" /> - <option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> <option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" /> @@ -237,10 +195,13 @@ <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" /> - <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" /> + <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" /> + <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" /> + <option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> - <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" /> </list> </option> </component> @@ -665,10 +626,6 @@ <option name="myItemId" value="track" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="model" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -695,6 +652,10 @@ <option name="myItemId" value="track" /> <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> @@ -800,6 +761,70 @@ <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="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="common" /> + <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> </subPane> </pane> </panes> @@ -1295,14 +1320,7 @@ <workItem from="1516932422302" duration="5866000" /> <workItem from="1517189406074" duration="8333000" /> <workItem from="1517275427548" duration="11524000" /> - <workItem from="1517361892578" duration="823000" /> - </task> - <task id="LOCAL-00017" summary="发邮件"> - <created>1514968768350</created> - <option name="number" value="00017" /> - <option name="presentableId" value="LOCAL-00017" /> - <option name="project" value="LOCAL" /> - <updated>1514968768350</updated> + <workItem from="1517361892578" duration="3415000" /> </task> <task id="LOCAL-00018" summary="pom"> <created>1514974104697</created> @@ -1640,11 +1658,18 @@ <option name="project" value="LOCAL" /> <updated>1517309635908</updated> </task> - <option name="localTasksCounter" value="66" /> + <task id="LOCAL-00066" summary="app排序"> + <created>1517365959136</created> + <option name="number" value="00066" /> + <option name="presentableId" value="LOCAL-00066" /> + <option name="project" value="LOCAL" /> + <updated>1517365959137</updated> + </task> + <option name="localTasksCounter" value="67" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="298633000" /> + <option name="totallyTimeSpent" value="301225000" /> </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> @@ -1806,16 +1831,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="161"> - <caret line="19" column="8" lean-forward="false" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Reminder.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="161"> @@ -1837,20 +1852,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="414"> - <caret line="32" column="54" lean-forward="false" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="184"> - <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/TrackAccount4Web.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="184"> @@ -1975,14 +1976,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="322"> - <caret line="14" column="41" lean-forward="true" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/util/DateUtil.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="23"> @@ -2030,6 +2023,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="345"> <caret line="73" column="13" lean-forward="false" selection-start-line="73" selection-start-column="13" selection-end-line="73" selection-end-column="13" /> + <folding /> </state> </provider> </entry> @@ -2130,6 +2124,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="194"> <caret line="63" column="52" lean-forward="true" selection-start-line="63" selection-start-column="52" selection-end-line="63" selection-end-column="52" /> + <folding /> </state> </provider> </entry> @@ -2157,26 +2152,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="598"> - <caret line="32" column="32" lean-forward="false" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="32" /> - <folding> - <element signature="imports" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="368"> - <caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="40" /> - <folding> - <element signature="imports" expanded="false" /> - </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="736"> @@ -2209,50 +2184,101 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="23"> - <caret line="275" column="41" lean-forward="false" selection-start-line="275" selection-start-column="41" selection-end-line="275" selection-end-column="41" /> + <state relative-caret-position="297"> + <caret line="21" column="29" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="283"> - <caret line="123" column="54" lean-forward="false" selection-start-line="123" selection-start-column="54" selection-end-line="123" selection-end-column="54" /> + <state relative-caret-position="368"> + <caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="40" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="274"> - <caret line="38" column="24" lean-forward="false" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" /> + <state relative-caret-position="183"> + <caret line="32" column="32" lean-forward="false" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="32" /> <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="321"> - <caret line="366" column="64" lean-forward="false" selection-start-line="366" selection-start-column="64" selection-end-line="366" selection-end-column="64" /> + <state relative-caret-position="252"> + <caret line="173" column="0" lean-forward="false" selection-start-line="173" selection-start-column="0" selection-end-line="175" selection-end-column="9" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="297"> - <caret line="21" column="29" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="29" /> + <state relative-caret-position="183"> + <caret line="13" column="16" lean-forward="false" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="194"> + <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="332"> - <caret line="257" column="59" lean-forward="false" selection-start-line="257" selection-start-column="59" selection-end-line="257" selection-end-column="59" /> + <state relative-caret-position="309"> + <caret line="119" column="9" lean-forward="false" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultModel.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="283"> + <caret line="55" column="44" lean-forward="true" selection-start-line="55" selection-start-column="44" selection-end-line="55" selection-end-column="44" /> + <folding> + <element signature="e#1195#1196#0" expanded="true" /> + <element signature="e#1240#1241#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="194"> + <caret line="12" column="4" lean-forward="false" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" /> + <folding /> + </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="306"> + <caret line="38" column="63" lean-forward="false" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="63" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="504"> + <caret line="37" column="8" lean-forward="false" selection-start-line="37" selection-start-column="8" selection-end-line="37" selection-end-column="65" /> + <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="1035"> + <caret line="172" column="0" lean-forward="true" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" /> <folding /> </state> </provider> diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java index a97569f..952a7eb 100644 --- a/src/main/java/common/service/impl/ContractServiceImpl.java +++ b/src/main/java/common/service/impl/ContractServiceImpl.java @@ -172,7 +172,7 @@ public class ContractServiceImpl implements ContractService{ contractChangeRepository.save(cc); //同步修改trackingio的数据 - if(resource.getPlatform().equals("tkio")){ + if(contract.getPlatform().equals("tkio")){ accountService.update(contract); } return contractRepository.save(contract); diff --git a/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java b/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java index f6cff1d..6eab4ab 100644 --- a/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java +++ b/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java @@ -171,6 +171,9 @@ public class TkioAccountServiceImpl implements TkioAccountService { } } Account4Web aw = account4WebRepository.findByEmail(email); + if(null == aw){ + return null; + } List<BackVisit> backVisitList = backVisitRepository.findAllByPlatformAndEmail("tkio", email); if(ValidateUtil.isValid(backVisitList)){ aw.setBackTime(backVisitList.size()); diff --git a/src/main/java/track/service/impl/TrackAccountServiceImpl.java b/src/main/java/track/service/impl/TrackAccountServiceImpl.java index 0cc8e52..7cd302d 100644 --- a/src/main/java/track/service/impl/TrackAccountServiceImpl.java +++ b/src/main/java/track/service/impl/TrackAccountServiceImpl.java @@ -115,6 +115,9 @@ public class TrackAccountServiceImpl implements TrackAccountService{ } } TrackAccount4Web aw = trackAccount4WebRepository.findByEmail(email); + if(null == aw){ + return null; + } List<BackVisit> backVisitList = backVisitRepository.findAllByPlatformAndEmail("track", email); if(ValidateUtil.isValid(backVisitList)){ aw.setBackTime(backVisitList.size()); diff --git a/src/main/java/util/ResultStatus.java b/src/main/java/util/ResultStatus.java index a065e20..ca6096b 100644 --- a/src/main/java/util/ResultStatus.java +++ b/src/main/java/util/ResultStatus.java @@ -10,7 +10,7 @@ public enum ResultStatus { NUMBER_LIMIT(-300, "超过限定值,无法添加"), NETWORK_ERROR(404, "网络异常"), PARAM_INVALID(-1000, "参数错误"), - USERNAME_OR_PASSWORD_ERROR(-1001, "用户名或密码错误"), + USER_EMPTY(-1001, "用户不存在"), USERNAME_LOGIN_EXPIRE(-1002, "用户登陆失效"), SUB_ACCOUNT_DISABLE(-1003, "子帐号已禁用"), ORIGINAL_ACCOUNT_DISABLE(-1004, "主体帐号已禁用"),