Skip to content

M
manager
Commit 92a07781 by manxiaoqiang
Options

2

parent 68585343
Showing with 104 additions and 137 deletions
.idea/workspace.xml
......@@ -3,16 +3,7 @@
<component name="ChangeListManager">
<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/model/Account4Web.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/IOAccount4Web.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/IOAccount4Web.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/tkio/task/AccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/userio/controller/IoAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java" afterPath="$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java" afterPath="$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.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" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -41,105 +32,81 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<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="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="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="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="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="SalesManLeaderRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
<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="115">
<caret line="10" column="87" lean-forward="false" selection-start-line="10" selection-start-column="80" selection-end-line="10" selection-end-column="87" />
<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" />
<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="183">
<caret line="46" column="21" lean-forward="false" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="21" />
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IOAccountServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java">
<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="-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" />
<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>
</file>
<file leaf-file-name="IOSalesManLeaderRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/userio/repository/IOSalesManLeaderRepository.java">
<file leaf-file-name="IOAccountTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="10" column="92" lean-forward="true" selection-start-line="10" selection-start-column="92" selection-end-line="10" selection-end-column="92" />
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IOAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/IOAccountService.java">
<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">
<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" />
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IOAccount4Web.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/IOAccount4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="39" column="36" lean-forward="false" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" />
<folding>
<element signature="e#1106#1107#0" expanded="true" />
<element signature="e#1162#1163#0" expanded="true" />
<element signature="e#1212#1213#0" expanded="true" />
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="176" column="23" lean-forward="false" selection-start-line="176" selection-start-column="19" selection-end-line="176" selection-end-column="23" />
<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" />
<folding />
</state>
</provider>
......@@ -248,7 +215,6 @@
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<option value="$PROJECT_DIR$/src/main/java/userio/task/IOAccountTask.java" />
......@@ -259,6 +225,7 @@
<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/java/common/service/impl/ContractServiceImpl.java" />
</list>
</option>
</component>
......@@ -1449,13 +1416,6 @@
<workItem from="1523843445576" duration="7238000" />
<workItem from="1523876594256" duration="75800000" />
</task>
<task id="LOCAL-00076" summary="app排序">
<created>1517455132087</created>
<option name="number" value="00076" />
<option name="presentableId" value="LOCAL-00076" />
<option name="project" value="LOCAL" />
<updated>1517455132087</updated>
</task>
<task id="LOCAL-00077" summary="app排序">
<created>1517473084319</created>
<option name="number" value="00077" />
......@@ -1792,11 +1752,18 @@
<option name="project" value="LOCAL" />
<updated>1524643897298</updated>
</task>
<option name="localTasksCounter" value="125" />
<task id="LOCAL-00125" summary="2&#10;">
<created>1524648418462</created>
<option name="number" value="00125" />
<option name="presentableId" value="LOCAL-00125" />
<option name="project" value="LOCAL" />
<updated>1524648418462</updated>
</task>
<option name="localTasksCounter" value="126" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="496869000" />
<option name="totallyTimeSpent" value="499328000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -2217,22 +2184,6 @@
</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="421">
<caret line="49" column="13" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<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="344">
<caret line="191" column="55" lean-forward="true" selection-start-line="191" selection-start-column="55" selection-end-line="191" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
......@@ -2253,30 +2204,6 @@
</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="1194">
<caret line="259" column="80" lean-forward="true" selection-start-line="259" selection-start-column="80" selection-end-line="259" selection-end-column="80" />
<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">
<caret line="82" column="16" lean-forward="false" selection-start-line="82" selection-start-column="16" selection-end-line="82" selection-end-column="65" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="176" column="23" lean-forward="false" selection-start-line="176" selection-start-column="19" selection-end-line="176" selection-end-column="23" />
<folding />
</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">
......@@ -2285,22 +2212,6 @@
</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="207">
<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/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>
<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">
......@@ -2375,18 +2286,74 @@
</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">
<caret line="82" column="16" lean-forward="false" selection-start-line="82" selection-start-column="16" selection-end-line="82" selection-end-column="65" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.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" />
<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="183">
<caret line="46" column="21" lean-forward="false" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="21" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.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" />
<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/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>
<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>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.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" />
<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" />
<folding />
</state>
</provider>
......
src/main/java/common/service/impl/ContractServiceImpl.java
......@@ -524,9 +524,9 @@ public class ContractServiceImpl implements ContractService{
}
}else{
//同步修改trackingio的数据
if(contract.getPlatform().equals("tkio")){
if(contract.getPlatform().equals("tkio") && contract.getType().equals("main")){
accountService.forbiden(contract);
}else if(contract.getPlatform().equals("io")){
}else if(contract.getPlatform().equals("io") && contract.getType().equals("main")){
accountIOService.update(contract);
}
contract.setStatus("cancel");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment