From 3f15285197de54883b0a4330baee4f5760f4970b Mon Sep 17 00:00:00 2001 From: kangxiaoshan <475914010@qq.com> Date: Sun, 28 Apr 2019 17:13:19 +0800 Subject: [PATCH] 大后台更新 --- .idea/workspace.xml | 844 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ pom.xml | 3 +++ src/main/java/adi/service/impl/ADIAccountServiceImpl.java | 4 ++++ src/main/java/common/controller/ContractController.java | 8 ++++++++ src/main/java/common/model/Contract.java | 4 ++-- src/main/java/common/repository/ContractRepository.java | 4 ++-- src/main/java/common/service/ContractService.java | 4 +++- src/main/java/common/service/impl/ContractServiceImpl.java | 62 ++++++++++++++++++++++++++++++++++++++++++++------------------ src/main/java/dic/ContractStatusEnum.java | 3 ++- src/main/java/tkio/service/impl/AccountServiceImpl.java | 5 +++++ src/main/java/tkio/service/impl/TkioAccountServiceImpl.java | 4 +--- src/main/java/userio/service/impl/AccountIOServiceImpl.java | 3 +++ 12 files changed, 585 insertions(+), 363 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8838c77..dbd15b5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,8 +7,17 @@ </component> <component name="ChangeListManager"> <list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java" afterDir="false" /> </list> <ignored path="$PROJECT_DIR$/target/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -19,63 +28,24 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="true"> + <file 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="224"> - <caret line="273" column="95" selection-start-line="273" selection-start-column="87" selection-end-line="273" selection-end-column="95" /> + <state relative-caret-position="375"> + <caret line="291" column="51" selection-start-line="291" selection-start-column="51" selection-end-line="291" selection-end-column="51" /> <folding> <element signature="docComment;class#ContractController#0" /> - <element signature="e#1612#1671#0" /> - <element signature="method#findAll#0;class#ContractController#0" /> - <element signature="e#1993#2106#0" /> <element signature="method#export#0;class#ContractController#0" /> - <element signature="e#2882#3464#1" /> - <element signature="e#2927#3454#1" /> - <element signature="e#3556#3615#0" /> - <element signature="e#3638#3682#0" /> - <element signature="e#4331#4448#0" /> <element signature="method#exportPay#0;class#ContractController#0" /> - <element signature="e#5139#5509#1" /> - <element signature="e#5186#5499#1" /> - <element signature="e#5601#5660#0" /> - <element signature="e#5683#5727#0" /> - <element signature="e#6475#6537#0" /> - <element signature="method#findOne#0;class#ContractController#0" /> - <element signature="e#6716#6783#0" /> <element signature="method#checkAccount#0;class#ContractController#0" /> - <element signature="e#7015#7079#0" /> - <element signature="method#checkTime#0;class#ContractController#0" /> - <element signature="e#7391#7455#0" /> - <element signature="e#7605#7669#0" /> - <element signature="method#findCode#0;class#ContractController#0" /> - <element signature="e#7920#7990#0" /> <element signature="method#findPricelevel#0;class#ContractController#0" /> - <element signature="e#8188#8257#0" /> <element signature="method#findIncrement#0;class#ContractController#0" /> - <element signature="e#8417#8482#0" /> <element signature="method#rebat#0;class#ContractController#0" /> - <element signature="e#8764#8828#0" /> - <element signature="e#8976#9038#0" /> - <element signature="method#create#0;class#ContractController#0" /> - <element signature="e#9692#9753#0" /> - <element signature="method#update#0;class#ContractController#0" /> - <element signature="e#10304#10363#0" /> <element signature="method#pay#0;class#ContractController#0" /> - <element signature="e#10918#10980#0" /> - <element signature="method#change#0;class#ContractController#0" /> - <element signature="e#11537#11600#0" /> <element signature="method#findPay#0;class#ContractController#0" /> - <element signature="e#11892#11958#0" /> <element signature="method#findChange#0;class#ContractController#0" /> - <element signature="e#12259#12324#0" /> <element signature="method#updatePay#0;class#ContractController#0" /> - <element signature="e#12921#12987#0" /> <element signature="method#findPayAll#0;class#ContractController#0" /> - <element signature="e#13293#13354#0" /> - <element signature="method#build#0;class#ContractController#0" /> - <element signature="e#13844#13908#0" /> - <element signature="method#contractCodeAll#0;class#ContractController#0" /> </folding> </state> </provider> @@ -84,26 +54,8 @@ <file 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="148"> - <caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="268"> - <caret line="230" selection-start-line="230" selection-end-line="230" /> - </state> - </provider> - </entry> - </file> - <file 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="686"> - <caret line="131" column="28" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="28" /> + <state relative-caret-position="116"> + <caret line="57" column="27" lean-forward="true" selection-start-line="57" selection-start-column="27" selection-end-line="57" selection-end-column="27" /> </state> </provider> </entry> @@ -111,78 +63,212 @@ <file 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="29"> - <caret line="182" column="26" lean-forward="true" selection-start-line="182" selection-start-column="26" selection-end-line="182" selection-end-column="26" /> + <state relative-caret-position="317"> + <caret line="616" column="32" selection-start-line="616" selection-start-column="32" selection-end-line="616" selection-end-column="32" /> <folding> <element signature="docComment;class#ContractServiceImpl#0" /> - <element signature="e#2786#4190#0" /> - <element signature="e#4196#5419#0" /> - <element signature="e#5476#5477#0" expanded="true" /> - <element signature="e#5531#5532#0" expanded="true" /> - <element signature="e#25880#27874#0" /> - <element signature="e#27880#28654#0" /> - <element signature="e#28660#29443#0" /> - <element signature="e#29449#31209#0" /> - <element signature="e#31215#32004#0" /> - <element signature="e#32718#32719#0" expanded="true" /> - <element signature="e#32769#32770#0" expanded="true" /> - <element signature="e#32834#32835#0" expanded="true" /> - <element signature="e#32906#32907#0" expanded="true" /> - <element signature="e#32276#32640#0" /> - <element signature="e#32646#32970#0" /> - <element signature="e#32976#34098#0" /> + <element signature="e#2598#4002#0" /> + <element signature="e#2886#2965#1" /> + <element signature="e#2995#3078#1" /> + <element signature="e#3109#3176#1" /> + <element signature="e#3251#3296#1" /> + <element signature="e#3300#3975#1" /> + <element signature="e#3459#3532#1" /> + <element signature="e#3536#3664#1" /> + <element signature="e#3848#3905#1" /> + <element signature="e#3909#3965#1" /> + <element signature="e#4008#5231#0" /> + <element signature="e#4194#4589#1" /> + <element signature="e#4333#4377#1" /> + <element signature="e#4381#4579#1" /> + <element signature="e#4513#4565#1" /> + <element signature="e#4593#5204#1" /> + <element signature="e#4855#4899#1" /> + <element signature="e#4903#5194#1" /> + <element signature="e#5128#5180#1" /> + <element signature="e#5350#5788#0" /> + <element signature="e#5562#5628#1" /> + <element signature="e#5632#5697#1" /> + <element signature="e#5794#6292#0" /> + <element signature="e#6071#6126#1" /> + <element signature="e#6132#6186#1" /> + <element signature="e#6298#7519#0" /> + <element signature="e#6426#6878#1" /> + <element signature="e#6467#6868#1" /> + <element signature="e#6607#6711#1" /> + <element signature="e#6715#6816#1" /> + <element signature="e#6883#7491#1" /> + <element signature="e#6949#7314#1" /> + <element signature="e#7080#7159#1" /> + <element signature="e#7404#7481#1" /> + <element signature="e#7620#7992#0" /> + <element signature="e#7740#7900#0" /> + <element signature="e#7920#7964#0" /> + <element signature="e#8096#8868#0" /> + <element signature="e#8249#8304#1" /> + <element signature="e#8975#9011#1" /> + <element signature="e#9168#9227#1" /> + <element signature="e#9237#9244#0" /> + <element signature="e#9618#10716#1" /> + <element signature="e#9673#10376#1" /> + <element signature="e#9724#10362#1" /> + <element signature="e#9787#10344#1" /> + <element signature="e#10459#10577#1" /> + <element signature="e#10583#10706#1" /> + <element signature="e#10827#10857#0" /> + <element signature="e#11322#11449#1" /> + <element signature="e#11609#11665#1" /> + <element signature="e#11857#11923#1" /> + <element signature="e#13260#13644#1" /> + <element signature="e#13682#18217#0" /> + <element signature="e#14347#14744#1" /> + <element signature="e#14607#14666#1" /> + <element signature="e#14670#14734#1" /> + <element signature="e#14809#14993#1" /> + <element signature="e#15134#15489#1" /> + <element signature="e#15210#15479#1" /> + <element signature="e#15551#15753#1" /> + <element signature="e#15813#16004#1" /> + <element signature="e#16067#16363#1" /> + <element signature="e#16570#16626#1" /> + <element signature="e#16711#16769#1" /> + <element signature="e#16818#16884#1" /> + <element signature="e#16935#18104#1" /> + <element signature="e#16987#18093#1" /> + <element signature="e#17121#17487#1" /> + <element signature="e#17323#17469#1" /> + <element signature="e#17538#18079#1" /> + <element signature="e#18224#22077#0" /> + <element signature="e#18554#18664#1" /> + <element signature="e#18586#18654#1" /> + <element signature="e#18830#18957#1" /> + <element signature="e#18872#18947#1" /> + <element signature="e#19149#19291#1" /> + <element signature="e#19202#19281#1" /> + <element signature="e#19470#19603#1" /> + <element signature="e#19519#19593#1" /> + <element signature="e#19688#19807#1" /> + <element signature="e#19997#20706#1" /> + <element signature="e#20212#20266#1" /> + <element signature="e#20430#20571#1" /> + <element signature="e#20575#20696#1" /> + <element signature="e#20710#21101#1" /> + <element signature="e#20857#20982#1" /> + <element signature="e#20986#21091#1" /> + <element signature="e#21149#22048#1" /> + <element signature="e#21193#22038#1" /> + <element signature="e#21389#21527#1" /> + <element signature="e#21588#21724#1" /> + <element signature="e#21729#21875#1" /> + <element signature="e#22310#22429#1" /> + <element signature="e#22538#23162#1" /> + <element signature="e#22772#22826#1" /> + <element signature="e#22885#23026#1" /> + <element signature="e#23030#23151#1" /> + <element signature="e#23166#23471#1" /> + <element signature="e#23226#23351#1" /> + <element signature="e#23355#23460#1" /> + <element signature="e#23514#25795#0" /> + <element signature="e#23764#23874#1" /> + <element signature="e#23796#23864#1" /> + <element signature="e#24040#24167#1" /> + <element signature="e#24082#24157#1" /> + <element signature="e#24359#24501#1" /> + <element signature="e#24412#24491#1" /> + <element signature="e#24746#24889#1" /> + <element signature="e#24894#25045#1" /> + <element signature="e#25277#25764#1" /> + <element signature="e#25345#25468#1" /> + <element signature="e#25474#25600#1" /> + <element signature="e#25624#25686#1" /> + <element signature="e#25692#25754#1" /> + <element signature="e#25801#26944#0" /> + <element signature="e#26013#26104#1" /> + <element signature="e#26110#26199#1" /> + <element signature="e#26275#26325#1" /> + <element signature="e#26653#26729#1" /> + <element signature="e#26809#26883#1" /> + <element signature="e#26950#28944#0" /> + <element signature="e#27269#28197#1" /> + <element signature="e#28013#28077#1" /> + <element signature="e#28121#28187#1" /> + <element signature="e#28201#28590#1" /> + <element signature="e#28325#28391#1" /> + <element signature="e#28472#28538#1" /> + <element signature="e#28950#29724#0" /> + <element signature="e#29193#29303#1" /> + <element signature="e#29225#29293#1" /> + <element signature="e#29494#29695#1" /> + <element signature="e#29536#29685#1" /> + <element signature="e#29730#30513#0" /> + <element signature="e#29978#30088#1" /> + <element signature="e#30010#30078#1" /> + <element signature="e#30282#30484#1" /> + <element signature="e#30325#30474#1" /> + <element signature="e#30519#32279#0" /> + <element signature="e#30826#30944#1" /> + <element signature="e#30950#31066#1" /> + <element signature="e#31534#31644#1" /> + <element signature="e#31566#31634#1" /> + <element signature="e#31810#31937#1" /> + <element signature="e#31852#31927#1" /> + <element signature="e#32285#33074#0" /> + <element signature="e#32535#32645#1" /> + <element signature="e#32567#32635#1" /> + <element signature="e#32844#33045#1" /> + <element signature="e#32886#33035#1" /> + <element signature="e#33348#33712#0" /> + <element signature="e#33555#33682#1" /> + <element signature="e#33597#33672#1" /> + <element signature="e#33718#34042#0" /> + <element signature="e#33902#34012#1" /> + <element signature="e#33934#34002#1" /> + <element signature="e#34048#35170#0" /> + <element signature="e#34530#35138#1" /> + <element signature="e#34703#35128#1" /> + <element signature="e#34956#35032#1" /> + <element signature="e#35038#35112#1" /> </folding> </state> </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="80"> - <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="272"> - <caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" /> + <state relative-caret-position="368"> + <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" /> <folding> - <element signature="e#5322#5323#0" expanded="true" /> - <element signature="e#5357#5358#0" expanded="true" /> - <element signature="e#5413#5414#0" expanded="true" /> - <element signature="e#5461#5462#0" expanded="true" /> + <element signature="e#431#432#0" expanded="true" /> + <element signature="e#457#458#0" expanded="true" /> </folding> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="276"> - <caret line="129" column="52" lean-forward="true" selection-start-line="129" selection-start-column="52" selection-end-line="129" selection-end-column="52" /> + <state relative-caret-position="96"> + <caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="189"> - <caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" /> + <state relative-caret-position="237"> + <caret line="189" selection-start-line="189" selection-end-line="189" /> </state> </provider> </entry> </file> <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="160"> - <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" /> + <state relative-caret-position="-64"> + <caret line="22" column="1" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="54" /> </state> </provider> </entry> @@ -202,6 +288,10 @@ <find>find/pricelevel</find> <find>增值</find> <find>find/body</find> + <find>checkTime</find> + <find>find</find> + <find>setContractCode</find> + <find>setStatus</find> </findStrings> </component> <component name="Git.Settings"> @@ -215,12 +305,17 @@ <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" /> - <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" /> + <option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" /> + <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" /> <option value="$PROJECT_DIR$/pom.xml" /> - <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> + <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" /> - <option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" /> + <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> + <option value="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> </list> </option> @@ -293,48 +388,6 @@ <item name="main" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" /> </path> - <path> - <item name="manage" type="b2602c69:ProjectViewProjectNode" /> - <item name="manager" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="common" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="manage" type="b2602c69:ProjectViewProjectNode" /> - <item name="manager" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="common" type="462c0819:PsiDirectoryNode" /> - <item name="model" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="manage" type="b2602c69:ProjectViewProjectNode" /> - <item name="manager" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="common" type="462c0819:PsiDirectoryNode" /> - <item name="repository" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="manage" type="b2602c69:ProjectViewProjectNode" /> - <item name="manager" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="dic" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="manage" type="b2602c69:ProjectViewProjectNode" /> - <item name="manager" type="462c0819:PsiDirectoryNode" /> - <item name="src" type="462c0819:PsiDirectoryNode" /> - <item name="main" type="462c0819:PsiDirectoryNode" /> - <item name="java" type="462c0819:PsiDirectoryNode" /> - <item name="tkio" type="462c0819:PsiDirectoryNode" /> - </path> </expand> <select /> </subPane> @@ -497,13 +550,13 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="14618000" /> + <option name="totallyTimeSpent" value="25471000" /> </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <editor active="true" /> <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1623867" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26359516" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="UI Designer" order="2" /> <window_info id="Favorites" order="3" side_tool="true" /> @@ -540,88 +593,6 @@ <option name="version" value="1" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-5088" /> - </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="-672" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/common.properties"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mail.properties"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/rest-servlet.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="400"> - <caret line="37" column="70" selection-start-line="37" selection-start-column="46" selection-end-line="37" selection-end-column="70" /> - </state> - </provider> - </entry> - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/config/AuditingBeanDefinitionParser.class"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="128"> - <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="64"> - <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/security/cors/CorsFilter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="128"> - <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/security/annotation/Authorization.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="96"> - <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="448"> - <caret line="48" column="37" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" /> - </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="176"> - <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/security/resolvers/LoginUserMethodArgumentsResolver.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="160"> - <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="387"> @@ -795,181 +766,382 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.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="189"> - <caret line="60" column="115" selection-start-line="60" selection-start-column="115" selection-end-line="60" selection-end-column="115" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state relative-caret-position="400"> + <caret line="180" column="60" lean-forward="true" selection-start-line="180" selection-start-column="60" selection-end-line="180" selection-end-column="60" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="400"> - <caret line="180" column="60" lean-forward="true" selection-start-line="180" selection-start-column="60" selection-end-line="180" selection-end-column="60" /> + <state relative-caret-position="276"> + <caret line="129" column="52" lean-forward="true" selection-start-line="129" selection-start-column="52" selection-end-line="129" selection-end-column="52" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> + <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="340"> - <caret line="584" column="74" selection-start-line="584" selection-start-column="50" selection-end-line="584" selection-end-column="74" /> + <state relative-caret-position="189"> + <caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="80"> - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> + <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="160"> - <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" /> + <state relative-caret-position="80"> + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/IncrementFlowRepository.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="276"> - <caret line="129" column="52" lean-forward="true" selection-start-line="129" selection-start-column="52" selection-end-line="129" selection-end-column="52" /> + <state relative-caret-position="80"> + <caret line="11" column="66" selection-start-line="11" selection-start-column="66" selection-end-line="11" selection-end-column="66" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="189"> - <caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" /> + <state relative-caret-position="381"> + <caret line="54" selection-start-line="54" selection-end-line="54" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="268"> + <state relative-caret-position="3196"> <caret line="230" selection-start-line="230" selection-end-line="230" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="686"> - <caret line="131" column="28" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="28" /> + <state relative-caret-position="128"> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java"> + <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="80"> - <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" /> + <state relative-caret-position="324"> + <caret line="400" column="8" selection-start-line="400" selection-start-column="8" selection-end-line="400" selection-end-column="8" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="148"> - <caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" /> + <state relative-caret-position="112"> + <caret line="7" column="12" lean-forward="true" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="192"> + <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="272"> - <caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" /> + <state relative-caret-position="160"> + <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> <folding> - <element signature="e#5322#5323#0" expanded="true" /> - <element signature="e#5357#5358#0" expanded="true" /> - <element signature="e#5413#5414#0" expanded="true" /> - <element signature="e#5461#5462#0" expanded="true" /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> </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/AccountServiceImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-3"> + <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="29"> - <caret line="182" column="26" lean-forward="true" selection-start-line="182" selection-start-column="26" selection-end-line="182" selection-end-column="26" /> + <state relative-caret-position="160"> + <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> <folding> - <element signature="docComment;class#ContractServiceImpl#0" /> - <element signature="e#2786#4190#0" /> - <element signature="e#4196#5419#0" /> - <element signature="e#5476#5477#0" expanded="true" /> - <element signature="e#5531#5532#0" expanded="true" /> - <element signature="e#25880#27874#0" /> - <element signature="e#27880#28654#0" /> - <element signature="e#28660#29443#0" /> - <element signature="e#29449#31209#0" /> - <element signature="e#31215#32004#0" /> - <element signature="e#32718#32719#0" expanded="true" /> - <element signature="e#32769#32770#0" expanded="true" /> - <element signature="e#32834#32835#0" expanded="true" /> - <element signature="e#32906#32907#0" expanded="true" /> - <element signature="e#32276#32640#0" /> - <element signature="e#32646#32970#0" /> - <element signature="e#32976#34098#0" /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="244"> + <caret line="29" column="32" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="112"> + <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/OtPkgDevStatsRepository.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="112"> + <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="112"> + <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1364"> + <caret line="134" selection-start-line="134" selection-end-line="134" /> + </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="189" selection-start-line="189" selection-end-line="189" /> + </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="116"> + <caret line="57" column="27" lean-forward="true" selection-start-line="57" selection-start-column="27" selection-end-line="57" selection-end-column="27" /> + </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="96"> + <caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" /> + </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="-64"> + <caret line="22" column="1" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="54" /> + </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="224"> - <caret line="273" column="95" selection-start-line="273" selection-start-column="87" selection-end-line="273" selection-end-column="95" /> + <state relative-caret-position="375"> + <caret line="291" column="51" selection-start-line="291" selection-start-column="51" selection-end-line="291" selection-end-column="51" /> <folding> <element signature="docComment;class#ContractController#0" /> - <element signature="e#1612#1671#0" /> - <element signature="method#findAll#0;class#ContractController#0" /> - <element signature="e#1993#2106#0" /> <element signature="method#export#0;class#ContractController#0" /> - <element signature="e#2882#3464#1" /> - <element signature="e#2927#3454#1" /> - <element signature="e#3556#3615#0" /> - <element signature="e#3638#3682#0" /> - <element signature="e#4331#4448#0" /> <element signature="method#exportPay#0;class#ContractController#0" /> - <element signature="e#5139#5509#1" /> - <element signature="e#5186#5499#1" /> - <element signature="e#5601#5660#0" /> - <element signature="e#5683#5727#0" /> - <element signature="e#6475#6537#0" /> - <element signature="method#findOne#0;class#ContractController#0" /> - <element signature="e#6716#6783#0" /> <element signature="method#checkAccount#0;class#ContractController#0" /> - <element signature="e#7015#7079#0" /> - <element signature="method#checkTime#0;class#ContractController#0" /> - <element signature="e#7391#7455#0" /> - <element signature="e#7605#7669#0" /> - <element signature="method#findCode#0;class#ContractController#0" /> - <element signature="e#7920#7990#0" /> <element signature="method#findPricelevel#0;class#ContractController#0" /> - <element signature="e#8188#8257#0" /> <element signature="method#findIncrement#0;class#ContractController#0" /> - <element signature="e#8417#8482#0" /> <element signature="method#rebat#0;class#ContractController#0" /> - <element signature="e#8764#8828#0" /> - <element signature="e#8976#9038#0" /> - <element signature="method#create#0;class#ContractController#0" /> - <element signature="e#9692#9753#0" /> - <element signature="method#update#0;class#ContractController#0" /> - <element signature="e#10304#10363#0" /> <element signature="method#pay#0;class#ContractController#0" /> - <element signature="e#10918#10980#0" /> - <element signature="method#change#0;class#ContractController#0" /> - <element signature="e#11537#11600#0" /> <element signature="method#findPay#0;class#ContractController#0" /> - <element signature="e#11892#11958#0" /> <element signature="method#findChange#0;class#ContractController#0" /> - <element signature="e#12259#12324#0" /> <element signature="method#updatePay#0;class#ContractController#0" /> - <element signature="e#12921#12987#0" /> <element signature="method#findPayAll#0;class#ContractController#0" /> - <element signature="e#13293#13354#0" /> - <element signature="method#build#0;class#ContractController#0" /> - <element signature="e#13844#13908#0" /> - <element signature="method#contractCodeAll#0;class#ContractController#0" /> + </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="317"> + <caret line="616" column="32" selection-start-line="616" selection-start-column="32" selection-end-line="616" selection-end-column="32" /> + <folding> + <element signature="docComment;class#ContractServiceImpl#0" /> + <element signature="e#2598#4002#0" /> + <element signature="e#2886#2965#1" /> + <element signature="e#2995#3078#1" /> + <element signature="e#3109#3176#1" /> + <element signature="e#3251#3296#1" /> + <element signature="e#3300#3975#1" /> + <element signature="e#3459#3532#1" /> + <element signature="e#3536#3664#1" /> + <element signature="e#3848#3905#1" /> + <element signature="e#3909#3965#1" /> + <element signature="e#4008#5231#0" /> + <element signature="e#4194#4589#1" /> + <element signature="e#4333#4377#1" /> + <element signature="e#4381#4579#1" /> + <element signature="e#4513#4565#1" /> + <element signature="e#4593#5204#1" /> + <element signature="e#4855#4899#1" /> + <element signature="e#4903#5194#1" /> + <element signature="e#5128#5180#1" /> + <element signature="e#5350#5788#0" /> + <element signature="e#5562#5628#1" /> + <element signature="e#5632#5697#1" /> + <element signature="e#5794#6292#0" /> + <element signature="e#6071#6126#1" /> + <element signature="e#6132#6186#1" /> + <element signature="e#6298#7519#0" /> + <element signature="e#6426#6878#1" /> + <element signature="e#6467#6868#1" /> + <element signature="e#6607#6711#1" /> + <element signature="e#6715#6816#1" /> + <element signature="e#6883#7491#1" /> + <element signature="e#6949#7314#1" /> + <element signature="e#7080#7159#1" /> + <element signature="e#7404#7481#1" /> + <element signature="e#7620#7992#0" /> + <element signature="e#7740#7900#0" /> + <element signature="e#7920#7964#0" /> + <element signature="e#8096#8868#0" /> + <element signature="e#8249#8304#1" /> + <element signature="e#8975#9011#1" /> + <element signature="e#9168#9227#1" /> + <element signature="e#9237#9244#0" /> + <element signature="e#9618#10716#1" /> + <element signature="e#9673#10376#1" /> + <element signature="e#9724#10362#1" /> + <element signature="e#9787#10344#1" /> + <element signature="e#10459#10577#1" /> + <element signature="e#10583#10706#1" /> + <element signature="e#10827#10857#0" /> + <element signature="e#11322#11449#1" /> + <element signature="e#11609#11665#1" /> + <element signature="e#11857#11923#1" /> + <element signature="e#13260#13644#1" /> + <element signature="e#13682#18217#0" /> + <element signature="e#14347#14744#1" /> + <element signature="e#14607#14666#1" /> + <element signature="e#14670#14734#1" /> + <element signature="e#14809#14993#1" /> + <element signature="e#15134#15489#1" /> + <element signature="e#15210#15479#1" /> + <element signature="e#15551#15753#1" /> + <element signature="e#15813#16004#1" /> + <element signature="e#16067#16363#1" /> + <element signature="e#16570#16626#1" /> + <element signature="e#16711#16769#1" /> + <element signature="e#16818#16884#1" /> + <element signature="e#16935#18104#1" /> + <element signature="e#16987#18093#1" /> + <element signature="e#17121#17487#1" /> + <element signature="e#17323#17469#1" /> + <element signature="e#17538#18079#1" /> + <element signature="e#18224#22077#0" /> + <element signature="e#18554#18664#1" /> + <element signature="e#18586#18654#1" /> + <element signature="e#18830#18957#1" /> + <element signature="e#18872#18947#1" /> + <element signature="e#19149#19291#1" /> + <element signature="e#19202#19281#1" /> + <element signature="e#19470#19603#1" /> + <element signature="e#19519#19593#1" /> + <element signature="e#19688#19807#1" /> + <element signature="e#19997#20706#1" /> + <element signature="e#20212#20266#1" /> + <element signature="e#20430#20571#1" /> + <element signature="e#20575#20696#1" /> + <element signature="e#20710#21101#1" /> + <element signature="e#20857#20982#1" /> + <element signature="e#20986#21091#1" /> + <element signature="e#21149#22048#1" /> + <element signature="e#21193#22038#1" /> + <element signature="e#21389#21527#1" /> + <element signature="e#21588#21724#1" /> + <element signature="e#21729#21875#1" /> + <element signature="e#22310#22429#1" /> + <element signature="e#22538#23162#1" /> + <element signature="e#22772#22826#1" /> + <element signature="e#22885#23026#1" /> + <element signature="e#23030#23151#1" /> + <element signature="e#23166#23471#1" /> + <element signature="e#23226#23351#1" /> + <element signature="e#23355#23460#1" /> + <element signature="e#23514#25795#0" /> + <element signature="e#23764#23874#1" /> + <element signature="e#23796#23864#1" /> + <element signature="e#24040#24167#1" /> + <element signature="e#24082#24157#1" /> + <element signature="e#24359#24501#1" /> + <element signature="e#24412#24491#1" /> + <element signature="e#24746#24889#1" /> + <element signature="e#24894#25045#1" /> + <element signature="e#25277#25764#1" /> + <element signature="e#25345#25468#1" /> + <element signature="e#25474#25600#1" /> + <element signature="e#25624#25686#1" /> + <element signature="e#25692#25754#1" /> + <element signature="e#25801#26944#0" /> + <element signature="e#26013#26104#1" /> + <element signature="e#26110#26199#1" /> + <element signature="e#26275#26325#1" /> + <element signature="e#26653#26729#1" /> + <element signature="e#26809#26883#1" /> + <element signature="e#26950#28944#0" /> + <element signature="e#27269#28197#1" /> + <element signature="e#28013#28077#1" /> + <element signature="e#28121#28187#1" /> + <element signature="e#28201#28590#1" /> + <element signature="e#28325#28391#1" /> + <element signature="e#28472#28538#1" /> + <element signature="e#28950#29724#0" /> + <element signature="e#29193#29303#1" /> + <element signature="e#29225#29293#1" /> + <element signature="e#29494#29695#1" /> + <element signature="e#29536#29685#1" /> + <element signature="e#29730#30513#0" /> + <element signature="e#29978#30088#1" /> + <element signature="e#30010#30078#1" /> + <element signature="e#30282#30484#1" /> + <element signature="e#30325#30474#1" /> + <element signature="e#30519#32279#0" /> + <element signature="e#30826#30944#1" /> + <element signature="e#30950#31066#1" /> + <element signature="e#31534#31644#1" /> + <element signature="e#31566#31634#1" /> + <element signature="e#31810#31937#1" /> + <element signature="e#31852#31927#1" /> + <element signature="e#32285#33074#0" /> + <element signature="e#32535#32645#1" /> + <element signature="e#32567#32635#1" /> + <element signature="e#32844#33045#1" /> + <element signature="e#32886#33035#1" /> + <element signature="e#33348#33712#0" /> + <element signature="e#33555#33682#1" /> + <element signature="e#33597#33672#1" /> + <element signature="e#33718#34042#0" /> + <element signature="e#33902#34012#1" /> + <element signature="e#33934#34002#1" /> + <element signature="e#34048#35170#0" /> + <element signature="e#34530#35138#1" /> + <element signature="e#34703#35128#1" /> + <element signature="e#34956#35032#1" /> + <element signature="e#35038#35112#1" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="368"> + <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" /> + <folding> + <element signature="e#431#432#0" expanded="true" /> + <element signature="e#457#458#0" expanded="true" /> </folding> </state> </provider> diff --git a/pom.xml b/pom.xml index 8fd8938..28a4b6b 100644 --- a/pom.xml +++ b/pom.xml @@ -174,6 +174,8 @@ <default.datasource.username>trackingio</default.datasource.username> <default.datasource.password>trackingio</default.datasource.password> + + <office.url> jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8 </office.url> @@ -186,6 +188,7 @@ <tkio.username>trackingio</tkio.username> <tkio.password>trackingio</tkio.password> + <track.url> jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/track?characterEncoding=utf-8 </track.url> diff --git a/src/main/java/adi/service/impl/ADIAccountServiceImpl.java b/src/main/java/adi/service/impl/ADIAccountServiceImpl.java index 5852b39..c056ff9 100644 --- a/src/main/java/adi/service/impl/ADIAccountServiceImpl.java +++ b/src/main/java/adi/service/impl/ADIAccountServiceImpl.java @@ -129,6 +129,10 @@ public class ADIAccountServiceImpl implements ADIAccountService { @Override public void updateAccount(Contract contract) { + + //暂时 注释改代码 + if(true) return ; + ADIUser adiUser = findOne(contract.getEmail()); if(null != adiUser){ String url = u + "adi/api/user/web/update"; diff --git a/src/main/java/common/controller/ContractController.java b/src/main/java/common/controller/ContractController.java index 5afae19..39bd1f4 100644 --- a/src/main/java/common/controller/ContractController.java +++ b/src/main/java/common/controller/ContractController.java @@ -285,6 +285,14 @@ public class ContractController { } + @RequestMapping(value = "setstaus", method = RequestMethod.GET) + @ResponseBody + public ResultModel contractStatusUpdate( @PathVariable String platform,String contractId,String status) { + + return ResultModel.OK(service.contractStatusUpdate(platform,contractId,status)); + } + + } diff --git a/src/main/java/common/model/Contract.java b/src/main/java/common/model/Contract.java index 308346a..36d3a01 100644 --- a/src/main/java/common/model/Contract.java +++ b/src/main/java/common/model/Contract.java @@ -38,7 +38,7 @@ public class Contract { private Long payMoney; private Long invoice; // 开票次数 private String invoiceMoney; // 发票金额 - private String createName; + private String createName; // 创建人NAME //合同类型 主套餐 or 增值套餐 private String type; private Long priceName; @@ -46,7 +46,7 @@ public class Contract { private Long extraFlow; private Long modifyAccount; - private Long createAccount; + private Long createAccount;// 创建人id private Date modifyTime; private Date createTime; private String ds; diff --git a/src/main/java/common/repository/ContractRepository.java b/src/main/java/common/repository/ContractRepository.java index 9f918a0..a672e99 100644 --- a/src/main/java/common/repository/ContractRepository.java +++ b/src/main/java/common/repository/ContractRepository.java @@ -52,8 +52,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { @Query(value = "select count(*) from contract where platform = ?1",nativeQuery = true) BigInteger findcountContract(String platform); - @Query(value = "select new map( c.id as id, c.contractCode as contractCode ) from Contract c where c.platform = ?1") - Map contractCodePlatform(String platform); + @Query(value = "select new map( c.id as id, c.contractCode as contractCode ) from Contract c where c.platform = ?1 and c.contractCode is not null and c.contractCode <> 'null'") + List<Map> contractCodePlatform(String platform); @Query(value = "select * from contract where platform = ?1 and contract_code = ?2",nativeQuery = true) Contract findByCodePlatform(String contractCode, String platform); diff --git a/src/main/java/common/service/ContractService.java b/src/main/java/common/service/ContractService.java index 70df5da..32cbb28 100644 --- a/src/main/java/common/service/ContractService.java +++ b/src/main/java/common/service/ContractService.java @@ -53,7 +53,9 @@ public interface ContractService { List<TradeType> getTradeData(String platform); - Map contractCodeAll(String platform); + List<Map> contractCodeAll(String platform); List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform, String contractId); + + Contract contractStatusUpdate(String platform, String contractId, String status); } \ No newline at end of file diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java index 800fdd3..783dfa6 100644 --- a/src/main/java/common/service/impl/ContractServiceImpl.java +++ b/src/main/java/common/service/impl/ContractServiceImpl.java @@ -41,6 +41,14 @@ import java.util.*; @Service public class ContractServiceImpl implements ContractService{ + + private static final Map<String,String> CONTRACT_TYPE = new HashMap(){{ + put("0","首次签约"); + put("1","续约"); + put("2","合同变更"); + + }}; + @Autowired ContractRepository contractRepository; @Autowired @@ -176,7 +184,7 @@ public class ContractServiceImpl implements ContractService{ BigInteger countContract = contractRepository.findcountContract(platform); - String lastCode = ""; + String lastCode; int codeInt = countContract.intValue(); @@ -185,7 +193,7 @@ public class ContractServiceImpl implements ContractService{ } else { lastCode = "" + (codeInt + 1); } - return (company + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase(); + return (code + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase(); } @Override @@ -273,11 +281,11 @@ public class ContractServiceImpl implements ContractService{ } // 老的逻辑 - String contractCode = getContractCode(resource.getMyBodyCode()); - - if(!contractCode.equals(resource.getContractCode())){ - resource.setContractCode(contractCode); - } +// String contractCode = getContractCode(resource.getMyBodyCode()); +// +// if(!contractCode.equals(resource.getContractCode())){ +// resource.setContractCode(contractCode); +// } resource.setPayMoney(0L); resource.setInvoice(0L); @@ -309,16 +317,16 @@ public class ContractServiceImpl implements ContractService{ resource.setDs(DateUtil.getBeforeDays(0)); resource.setStatus("wait"); } - Double rebat = null; - if(null != resource.getPriceLevel()){ - rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney()); - }else{ - rebat = getRebat(resource.getProduct(), 0, resource.getMoney()); - } - - BigDecimal bg = new BigDecimal(rebat); - double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - resource.setRebate(f1); +// Double rebat = null; +// if(null != resource.getPriceLevel()){ +// rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney()); +// }else{ +// rebat = getRebat(resource.getProduct(), 0, resource.getMoney()); +// } +// +// BigDecimal bg = new BigDecimal(rebat); +// double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); +// resource.setRebate(f1); if(null != loginUser) { resource.setCreateAccount(loginUser.getId()); @@ -598,6 +606,24 @@ public class ContractServiceImpl implements ContractService{ } @Override + public Contract contractStatusUpdate(String platform, String contractId, String status) { + + if(StringUtils.isEmpty(contractId)){ + return null; + } + + Contract contract = contractRepository.findOne(Long.parseLong(contractId)); + + if(ContractStatusEnum.CANCEL.getKey().equals(status)){ + contract.setStatus(status); + }else{ + contract.setStatus(ContractStatusEnum.DELETE.getKey()); + } + + return contractRepository.save(contract); + } + + @Override public Contract findOne(String code) { List<Contract> result = new ArrayList<>(); @@ -825,7 +851,7 @@ public class ContractServiceImpl implements ContractService{ } @Override - public Map contractCodeAll(String platform) { + public List<Map> contractCodeAll(String platform) { return contractRepository.contractCodePlatform(platform); } diff --git a/src/main/java/dic/ContractStatusEnum.java b/src/main/java/dic/ContractStatusEnum.java index 3840e94..26b8ef5 100644 --- a/src/main/java/dic/ContractStatusEnum.java +++ b/src/main/java/dic/ContractStatusEnum.java @@ -9,7 +9,8 @@ public enum ContractStatusEnum { WAIT("wait","未执行"), EXECUTING("executing", "执行中"), CANCEL("cancel", "作废"), - END("end", "已结束"); + END("end", "已结束"), + DELETE("del", "已删除"); private String key; private String value; diff --git a/src/main/java/tkio/service/impl/AccountServiceImpl.java b/src/main/java/tkio/service/impl/AccountServiceImpl.java index 45cc87b..5b06a28 100644 --- a/src/main/java/tkio/service/impl/AccountServiceImpl.java +++ b/src/main/java/tkio/service/impl/AccountServiceImpl.java @@ -24,6 +24,11 @@ public class AccountServiceImpl implements AccountService { AccountRepository accountRepository; @Override public Account update(Contract contract) { + + //暂时 注释改代码 + if(true) return null; + + Account account = accountRepository.findByEmail(contract.getEmail()); String today = DateUtil.getBeforeDays(0); Date pubDate = DateUtil.getDate(contract.getStartDate()); diff --git a/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java b/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java index c5fa271..6c1abeb 100644 --- a/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java +++ b/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java @@ -397,10 +397,8 @@ public class TkioAccountServiceImpl implements TkioAccountService { re.setRemindStatus(true); re.setDs(DateUtil.getBeforeDays(0)); reminderRepository.save(re); - - - return paymentRepository.save(resource); + } @Override diff --git a/src/main/java/userio/service/impl/AccountIOServiceImpl.java b/src/main/java/userio/service/impl/AccountIOServiceImpl.java index ca7b003..7dc7ffe 100644 --- a/src/main/java/userio/service/impl/AccountIOServiceImpl.java +++ b/src/main/java/userio/service/impl/AccountIOServiceImpl.java @@ -25,6 +25,9 @@ public class AccountIOServiceImpl implements AccountIOService { IOAccountRepository accountRepository; @Override public Account update(Contract contract) { + + //暂时 注释改代码 + if(true) return null; Account account = accountRepository.findByEmail(contract.getEmail()); String today = DateUtil.getBeforeDays(0); Date pubDate = DateUtil.getDate(contract.getStartDate()); -- libgit2 0.27.1