Skip to content

M
manager
Commit 16772859 by manxiaoqiang
Options

2

parent 14615a2e
Showing with 30 additions and 28 deletions
.idea/workspace.xml
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <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$/.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/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.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> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -38,18 +37,18 @@ ...@@ -38,18 +37,18 @@
<file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398"> <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" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="436">
<caret line="582" column="16" lean-forward="false" selection-start-line="582" selection-start-column="16" selection-end-line="582" selection-end-column="16" /> <caret line="593" column="50" lean-forward="true" selection-start-line="593" selection-start-column="50" selection-end-line="593" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -75,11 +74,11 @@ ...@@ -75,11 +74,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79"> <state relative-caret-position="401">
<caret line="471" column="40" lean-forward="false" selection-start-line="471" selection-start-column="32" selection-end-line="471" selection-end-column="40" /> <caret line="479" column="36" lean-forward="true" selection-start-line="479" selection-start-column="36" selection-end-line="479" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -234,11 +233,11 @@ ...@@ -234,11 +233,11 @@
<option value="$PROJECT_DIR$/src/main/java/userio/repository/IOAccountRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/userio/repository/IOAccountRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/userio/task/IOAccountCheck.java" /> <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/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.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/task/AccountCheck.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1369,13 +1368,6 @@ ...@@ -1369,13 +1368,6 @@
<workItem from="1523843445576" duration="7238000" /> <workItem from="1523843445576" duration="7238000" />
<workItem from="1523876594256" duration="75800000" /> <workItem from="1523876594256" duration="75800000" />
</task> </task>
<task id="LOCAL-00067" summary="app排序">
<created>1517381123222</created>
<option name="number" value="00067" />
<option name="presentableId" value="LOCAL-00067" />
<option name="project" value="LOCAL" />
<updated>1517381123222</updated>
</task>
<task id="LOCAL-00068" summary="app排序"> <task id="LOCAL-00068" summary="app排序">
<created>1517382900046</created> <created>1517382900046</created>
<option name="number" value="00068" /> <option name="number" value="00068" />
...@@ -1712,11 +1704,18 @@ ...@@ -1712,11 +1704,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1524560408531</updated> <updated>1524560408531</updated>
</task> </task>
<option name="localTasksCounter" value="116" /> <task id="LOCAL-00116" summary="2&#10;">
<created>1524561675852</created>
<option name="number" value="00116" />
<option name="presentableId" value="LOCAL-00116" />
<option name="project" value="LOCAL" />
<updated>1524561675852</updated>
</task>
<option name="localTasksCounter" value="117" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="476006000" /> <option name="totallyTimeSpent" value="476200000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
...@@ -2098,6 +2097,7 @@ ...@@ -2098,6 +2097,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="313"> <state relative-caret-position="313">
<caret line="31" column="53" lean-forward="false" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" /> <caret line="31" column="53" lean-forward="false" selection-start-line="31" selection-start-column="53" selection-end-line="31" selection-end-column="53" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2254,26 +2254,26 @@ ...@@ -2254,26 +2254,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398"> <state relative-caret-position="401">
<caret line="54" column="9" lean-forward="false" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" /> <caret line="479" column="36" lean-forward="true" selection-start-line="479" selection-start-column="36" selection-end-line="479" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="366">
<caret line="582" column="16" lean-forward="false" selection-start-line="582" selection-start-column="16" selection-end-line="582" selection-end-column="16" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79"> <state relative-caret-position="436">
<caret line="471" column="40" lean-forward="false" selection-start-line="471" selection-start-column="32" selection-end-line="471" selection-end-column="40" /> <caret line="593" column="50" lean-forward="true" selection-start-line="593" selection-start-column="50" selection-end-line="593" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
...@@ -590,6 +590,8 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -590,6 +590,8 @@ public class TkioAccountServiceImpl implements TkioAccountService {
crowd.setPayment(1); crowd.setPayment(1);
crowdRepository.save(crowd); crowdRepository.save(crowd);
} }
contract.setStatus("end");
contractRepository.save(contract);
} }
}else{//基础套餐 }else{//基础套餐
Account account = accountRepository.findByEmail(resource.getEmail()); Account account = accountRepository.findByEmail(resource.getEmail());
......
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