Skip to content

M
manager
Commit ef9226df by kangxiaoshan
Options

大后台更新

parent 93dbab6b
Showing with 973 additions and 664 deletions
.idea/workspace.xml
...@@ -7,17 +7,16 @@ ...@@ -7,17 +7,16 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment=""> <list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <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/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/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/ContractRelationRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.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/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/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/util/Constant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/util/Constant.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/util/MailUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/util/MailUtils.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/resources/mail.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mail.properties" 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> </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" />
...@@ -27,248 +26,334 @@ ...@@ -27,248 +26,334 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="256">
<caret line="291" column="51" selection-start-line="291" selection-start-column="51" selection-end-line="291" selection-end-column="51" /> <caret line="63" column="41" selection-start-line="63" selection-start-column="41" selection-end-line="63" selection-end-column="41" />
<folding> <folding>
<element signature="docComment;class#ContractController#0" /> <element signature="docComment;class#ContractController#0" />
<element signature="e#1378#1389#0" />
<element signature="class#1420:1957" />
<element signature="e#1433#1958#1" />
<element signature="method#export#0;class#ContractController#0" /> <element signature="method#export#0;class#ContractController#0" />
<element signature="e#3132#3726#1" />
<element signature="e#3177#3716#1" />
<element signature="e#3818#3877#0" />
<element signature="e#3900#3944#0" />
<element signature="method#exportPay#0;class#ContractController#0" /> <element signature="method#exportPay#0;class#ContractController#0" />
<element signature="e#5401#5771#1" />
<element signature="e#5448#5761#1" />
<element signature="e#5863#5922#0" />
<element signature="e#5945#5989#0" />
<element signature="method#findOne#0;class#ContractController#0" />
<element signature="method#checkAccount#0;class#ContractController#0" /> <element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="method#findPricelevel#0;class#ContractController#0" /> <element signature="method#findPricelevel#0;class#ContractController#0" />
<element signature="method#findIncrement#0;class#ContractController#0" /> <element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="method#rebat#0;class#ContractController#0" /> <element signature="method#rebat#0;class#ContractController#0" />
<element signature="e#9954#10015#0" />
<element signature="method#update#0;class#ContractController#0" />
<element signature="e#10566#10625#0" />
<element signature="method#pay#0;class#ContractController#0" /> <element signature="method#pay#0;class#ContractController#0" />
<element signature="e#11180#11242#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="e#11799#11862#0" />
<element signature="method#findPay#0;class#ContractController#0" /> <element signature="method#findPay#0;class#ContractController#0" />
<element signature="e#12154#12220#0" />
<element signature="method#findChange#0;class#ContractController#0" /> <element signature="method#findChange#0;class#ContractController#0" />
<element signature="e#12521#12586#0" />
<element signature="method#updatePay#0;class#ContractController#0" /> <element signature="method#updatePay#0;class#ContractController#0" />
<element signature="e#13183#13249#0" />
<element signature="method#findPayAll#0;class#ContractController#0" /> <element signature="method#findPayAll#0;class#ContractController#0" />
<element signature="e#13555#13616#0" />
<element signature="method#build#0;class#ContractController#0" />
<element signature="e#13851#13911#0" />
<element signature="method#baseCreate#0;class#ContractController#0" />
<element signature="e#14074#14137#0" />
<element signature="e#14308#14371#0" />
<element signature="method#contractStatusUpdate#0;class#ContractController#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.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="116"> <state relative-caret-position="294">
<caret line="57" column="27" lean-forward="true" selection-start-line="57" selection-start-column="27" selection-end-line="57" selection-end-column="27" /> <caret line="731" column="58" selection-start-line="731" selection-start-column="58" selection-end-line="731" selection-end-column="58" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
<element signature="class#1362:1454" />
<element signature="initializer##0;class#1362:1454" />
<element signature="e#2758#4162#0" />
<element signature="e#3046#3125#1" />
<element signature="e#3155#3238#1" />
<element signature="e#3269#3336#1" />
<element signature="e#3411#3456#1" />
<element signature="e#3460#4135#1" />
<element signature="e#3619#3692#1" />
<element signature="e#3696#3824#1" />
<element signature="e#4008#4065#1" />
<element signature="e#4069#4125#1" />
<element signature="e#4168#5391#0" />
<element signature="e#4354#4749#1" />
<element signature="e#4493#4537#1" />
<element signature="e#4541#4739#1" />
<element signature="e#4673#4725#1" />
<element signature="e#4753#5364#1" />
<element signature="e#5015#5059#1" />
<element signature="e#5063#5354#1" />
<element signature="e#5288#5340#1" />
<element signature="e#5510#5948#0" />
<element signature="e#5722#5788#1" />
<element signature="e#5792#5857#1" />
<element signature="e#5954#6452#0" />
<element signature="e#6231#6286#1" />
<element signature="e#6292#6346#1" />
<element signature="e#6458#7679#0" />
<element signature="e#6586#7038#1" />
<element signature="e#6627#7028#1" />
<element signature="e#6767#6871#1" />
<element signature="e#6875#6976#1" />
<element signature="e#7043#7651#1" />
<element signature="e#7109#7474#1" />
<element signature="e#7240#7319#1" />
<element signature="e#7600#7607#0" />
<element signature="e#7564#7641#1" />
<element signature="e#7780#8152#0" />
<element signature="e#7900#8060#0" />
<element signature="e#8080#8124#0" />
<element signature="e#8256#9028#0" />
<element signature="e#8409#8464#1" />
<element signature="e#9121#14132#0" />
<element signature="e#9135#9171#1" />
<element signature="e#9328#9387#1" />
<element signature="e#9841#9874#1" />
<element signature="e#9702#10814#1" />
<element signature="e#9833#10536#1" />
<element signature="e#9884#10522#1" />
<element signature="e#9947#10504#1" />
<element signature="e#11603#11635#1" />
<element signature="e#11482#11609#1" />
<element signature="e#11927#11946#0" />
<element signature="e#13420#13804#1" />
<element signature="e#14468#19793#0" />
<element signature="e#14579#14615#1" />
<element signature="e#14772#14831#1" />
<element signature="e#14964#15027#1" />
<element signature="e#15273#16385#1" />
<element signature="e#15328#16031#1" />
<element signature="e#15379#16017#1" />
<element signature="e#15442#15999#1" />
<element signature="e#16085#16203#1" />
<element signature="e#16209#16332#1" />
<element signature="e#16391#16447#0" />
<element signature="e#14949#15648#1" />
<element signature="e#15000#15062#1" />
<element signature="e#15142#15273#1" />
<element signature="e#15360#15492#1" />
<element signature="e#15496#15626#1" />
<element signature="e#15654#15760#1" />
<element signature="e#16958#17080#1" />
<element signature="e#17084#17172#1" />
<element signature="e#17423#17550#1" />
<element signature="e#17710#17766#1" />
<element signature="e#17851#17909#1" />
<element signature="e#17958#18024#1" />
<element signature="e#18155#19155#1" />
<element signature="e#18356#19145#1" />
<element signature="e#18468#19076#1" />
<element signature="e#18686#19057#1" />
<element signature="e#18880#18991#1" />
<element signature="e#19401#19785#1" />
<element signature="e#19390#24363#0" />
<element signature="e#14507#14904#1" />
<element signature="e#15738#15821#0" />
<element signature="e#14969#15153#1" />
<element signature="e#15294#15649#1" />
<element signature="e#15370#15639#1" />
<element signature="e#15711#15913#1" />
<element signature="e#21568#21770#1" />
<element signature="e#15973#16164#1" />
<element signature="e#21731#21797#0" />
<element signature="e#22473#22664#1" />
<element signature="e#22764#22783#0" />
<element signature="e#17095#18264#1" />
<element signature="e#17147#18253#1" />
<element signature="e#17281#17647#1" />
<element signature="e#17483#17629#1" />
<element signature="e#17698#18239#1" />
<element signature="e#24810#25647#0" />
<element signature="e#24893#25529#1" />
<element signature="e#24940#24994#1" />
<element signature="e#25070#25189#1" />
<element signature="e#25276#25396#1" />
<element signature="e#25400#25518#1" />
<element signature="e#25535#25641#1" />
<element signature="e#24834#25000#0" />
<element signature="e#23200#23268#1" />
<element signature="e#23473#23603#1" />
<element signature="e#23518#23593#1" />
<element signature="e#23797#23942#1" />
<element signature="e#23853#23932#1" />
<element signature="e#24123#24259#1" />
<element signature="e#24175#24249#1" />
<element signature="e#26621#26767#1" />
<element signature="e#26975#28423#0" />
<element signature="e#27205#27322#1" />
<element signature="e#27432#28067#1" />
<element signature="e#27668#27722#1" />
<element signature="e#27787#27929#1" />
<element signature="e#27935#28056#1" />
<element signature="e#28073#28387#1" />
<element signature="e#28139#28265#1" />
<element signature="e#28271#28376#1" />
<element signature="e#28429#28958#0" />
<element signature="e#28579#28615#1" />
<element signature="e#28765#28816#1" />
<element signature="e#28822#28901#1" />
<element signature="e#28964#31264#0" />
<element signature="e#29216#29329#1" />
<element signature="e#29251#29319#1" />
<element signature="e#29497#29627#1" />
<element signature="e#29542#29617#1" />
<element signature="e#29821#29966#1" />
<element signature="e#29877#29956#1" />
<element signature="e#30213#30356#1" />
<element signature="e#30362#30513#1" />
<element signature="e#30746#31233#1" />
<element signature="e#30814#30937#1" />
<element signature="e#30943#31069#1" />
<element signature="e#31093#31155#1" />
<element signature="e#31161#31223#1" />
<element signature="e#31270#32422#0" />
<element signature="e#31484#31575#1" />
<element signature="e#31581#31670#1" />
<element signature="e#31748#31798#1" />
<element signature="e#32128#32204#1" />
<element signature="e#32287#32361#1" />
<element signature="e#32749#33683#1" />
<element signature="e#33496#33560#1" />
<element signature="e#33607#33673#1" />
<element signature="e#33689#34083#1" />
<element signature="e#33815#33881#1" />
<element signature="e#33965#34031#1" />
<element signature="e#34443#35226#0" />
<element signature="e#34688#34801#1" />
<element signature="e#34723#34791#1" />
<element signature="e#34994#35197#1" />
<element signature="e#35038#35187#1" />
<element signature="e#35232#36024#0" />
<element signature="e#35482#35595#1" />
<element signature="e#35517#35585#1" />
<element signature="e#35791#35995#1" />
<element signature="e#35836#35985#1" />
<element signature="e#36030#37802#0" />
<element signature="e#36339#36457#1" />
<element signature="e#36463#36579#1" />
<element signature="e#37049#37162#1" />
<element signature="e#37084#37152#1" />
<element signature="e#37330#37460#1" />
<element signature="e#37375#37450#1" />
<element signature="e#37808#38605#0" />
<element signature="e#38060#38173#1" />
<element signature="e#38095#38163#1" />
<element signature="e#38373#38576#1" />
<element signature="e#38417#38566#1" />
<element signature="e#38879#39249#0" />
<element signature="e#39089#39219#1" />
<element signature="e#39134#39209#1" />
<element signature="e#39255#39585#0" />
<element signature="e#39442#39555#1" />
<element signature="e#39477#39545#1" />
<element signature="e#39591#40716#0" />
<element signature="e#40076#40684#1" />
<element signature="e#40249#40674#1" />
<element signature="e#40502#40578#1" />
<element signature="e#40584#40658#1" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file 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/repository/ContractRelationRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="14" column="39" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317"> <state relative-caret-position="34">
<caret line="616" column="32" selection-start-line="616" selection-start-column="32" selection-end-line="616" selection-end-column="32" /> <caret line="24" column="121" selection-start-line="24" selection-start-column="121" selection-end-line="24" selection-end-column="121" />
<folding> <folding>
<element signature="docComment;class#ContractServiceImpl#0" /> <element signature="imports" expanded="true" />
<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> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <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/util/Constant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="19" column="71" selection-start-line="19" selection-start-column="71" selection-end-line="19" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="176">
<caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" /> <caret line="22" column="31" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="31" />
<folding> <folding>
<element signature="e#431#432#0" expanded="true" /> <element signature="e#5473#5474#0" expanded="true" />
<element signature="e#457#458#0" expanded="true" /> <element signature="e#5507#5508#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="348">
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" /> <caret line="128" column="48" selection-start-line="128" selection-start-column="40" selection-end-line="128" selection-end-column="48" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/mail.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/util/MailUtils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237"> <state relative-caret-position="178">
<caret line="189" selection-start-line="189" selection-end-line="189" /> <caret line="105" column="18" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"> <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-64"> <state relative-caret-position="76">
<caret line="22" column="1" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="54" /> <caret line="79" selection-start-line="79" selection-end-line="79" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -280,7 +365,6 @@ ...@@ -280,7 +365,6 @@
<find>AuthorizationInterceptor</find> <find>AuthorizationInterceptor</find>
<find>loginUser</find> <find>loginUser</find>
<find>accountmng</find> <find>accountmng</find>
<find>saleName</find>
<find>find/pay</find> <find>find/pay</find>
<find>ContractMoneyRepository</find> <find>ContractMoneyRepository</find>
<find>contractMoneyRepository.s</find> <find>contractMoneyRepository.s</find>
...@@ -292,6 +376,21 @@ ...@@ -292,6 +376,21 @@
<find>find</find> <find>find</find>
<find>setContractCode</find> <find>setContractCode</find>
<find>setStatus</find> <find>setStatus</find>
<find>contractIds</find>
<find>find/auth</find>
<find>============</find>
<find>payMoney</find>
<find>pricelevel&quot;</find>
<find>priceLevelName</find>
<find>saleName</find>
<find>list</find>
<find>mailList</find>
<find>Constant.mailList</find>
<find>Constant.mlist</find>
<find>mail.list</find>
<find>已回款</find>
<find>findByDsAndRoile</find>
<find>测试环境</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -304,19 +403,24 @@ ...@@ -304,19 +403,24 @@
<option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" /> <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/model/ContractRelation.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.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/tkio/service/impl/TkioAccountServiceImpl.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/userio/service/impl/AccountIOServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.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/service/ContractService.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" /> <option value="$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/util/Constant.java" />
<option value="$PROJECT_DIR$/src/main/resources/mail.properties" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" />
<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/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/util/MailUtils.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -363,6 +467,7 @@ ...@@ -363,6 +467,7 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -388,11 +493,17 @@ ...@@ -388,11 +493,17 @@
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
</path> </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="resources" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -416,6 +527,19 @@ ...@@ -416,6 +527,19 @@
</option> </option>
</component> </component>
<component name="RunManager" selected="Tomcat Server.tomcat"> <component name="RunManager" selected="Tomcat Server.tomcat">
<configuration name="ContractServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="common.service.impl.ContractServiceImpl" />
<module name="manage" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="common.service.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="LoginController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="LoginController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="common.controller.LoginController" /> <option name="MAIN_CLASS_NAME" value="common.controller.LoginController" />
<module name="manage" /> <module name="manage" />
...@@ -521,9 +645,11 @@ ...@@ -521,9 +645,11 @@
<item itemvalue="Application.LoginController" /> <item itemvalue="Application.LoginController" />
<item itemvalue="Application.UserServiceImpl" /> <item itemvalue="Application.UserServiceImpl" />
<item itemvalue="Tomcat Server.tomcat" /> <item itemvalue="Tomcat Server.tomcat" />
<item itemvalue="Application.ContractServiceImpl" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.ContractServiceImpl" />
<item itemvalue="Application.UserServiceImpl" /> <item itemvalue="Application.UserServiceImpl" />
<item itemvalue="Application.LoginController" /> <item itemvalue="Application.LoginController" />
</list> </list>
...@@ -546,17 +672,19 @@ ...@@ -546,17 +672,19 @@
<workItem from="1556090113838" duration="2748000" /> <workItem from="1556090113838" duration="2748000" />
<workItem from="1556157974475" duration="603000" /> <workItem from="1556157974475" duration="603000" />
<workItem from="1556246315995" duration="115000" /> <workItem from="1556246315995" duration="115000" />
<workItem from="1556504898324" duration="85000" />
<workItem from="1556505038023" duration="24140000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="25471000" /> <option name="totallyTimeSpent" value="55888000" />
</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" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26359516" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1744713" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="UI Designer" order="2" /> <window_info id="UI Designer" order="2" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
...@@ -565,7 +693,7 @@ ...@@ -565,7 +693,7 @@
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32899022" /> <window_info anchor="bottom" id="Run" order="2" weight="0.32899022" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.54885995" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.70358306" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
...@@ -581,7 +709,7 @@ ...@@ -581,7 +709,7 @@
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Maven" order="3" visible="true" weight="0.1918429" /> <window_info anchor="right" id="Maven" order="3" weight="0.1918429" />
<window_info anchor="right" id="Palette" order="4" /> <window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Remote Host" order="5" /> <window_info anchor="right" id="Remote Host" order="5" />
<window_info anchor="right" id="Database" order="6" /> <window_info anchor="right" id="Database" order="6" />
...@@ -592,251 +720,232 @@ ...@@ -592,251 +720,232 @@
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java</url>
<line>316</line>
<properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387"> <state relative-caret-position="189">
<caret line="332" column="47" selection-start-line="332" selection-start-column="47" selection-end-line="332" selection-end-column="47" /> <caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/BPUContract.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/City.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <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="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Code.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="96">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144"> <state relative-caret-position="80">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" /> <caret line="11" column="66" selection-start-line="11" selection-start-column="66" selection-end-line="11" selection-end-column="66" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Email.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64"> <state relative-caret-position="3196">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> <caret line="230" selection-start-line="230" selection-end-line="230" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractIncrement.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="128">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> <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/common/model/IOAccount4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-16">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/KeyValue.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="80"> <state relative-caret-position="324">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> <caret line="400" column="8" selection-start-line="400" selection-start-column="8" selection-end-line="400" selection-end-column="8" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Notice.java"> <entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="192">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/PressMoney.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/AccountIOService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="160">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Payment.java"> <entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="112">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java"> <entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/OtPkgDevStatsRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="112">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Reminder.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="112">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java"> <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="96">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> <caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Role.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/IOAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80"> <state relative-caret-position="-3664">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/SaleAuth.java"> <entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="189">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> <caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/TrackAccount4Web.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80"> <state relative-caret-position="196">
<caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" /> <caret line="130" column="16" selection-start-line="130" selection-start-column="16" selection-end-line="130" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64"> <state relative-caret-position="500">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/AppCategory.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80"> <state relative-caret-position="112">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/TradeType.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="76">
<caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> <caret line="92" column="44" selection-start-line="92" selection-start-column="30" selection-end-line="92" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528"> <state relative-caret-position="-992">
<caret line="53" column="33" selection-start-line="53" selection-start-column="33" selection-end-line="53" selection-end-column="33" /> <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding>
<element signature="e#1100#1101#0" expanded="true" />
<element signature="e#1148#1149#0" expanded="true" />
<element signature="e#1188#1189#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160"> <state relative-caret-position="288">
<caret line="14" column="85" selection-start-line="14" selection-start-column="85" selection-end-line="14" selection-end-column="85" /> <caret line="45" column="38" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="38" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/track/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="-160">
<caret line="180" column="60" lean-forward="true" selection-start-line="180" selection-start-column="60" selection-end-line="180" selection-end-column="60" /> <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="112">
<caret line="129" column="52" lean-forward="true" selection-start-line="129" selection-start-column="52" selection-end-line="129" selection-end-column="52" /> <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189"> <state relative-caret-position="-963">
<caret line="56" column="51" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="51" /> <caret line="185" column="23" selection-start-line="185" selection-start-column="23" selection-end-line="185" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80"> <state relative-caret-position="116">
<caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" /> <caret line="43" column="59" selection-start-line="43" selection-start-column="59" selection-end-line="43" selection-end-column="59" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80"> <state relative-caret-position="-32">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/IncrementFlowRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80"> <state relative-caret-position="-2048">
<caret line="11" column="66" selection-start-line="11" selection-start-column="66" selection-end-line="11" selection-end-column="66" /> <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="-1136">
<caret line="54" selection-start-line="54" selection-end-line="54" /> <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3196"> <state relative-caret-position="-192" />
<caret line="230" selection-start-line="230" selection-end-line="230" />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SaleManServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/persistence.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<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>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/redis.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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324"> <state relative-caret-position="-144" />
<caret line="400" column="8" selection-start-line="400" selection-start-column="8" selection-end-line="400" selection-end-column="8" />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java">
...@@ -846,17 +955,10 @@ ...@@ -846,17 +955,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160"> <state relative-caret-position="192">
<caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -865,286 +967,367 @@ ...@@ -865,286 +967,367 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3"> <state relative-caret-position="445">
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" /> <caret line="75" column="15" selection-start-line="75" selection-start-column="15" selection-end-line="75" selection-end-column="15" />
</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="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="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/userio/service/impl/AccountIOServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244"> <state relative-caret-position="128">
<caret line="29" column="32" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" /> <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="64">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/OtPkgDevStatsRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="256">
<caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> <caret line="16" column="25" lean-forward="true" selection-start-line="12" selection-end-line="16" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="-752">
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/util/HttpClientUtil.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364"> <state relative-caret-position="189">
<caret line="134" selection-start-line="134" selection-end-line="134" /> <caret line="212" column="30" lean-forward="true" selection-start-line="212" selection-start-column="30" selection-end-line="212" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237"> <state relative-caret-position="244">
<caret line="189" selection-start-line="189" selection-end-line="189" /> <caret line="65" column="30" selection-start-line="65" selection-start-column="30" selection-end-line="65" selection-end-column="30" />
<folding>
<element signature="e#1316#1317#0" expanded="true" />
<element signature="e#1356#1357#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116"> <state relative-caret-position="76">
<caret line="57" column="27" lean-forward="true" selection-start-line="57" selection-start-column="27" selection-end-line="57" selection-end-column="27" /> <caret line="79" selection-start-line="79" selection-end-line="79" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/mail.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="112">
<caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" /> <caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-64"> <state relative-caret-position="160">
<caret line="22" column="1" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="54" /> <caret line="14" column="39" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="256">
<caret line="291" column="51" selection-start-line="291" selection-start-column="51" selection-end-line="291" selection-end-column="51" /> <caret line="63" column="41" selection-start-line="63" selection-start-column="41" selection-end-line="63" selection-end-column="41" />
<folding> <folding>
<element signature="docComment;class#ContractController#0" /> <element signature="docComment;class#ContractController#0" />
<element signature="e#1378#1389#0" />
<element signature="class#1420:1957" />
<element signature="e#1433#1958#1" />
<element signature="method#export#0;class#ContractController#0" /> <element signature="method#export#0;class#ContractController#0" />
<element signature="e#3132#3726#1" />
<element signature="e#3177#3716#1" />
<element signature="e#3818#3877#0" />
<element signature="e#3900#3944#0" />
<element signature="method#exportPay#0;class#ContractController#0" /> <element signature="method#exportPay#0;class#ContractController#0" />
<element signature="e#5401#5771#1" />
<element signature="e#5448#5761#1" />
<element signature="e#5863#5922#0" />
<element signature="e#5945#5989#0" />
<element signature="method#findOne#0;class#ContractController#0" />
<element signature="method#checkAccount#0;class#ContractController#0" /> <element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="method#findPricelevel#0;class#ContractController#0" /> <element signature="method#findPricelevel#0;class#ContractController#0" />
<element signature="method#findIncrement#0;class#ContractController#0" /> <element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="method#rebat#0;class#ContractController#0" /> <element signature="method#rebat#0;class#ContractController#0" />
<element signature="e#9954#10015#0" />
<element signature="method#update#0;class#ContractController#0" />
<element signature="e#10566#10625#0" />
<element signature="method#pay#0;class#ContractController#0" /> <element signature="method#pay#0;class#ContractController#0" />
<element signature="e#11180#11242#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="e#11799#11862#0" />
<element signature="method#findPay#0;class#ContractController#0" /> <element signature="method#findPay#0;class#ContractController#0" />
<element signature="e#12154#12220#0" />
<element signature="method#findChange#0;class#ContractController#0" /> <element signature="method#findChange#0;class#ContractController#0" />
<element signature="e#12521#12586#0" />
<element signature="method#updatePay#0;class#ContractController#0" /> <element signature="method#updatePay#0;class#ContractController#0" />
<element signature="e#13183#13249#0" />
<element signature="method#findPayAll#0;class#ContractController#0" /> <element signature="method#findPayAll#0;class#ContractController#0" />
<element signature="e#13555#13616#0" />
<element signature="method#build#0;class#ContractController#0" />
<element signature="e#13851#13911#0" />
<element signature="method#baseCreate#0;class#ContractController#0" />
<element signature="e#14074#14137#0" />
<element signature="e#14308#14371#0" />
<element signature="method#contractStatusUpdate#0;class#ContractController#0" />
</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/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="317"> <state relative-caret-position="294">
<caret line="616" column="32" selection-start-line="616" selection-start-column="32" selection-end-line="616" selection-end-column="32" /> <caret line="731" column="58" selection-start-line="731" selection-start-column="58" selection-end-line="731" selection-end-column="58" />
<folding> <folding>
<element signature="docComment;class#ContractServiceImpl#0" /> <element signature="docComment;class#ContractServiceImpl#0" />
<element signature="e#2598#4002#0" /> <element signature="class#1362:1454" />
<element signature="e#2886#2965#1" /> <element signature="initializer##0;class#1362:1454" />
<element signature="e#2995#3078#1" /> <element signature="e#2758#4162#0" />
<element signature="e#3109#3176#1" /> <element signature="e#3046#3125#1" />
<element signature="e#3251#3296#1" /> <element signature="e#3155#3238#1" />
<element signature="e#3300#3975#1" /> <element signature="e#3269#3336#1" />
<element signature="e#3459#3532#1" /> <element signature="e#3411#3456#1" />
<element signature="e#3536#3664#1" /> <element signature="e#3460#4135#1" />
<element signature="e#3848#3905#1" /> <element signature="e#3619#3692#1" />
<element signature="e#3909#3965#1" /> <element signature="e#3696#3824#1" />
<element signature="e#4008#5231#0" /> <element signature="e#4008#4065#1" />
<element signature="e#4194#4589#1" /> <element signature="e#4069#4125#1" />
<element signature="e#4333#4377#1" /> <element signature="e#4168#5391#0" />
<element signature="e#4381#4579#1" /> <element signature="e#4354#4749#1" />
<element signature="e#4513#4565#1" /> <element signature="e#4493#4537#1" />
<element signature="e#4593#5204#1" /> <element signature="e#4541#4739#1" />
<element signature="e#4855#4899#1" /> <element signature="e#4673#4725#1" />
<element signature="e#4903#5194#1" /> <element signature="e#4753#5364#1" />
<element signature="e#5128#5180#1" /> <element signature="e#5015#5059#1" />
<element signature="e#5350#5788#0" /> <element signature="e#5063#5354#1" />
<element signature="e#5562#5628#1" /> <element signature="e#5288#5340#1" />
<element signature="e#5632#5697#1" /> <element signature="e#5510#5948#0" />
<element signature="e#5794#6292#0" /> <element signature="e#5722#5788#1" />
<element signature="e#6071#6126#1" /> <element signature="e#5792#5857#1" />
<element signature="e#6132#6186#1" /> <element signature="e#5954#6452#0" />
<element signature="e#6298#7519#0" /> <element signature="e#6231#6286#1" />
<element signature="e#6426#6878#1" /> <element signature="e#6292#6346#1" />
<element signature="e#6467#6868#1" /> <element signature="e#6458#7679#0" />
<element signature="e#6607#6711#1" /> <element signature="e#6586#7038#1" />
<element signature="e#6715#6816#1" /> <element signature="e#6627#7028#1" />
<element signature="e#6883#7491#1" /> <element signature="e#6767#6871#1" />
<element signature="e#6949#7314#1" /> <element signature="e#6875#6976#1" />
<element signature="e#7080#7159#1" /> <element signature="e#7043#7651#1" />
<element signature="e#7404#7481#1" /> <element signature="e#7109#7474#1" />
<element signature="e#7620#7992#0" /> <element signature="e#7240#7319#1" />
<element signature="e#7740#7900#0" /> <element signature="e#7600#7607#0" />
<element signature="e#7920#7964#0" /> <element signature="e#7564#7641#1" />
<element signature="e#8096#8868#0" /> <element signature="e#7780#8152#0" />
<element signature="e#8249#8304#1" /> <element signature="e#7900#8060#0" />
<element signature="e#8975#9011#1" /> <element signature="e#8080#8124#0" />
<element signature="e#9168#9227#1" /> <element signature="e#8256#9028#0" />
<element signature="e#9237#9244#0" /> <element signature="e#8409#8464#1" />
<element signature="e#9618#10716#1" /> <element signature="e#9121#14132#0" />
<element signature="e#9673#10376#1" /> <element signature="e#9135#9171#1" />
<element signature="e#9724#10362#1" /> <element signature="e#9328#9387#1" />
<element signature="e#9787#10344#1" /> <element signature="e#9841#9874#1" />
<element signature="e#10459#10577#1" /> <element signature="e#9702#10814#1" />
<element signature="e#10583#10706#1" /> <element signature="e#9833#10536#1" />
<element signature="e#10827#10857#0" /> <element signature="e#9884#10522#1" />
<element signature="e#11322#11449#1" /> <element signature="e#9947#10504#1" />
<element signature="e#11609#11665#1" /> <element signature="e#11603#11635#1" />
<element signature="e#11857#11923#1" /> <element signature="e#11482#11609#1" />
<element signature="e#13260#13644#1" /> <element signature="e#11927#11946#0" />
<element signature="e#13682#18217#0" /> <element signature="e#13420#13804#1" />
<element signature="e#14347#14744#1" /> <element signature="e#14468#19793#0" />
<element signature="e#14607#14666#1" /> <element signature="e#14579#14615#1" />
<element signature="e#14670#14734#1" /> <element signature="e#14772#14831#1" />
<element signature="e#14809#14993#1" /> <element signature="e#14964#15027#1" />
<element signature="e#15134#15489#1" /> <element signature="e#15273#16385#1" />
<element signature="e#15210#15479#1" /> <element signature="e#15328#16031#1" />
<element signature="e#15551#15753#1" /> <element signature="e#15379#16017#1" />
<element signature="e#15813#16004#1" /> <element signature="e#15442#15999#1" />
<element signature="e#16067#16363#1" /> <element signature="e#16085#16203#1" />
<element signature="e#16570#16626#1" /> <element signature="e#16209#16332#1" />
<element signature="e#16711#16769#1" /> <element signature="e#16391#16447#0" />
<element signature="e#16818#16884#1" /> <element signature="e#14949#15648#1" />
<element signature="e#16935#18104#1" /> <element signature="e#15000#15062#1" />
<element signature="e#16987#18093#1" /> <element signature="e#15142#15273#1" />
<element signature="e#17121#17487#1" /> <element signature="e#15360#15492#1" />
<element signature="e#17323#17469#1" /> <element signature="e#15496#15626#1" />
<element signature="e#17538#18079#1" /> <element signature="e#15654#15760#1" />
<element signature="e#18224#22077#0" /> <element signature="e#16958#17080#1" />
<element signature="e#18554#18664#1" /> <element signature="e#17084#17172#1" />
<element signature="e#18586#18654#1" /> <element signature="e#17423#17550#1" />
<element signature="e#18830#18957#1" /> <element signature="e#17710#17766#1" />
<element signature="e#18872#18947#1" /> <element signature="e#17851#17909#1" />
<element signature="e#19149#19291#1" /> <element signature="e#17958#18024#1" />
<element signature="e#19202#19281#1" /> <element signature="e#18155#19155#1" />
<element signature="e#19470#19603#1" /> <element signature="e#18356#19145#1" />
<element signature="e#19519#19593#1" /> <element signature="e#18468#19076#1" />
<element signature="e#19688#19807#1" /> <element signature="e#18686#19057#1" />
<element signature="e#19997#20706#1" /> <element signature="e#18880#18991#1" />
<element signature="e#20212#20266#1" /> <element signature="e#19401#19785#1" />
<element signature="e#20430#20571#1" /> <element signature="e#19390#24363#0" />
<element signature="e#20575#20696#1" /> <element signature="e#14507#14904#1" />
<element signature="e#20710#21101#1" /> <element signature="e#15738#15821#0" />
<element signature="e#20857#20982#1" /> <element signature="e#14969#15153#1" />
<element signature="e#20986#21091#1" /> <element signature="e#15294#15649#1" />
<element signature="e#21149#22048#1" /> <element signature="e#15370#15639#1" />
<element signature="e#21193#22038#1" /> <element signature="e#15711#15913#1" />
<element signature="e#21389#21527#1" /> <element signature="e#21568#21770#1" />
<element signature="e#21588#21724#1" /> <element signature="e#15973#16164#1" />
<element signature="e#21729#21875#1" /> <element signature="e#21731#21797#0" />
<element signature="e#22310#22429#1" /> <element signature="e#22473#22664#1" />
<element signature="e#22538#23162#1" /> <element signature="e#22764#22783#0" />
<element signature="e#22772#22826#1" /> <element signature="e#17095#18264#1" />
<element signature="e#22885#23026#1" /> <element signature="e#17147#18253#1" />
<element signature="e#23030#23151#1" /> <element signature="e#17281#17647#1" />
<element signature="e#23166#23471#1" /> <element signature="e#17483#17629#1" />
<element signature="e#23226#23351#1" /> <element signature="e#17698#18239#1" />
<element signature="e#23355#23460#1" /> <element signature="e#24810#25647#0" />
<element signature="e#23514#25795#0" /> <element signature="e#24893#25529#1" />
<element signature="e#23764#23874#1" /> <element signature="e#24940#24994#1" />
<element signature="e#23796#23864#1" /> <element signature="e#25070#25189#1" />
<element signature="e#24040#24167#1" /> <element signature="e#25276#25396#1" />
<element signature="e#24082#24157#1" /> <element signature="e#25400#25518#1" />
<element signature="e#24359#24501#1" /> <element signature="e#25535#25641#1" />
<element signature="e#24412#24491#1" /> <element signature="e#24834#25000#0" />
<element signature="e#24746#24889#1" /> <element signature="e#23200#23268#1" />
<element signature="e#24894#25045#1" /> <element signature="e#23473#23603#1" />
<element signature="e#25277#25764#1" /> <element signature="e#23518#23593#1" />
<element signature="e#25345#25468#1" /> <element signature="e#23797#23942#1" />
<element signature="e#25474#25600#1" /> <element signature="e#23853#23932#1" />
<element signature="e#25624#25686#1" /> <element signature="e#24123#24259#1" />
<element signature="e#25692#25754#1" /> <element signature="e#24175#24249#1" />
<element signature="e#25801#26944#0" /> <element signature="e#26621#26767#1" />
<element signature="e#26013#26104#1" /> <element signature="e#26975#28423#0" />
<element signature="e#26110#26199#1" /> <element signature="e#27205#27322#1" />
<element signature="e#26275#26325#1" /> <element signature="e#27432#28067#1" />
<element signature="e#26653#26729#1" /> <element signature="e#27668#27722#1" />
<element signature="e#26809#26883#1" /> <element signature="e#27787#27929#1" />
<element signature="e#26950#28944#0" /> <element signature="e#27935#28056#1" />
<element signature="e#27269#28197#1" /> <element signature="e#28073#28387#1" />
<element signature="e#28013#28077#1" /> <element signature="e#28139#28265#1" />
<element signature="e#28121#28187#1" /> <element signature="e#28271#28376#1" />
<element signature="e#28201#28590#1" /> <element signature="e#28429#28958#0" />
<element signature="e#28325#28391#1" /> <element signature="e#28579#28615#1" />
<element signature="e#28472#28538#1" /> <element signature="e#28765#28816#1" />
<element signature="e#28950#29724#0" /> <element signature="e#28822#28901#1" />
<element signature="e#29193#29303#1" /> <element signature="e#28964#31264#0" />
<element signature="e#29225#29293#1" /> <element signature="e#29216#29329#1" />
<element signature="e#29494#29695#1" /> <element signature="e#29251#29319#1" />
<element signature="e#29536#29685#1" /> <element signature="e#29497#29627#1" />
<element signature="e#29730#30513#0" /> <element signature="e#29542#29617#1" />
<element signature="e#29978#30088#1" /> <element signature="e#29821#29966#1" />
<element signature="e#30010#30078#1" /> <element signature="e#29877#29956#1" />
<element signature="e#30282#30484#1" /> <element signature="e#30213#30356#1" />
<element signature="e#30325#30474#1" /> <element signature="e#30362#30513#1" />
<element signature="e#30519#32279#0" /> <element signature="e#30746#31233#1" />
<element signature="e#30826#30944#1" /> <element signature="e#30814#30937#1" />
<element signature="e#30950#31066#1" /> <element signature="e#30943#31069#1" />
<element signature="e#31534#31644#1" /> <element signature="e#31093#31155#1" />
<element signature="e#31566#31634#1" /> <element signature="e#31161#31223#1" />
<element signature="e#31810#31937#1" /> <element signature="e#31270#32422#0" />
<element signature="e#31852#31927#1" /> <element signature="e#31484#31575#1" />
<element signature="e#32285#33074#0" /> <element signature="e#31581#31670#1" />
<element signature="e#32535#32645#1" /> <element signature="e#31748#31798#1" />
<element signature="e#32567#32635#1" /> <element signature="e#32128#32204#1" />
<element signature="e#32844#33045#1" /> <element signature="e#32287#32361#1" />
<element signature="e#32886#33035#1" /> <element signature="e#32749#33683#1" />
<element signature="e#33348#33712#0" /> <element signature="e#33496#33560#1" />
<element signature="e#33555#33682#1" /> <element signature="e#33607#33673#1" />
<element signature="e#33597#33672#1" /> <element signature="e#33689#34083#1" />
<element signature="e#33718#34042#0" /> <element signature="e#33815#33881#1" />
<element signature="e#33902#34012#1" /> <element signature="e#33965#34031#1" />
<element signature="e#33934#34002#1" /> <element signature="e#34443#35226#0" />
<element signature="e#34048#35170#0" /> <element signature="e#34688#34801#1" />
<element signature="e#34530#35138#1" /> <element signature="e#34723#34791#1" />
<element signature="e#34703#35128#1" /> <element signature="e#34994#35197#1" />
<element signature="e#34956#35032#1" /> <element signature="e#35038#35187#1" />
<element signature="e#35038#35112#1" /> <element signature="e#35232#36024#0" />
<element signature="e#35482#35595#1" />
<element signature="e#35517#35585#1" />
<element signature="e#35791#35995#1" />
<element signature="e#35836#35985#1" />
<element signature="e#36030#37802#0" />
<element signature="e#36339#36457#1" />
<element signature="e#36463#36579#1" />
<element signature="e#37049#37162#1" />
<element signature="e#37084#37152#1" />
<element signature="e#37330#37460#1" />
<element signature="e#37375#37450#1" />
<element signature="e#37808#38605#0" />
<element signature="e#38060#38173#1" />
<element signature="e#38095#38163#1" />
<element signature="e#38373#38576#1" />
<element signature="e#38417#38566#1" />
<element signature="e#38879#39249#0" />
<element signature="e#39089#39219#1" />
<element signature="e#39134#39209#1" />
<element signature="e#39255#39585#0" />
<element signature="e#39442#39555#1" />
<element signature="e#39477#39545#1" />
<element signature="e#39591#40716#0" />
<element signature="e#40076#40684#1" />
<element signature="e#40249#40674#1" />
<element signature="e#40502#40578#1" />
<element signature="e#40584#40658#1" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.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="34">
<caret line="24" column="121" selection-start-line="24" selection-start-column="121" selection-end-line="24" selection-end-column="121" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/Constant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="19" column="71" selection-start-line="19" selection-start-column="71" selection-end-line="19" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368"> <state relative-caret-position="176">
<caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" /> <caret line="22" column="31" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="31" />
<folding> <folding>
<element signature="e#431#432#0" expanded="true" /> <element signature="e#5473#5474#0" expanded="true" />
<element signature="e#457#458#0" expanded="true" /> <element signature="e#5507#5508#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="128" column="48" selection-start-line="128" selection-start-column="40" selection-end-line="128" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/MailUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="105" column="18" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="18" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
pom.xml
...@@ -120,11 +120,13 @@ ...@@ -120,11 +120,13 @@
<io.username>root</io.username> <io.username>root</io.username>
<io.password>reyun.123</io.password> <io.password>reyun.123</io.password>
<mail.host>smtp.exmail.qq.com</mail.host> <mail.host>smtp.263.net</mail.host>
<mail.username>manxiaang@reyun.com</mail.username> <mail.username>manager@reyun.com</mail.username>
<mail.password>Mxq123</mail.password> <mail.password>rym@123</mail.password>
<mail.content_type>text/plain;charset\=GBK</mail.content_type> <mail.content_type>text/plain;charset\=GBK</mail.content_type>
<mail.list>zhangliang</mail.list> <mail.list>muchunyu@reyun.com</mail.list>
<mail.prod>true</mail.prod>
<mail.test>kangxiaoshan,muchunyu</mail.test>
<!-- 单位是分钟--> <!-- 单位是分钟-->
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
...@@ -207,11 +209,13 @@ ...@@ -207,11 +209,13 @@
<io.username>reyun</io.username> <io.username>reyun</io.username>
<io.password>Reyun123</io.password> <io.password>Reyun123</io.password>
<mail.host>smtp.exmail.qq.com</mail.host> <mail.host>smtp.263.net</mail.host>
<mail.username>manager@reyun.com</mail.username> <mail.username>manager@reyun.com</mail.username>
<mail.password>Reyun123</mail.password> <mail.password>rym@123</mail.password>
<mail.content_type>text/plain;charset\=GBK</mail.content_type> <mail.content_type>text/plain;charset\=GBK</mail.content_type>
<mail.list>zhangliang</mail.list> <mail.list>muchunyu@reyun.com</mail.list>
<mail.prod>true</mail.prod>
<mail.test>kangxiaoshan@reyun.com</mail.test>
<!-- 单位是分钟--> <!-- 单位是分钟-->
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
......
src/main/java/common/controller/ContractController.java
package common.controller; package common.controller;
import com.google.common.collect.ImmutableList; import common.model.Contract;
import common.model.*; import common.model.ContractChange;
import common.model.ContractMoney;
import common.model.User;
import common.service.ContractService; import common.service.ContractService;
import common.service.MenuService;
import common.task.ContractSendEmailThread; import common.task.ContractSendEmailThread;
import dic.ContractStatusEnum;
import dic.OperateObjectTypeEnum; import dic.OperateObjectTypeEnum;
import exception.TipException;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -21,20 +21,13 @@ import org.springframework.web.bind.annotation.*; ...@@ -21,20 +21,13 @@ import org.springframework.web.bind.annotation.*;
import security.annotation.CurrentAccount; import security.annotation.CurrentAccount;
import util.NewUserLogThread; import util.NewUserLogThread;
import util.ResultModel; import util.ResultModel;
import util.UserLogThread;
import util.ValidateUtil; import util.ValidateUtil;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -47,6 +40,19 @@ import java.util.Map; ...@@ -47,6 +40,19 @@ import java.util.Map;
@RequestMapping("{platform}/contract") @RequestMapping("{platform}/contract")
public class ContractController { public class ContractController {
private static final Logger logger = LoggerFactory.getLogger(ContractController.class); private static final Logger logger = LoggerFactory.getLogger(ContractController.class);
private static final Map<String, String> CONTRACT_STATUS = new HashMap<String, String>() {{
put(ContractStatusEnum.WAIT.getKey(), ContractStatusEnum.WAIT.getValue());
put(ContractStatusEnum.EXECUTING.getKey(), ContractStatusEnum.EXECUTING.getValue());
put(ContractStatusEnum.END.getKey(), ContractStatusEnum.END.getValue());
put(ContractStatusEnum.CANCEL.getKey(), ContractStatusEnum.CANCEL.getValue());
put(ContractStatusEnum.MONEY_BACK_ALL.getKey(), ContractStatusEnum.MONEY_BACK_ALL.getValue());
put(ContractStatusEnum.MONEY_BACK_PART.getKey(), ContractStatusEnum.MONEY_BACK_PART.getValue());
put(ContractStatusEnum.MONEY_BACK_NONE.getKey(), ContractStatusEnum.MONEY_BACK_NONE.getValue());
put(ContractStatusEnum.DELETE.getKey(), ContractStatusEnum.DELETE.getValue());
}};
@Autowired @Autowired
private ContractService service; private ContractService service;
...@@ -63,20 +69,16 @@ public class ContractController { ...@@ -63,20 +69,16 @@ public class ContractController {
public ResponseEntity<byte[]> export(@CurrentAccount User loginAccount, @PathVariable String platform, @RequestParam String startDate public ResponseEntity<byte[]> export(@CurrentAccount User loginAccount, @PathVariable String platform, @RequestParam String startDate
, @RequestParam String endDate, HttpServletRequest request, HttpServletResponse response) { , @RequestParam String endDate, HttpServletRequest request, HttpServletResponse response) {
List<Contract> contractList = service.findAll(loginAccount, startDate, endDate, platform,null); List<Contract> contractList = service.findAll(loginAccount, startDate, endDate, platform,null);
Map<String, String> map = new HashMap<>();
map.put("wait", "未执行");
map.put("executing", "执行中");
map.put("end", "已结束");
map.put("cancel", "作废");
byte[] content = new byte[0]; byte[] content = new byte[0];
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("时间,合同编号,客户账号,签约方,销售,开始日期,结束日期,套餐类型,合同金额,折扣,收款金额,合同状态\r\n"); sb.append("时间,合同编号,客户账号,签约方,销售,开始日期,结束日期,套餐类型,合同金额,收款金额,合同状态\r\n");
if(ValidateUtil.isValid(contractList)){ if(ValidateUtil.isValid(contractList)){
for (Contract c : contractList){ for (Contract c : contractList){
sb.append(c.getDs()).append(",").append(c.getContractCode()).append(",").append(c.getEmail()).append(",").append(c.getCustomerBody()).append(",").append(c.getSaleName()).append(",") sb.append(c.getDs()).append(",").append(c.getContractCode()).append(",").append(c.getEmail()).append(",").append(c.getCustomerBody()).append(",").append(c.getSaleName()).append(",")
.append(c.getStartDate()).append(",").append(c.getEndDate()).append(",").append(c.getPriceLevelName()).append(",").append(c.getMoney()).append(",").append(c.getRebate()).append(",").append(c.getPayMoney()).append(",") .append(c.getStartDate()).append(",").append(c.getEndDate()).append(",").append(c.getPriceLevelName()).append(",").append(c.getMoney()).append(",").append(c.getRebateMoney()).append(",")
.append(map.get(c.getStatus())).append("\r\n"); .append(CONTRACT_STATUS.get(c.getStatus())).append("\r\n");
} }
} }
InputStream in = new ByteArrayInputStream(sb.toString().getBytes()); InputStream in = new ByteArrayInputStream(sb.toString().getBytes());
......
src/main/java/common/model/Contract.java
...@@ -37,7 +37,7 @@ public class Contract { ...@@ -37,7 +37,7 @@ public class Contract {
private Long payMoney; private Long payMoney;
private Long invoice; // 开票次数 private Long invoice; // 开票次数
private String invoiceMoney; // 发票金额 private BigDecimal invoiceMoney; // 发票金额
private String createName; // 创建人NAME private String createName; // 创建人NAME
//合同类型 主套餐 or 增值套餐 //合同类型 主套餐 or 增值套餐
private String type; private String type;
...@@ -57,16 +57,13 @@ public class Contract { ...@@ -57,16 +57,13 @@ public class Contract {
*/ */
private Long discountFlow; // 优惠流量 private Long discountFlow; // 优惠流量
private Long discountTimeLong; // 优惠时长 private Long discountTimeLong; // 优惠时长
private Double rebateMoney; //回款金额 private BigDecimal rebateMoney; //回款金额
private String customerShort;// 客户简称 private String customerShort;// 客户简称
private String customerThird;// 三方客户 private String customerThird;// 三方客户
private int tradeType; // 行业id private int tradeType; // 行业id
private Long relationContract;// 关联合同id private Long relationContract;// 关联合同id
// private String createrName; // 录入人
private String createrName; // 录入人
private String relationCode;// 关联合同编号 private String relationCode;// 关联合同编号
private String hasDiscount;// 是否有优惠 private String hasDiscount;// 是否有优惠
...@@ -262,14 +259,22 @@ public class Contract { ...@@ -262,14 +259,22 @@ public class Contract {
return invoice; return invoice;
} }
public String getInvoiceMoney() { public BigDecimal getRebateMoney() {
return rebateMoney;
}
public BigDecimal getInvoiceMoney() {
return invoiceMoney; return invoiceMoney;
} }
public void setInvoiceMoney(String invoiceMoney) { public void setInvoiceMoney(BigDecimal invoiceMoney) {
this.invoiceMoney = invoiceMoney; this.invoiceMoney = invoiceMoney;
} }
public void setRebateMoney(BigDecimal rebateMoney) {
this.rebateMoney = rebateMoney;
}
public void setInvoice(Long invoice) { public void setInvoice(Long invoice) {
this.invoice = invoice; this.invoice = invoice;
} }
...@@ -366,14 +371,6 @@ public class Contract { ...@@ -366,14 +371,6 @@ public class Contract {
this.discountTimeLong = discountTimeLong; this.discountTimeLong = discountTimeLong;
} }
public Double getRebateMoney() {
return rebateMoney;
}
public void setRebateMoney(Double rebateMoney) {
this.rebateMoney = rebateMoney;
}
public String getCustomerShort() { public String getCustomerShort() {
return customerShort; return customerShort;
} }
...@@ -406,13 +403,13 @@ public class Contract { ...@@ -406,13 +403,13 @@ public class Contract {
this.relationContract = relationContract; this.relationContract = relationContract;
} }
public String getCreaterName() { // public String getCreaterName() {
return createrName; // return createrName;
} // }
//
public void setCreaterName(String createrName) { // public void setCreaterName(String createrName) {
this.createrName = createrName; // this.createrName = createrName;
} // }
@Override @Override
public String toString() { public String toString() {
......
src/main/java/common/repository/ContractRelationRepository.java
...@@ -12,6 +12,6 @@ import java.util.List; ...@@ -12,6 +12,6 @@ import java.util.List;
*/ */
public interface ContractRelationRepository extends JpaRepository<ContractRelation, Long> { public interface ContractRelationRepository extends JpaRepository<ContractRelation, Long> {
@Query(value = "select main_contract from contract_relation where relation_id = ?1",nativeQuery = true) @Query(value = "select relation_id from contract_relation where main_contract = ?1",nativeQuery = true)
List<Long> findRelationIds(String contractId); List<Long> findRelationIds(String contractId);
} }
src/main/java/common/repository/ContractRepository.java
...@@ -22,7 +22,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { ...@@ -22,7 +22,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 order by ds desc",nativeQuery=true) @Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 order by ds desc",nativeQuery=true)
List<Contract> findByDs(String startDate, String endDate, String platfrom); List<Contract> findByDs(String startDate, String endDate, String platfrom);
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and sale in ?4 order by ds desc",nativeQuery=true) @Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and create_account in ?4 order by ds desc",nativeQuery=true)
List<Contract> findByDsAndRoile(String startDate, String endDate, String platfrom, List<Long> userids); List<Contract> findByDsAndRoile(String startDate, String endDate, String platfrom, List<Long> userids);
@Query(value="select * from contract where contract_code = ?1",nativeQuery=true) @Query(value="select * from contract where contract_code = ?1",nativeQuery=true)
...@@ -49,7 +49,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { ...@@ -49,7 +49,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="SELECT * from contract where end_date <= ?1 and (status <> 'end' or status <> 'cancel')",nativeQuery=true) @Query(value="SELECT * from contract where end_date <= ?1 and (status <> 'end' or status <> 'cancel')",nativeQuery=true)
List<Contract> findByEndDate(String endDate); List<Contract> findByEndDate(String endDate);
@Query(value = "select count(*) from contract where platform = ?1",nativeQuery = true) @Query(value = "select count(*) from contract where my_body_code = ?1",nativeQuery = true)
BigInteger findcountContract(String platform); BigInteger findcountContract(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'") @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'")
...@@ -61,6 +61,6 @@ public interface ContractRepository extends JpaRepository<Contract, Long> { ...@@ -61,6 +61,6 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and id in ?4 order by ds desc",nativeQuery=true) @Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and id in ?4 order by ds desc",nativeQuery=true)
List<Contract> findByDsRelation(String startDate, String endDate, String platform, List<Long> contractIds); List<Contract> findByDsRelation(String startDate, String endDate, String platform, List<Long> contractIds);
@Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and sale in ?4 and id in ?5 order by ds desc",nativeQuery=true) @Query(value="select * from contract where start_date >= ?1 and start_date <= ?2 and platform = ?3 and create_account in ?4 and id in ?5 order by ds desc",nativeQuery=true)
List<Contract> findByDsAndRoileRelation(String startDate, String endDate, String platform, List<Long> idList, List<Long> contractIds); List<Contract> findByDsAndRoileRelation(String startDate, String endDate, String platform, List<Long> create_account, List<Long> contractIds);
} }
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -29,6 +29,7 @@ import java.beans.BeanInfo; ...@@ -29,6 +29,7 @@ import java.beans.BeanInfo;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -181,7 +182,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -181,7 +182,7 @@ public class ContractServiceImpl implements ContractService {
@Override @Override
public String getContractCode(String code, String platform, String company) { public String getContractCode(String code, String platform, String company) {
BigInteger countContract = contractRepository.findcountContract(platform); BigInteger countContract = contractRepository.findcountContract(code);
// BigInteger countContract = contractRepository.countNumByDs(DateUtil.getBeforeDays(0)); // BigInteger countContract = contractRepository.countNumByDs(DateUtil.getBeforeDays(0));
...@@ -194,7 +195,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -194,7 +195,7 @@ public class ContractServiceImpl implements ContractService {
} else { } else {
lastCode = "" + (codeInt + 1); lastCode = "" + (codeInt + 1);
} }
return (code + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase(); return code + "-" + platform.toUpperCase() + "-" + DateUtil.getDays2(0) + "-" + lastCode;
} }
@Override @Override
...@@ -220,8 +221,8 @@ public class ContractServiceImpl implements ContractService { ...@@ -220,8 +221,8 @@ public class ContractServiceImpl implements ContractService {
list.add(p); list.add(p);
} }
// 增值套餐 // 增值套餐
List<ContractIncrement> increments = contractIncrementRepository.findAll(); // List<ContractIncrement> increments = contractIncrementRepository.findAll();
list.addAll(increments); // list.addAll(increments);
} else if ("userdesk".equals(platform) || "dmp".equals(platform) || "fake".equals(platform)) { } else if ("userdesk".equals(platform) || "dmp".equals(platform) || "fake".equals(platform)) {
list = bpuContractRepository.findByProduct(platform); list = bpuContractRepository.findByProduct(platform);
} }
...@@ -288,6 +289,10 @@ public class ContractServiceImpl implements ContractService { ...@@ -288,6 +289,10 @@ public class ContractServiceImpl implements ContractService {
resource.setPayMoney(0L); resource.setPayMoney(0L);
resource.setInvoice(0L); resource.setInvoice(0L);
Long extraFlow = resource.getExtraFlow(); Long extraFlow = resource.getExtraFlow();
if(extraFlow==null){
extraFlow = 0L;
}
resource.setDs(DateUtil.getBeforeDays(0)); resource.setDs(DateUtil.getBeforeDays(0));
if (resource.getType().equals("main")) { if (resource.getType().equals("main")) {
...@@ -307,40 +312,29 @@ public class ContractServiceImpl implements ContractService { ...@@ -307,40 +312,29 @@ public class ContractServiceImpl implements ContractService {
} }
} }
if (resource.getRebateMoney() <= 0) { this.dealContractStatus(resource);
//未回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
} else if (resource.getRebateMoney() < resource.getMoney()) {
// 部分回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
} else {
// 已回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
}
if("0".equals(resource.getContractType())){ if (resource.getRelationContract() == null) {
// 首次签约 无关联合同
resource.setRelationContract(-1L); resource.setRelationContract(-1L);
} }
if (null != loginUser) { if (null != loginUser) {
resource.setCreateAccount(loginUser.getId()); resource.setCreateAccount(loginUser.getId());
resource.setCreaterName(loginUser.getName()); resource.setCreateName(loginUser.getName());
} }
resource.setCreateTime(new Date()); resource.setCreateTime(new Date());
//同步修改trackingio的数据 //同步修改trackingio的数据
if (resource.getPlatform().equals("tkio") && resource.getType().equals("main")) { // if (resource.getPlatform().equals("tkio") && resource.getType().equals("main")) {
accountService.update(resource); // accountService.update(resource);
} // }
if (resource.getPlatform().equals("io") && resource.getType().equals("main")) { // if (resource.getPlatform().equals("io") && resource.getType().equals("main")) {
accountIOService.update(resource); // accountIOService.update(resource);
} // }
if (resource.getPlatform().equals("adi")) { // if (resource.getPlatform().equals("adi")) {
adiAccountService.updateAccount(resource); // adiAccountService.updateAccount(resource);
} // }
resource = contractRepository.save(resource); resource = contractRepository.save(resource);
...@@ -411,18 +405,28 @@ public class ContractServiceImpl implements ContractService { ...@@ -411,18 +405,28 @@ public class ContractServiceImpl implements ContractService {
// resource.setStatus("wait"); // resource.setStatus("wait");
} }
if (resource.getRebateMoney() <= 0) { if (resource.getRebateMoney() != null) {
if (resource.getMoney() == null) {
resource.setMoney(0L);
}
if (resource.getRebateMoney().compareTo(BigDecimal.ZERO) < 0) {
//未回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
}else if(resource.getRebateMoney().compareTo(new BigDecimal(resource.getMoney()+""))< 0){
// 部分回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
}else{
// 已回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
}
} else {
//未回款 //未回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey()); resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
} else if (resource.getRebateMoney() < resource.getMoney()) {
// 部分回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
} else {
// 已回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
} }
Double rebat = null; Double rebat = null;
if (null != resource.getPriceLevel()) { if (null != resource.getPriceLevel()) {
rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney()); rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney());
...@@ -436,7 +440,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -436,7 +440,7 @@ public class ContractServiceImpl implements ContractService {
if (null != loginUser) { if (null != loginUser) {
resource.setCreateAccount(loginUser.getId()); resource.setCreateAccount(loginUser.getId());
resource.setCreaterName(loginUser.getName()); resource.setCreateName(loginUser.getName());
} }
resource.setCreateTime(new Date()); resource.setCreateTime(new Date());
...@@ -504,16 +508,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -504,16 +508,9 @@ public class ContractServiceImpl implements ContractService {
cc.setCompany(contract.getCustomerBody()); cc.setCompany(contract.getCustomerBody());
cc.setContractCode(contract.getContractCode()); cc.setContractCode(contract.getContractCode());
if (resource.getRebateMoney() <= 0) {
//未回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey()); this.dealContractStatus(resource);
} else if (resource.getRebateMoney() < resource.getMoney()) {
// 部分回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
} else {
// 已回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
}
if (!resource.getStartDate().equals(contract.getStartDate())) { if (!resource.getStartDate().equals(contract.getStartDate())) {
...@@ -545,30 +542,42 @@ public class ContractServiceImpl implements ContractService { ...@@ -545,30 +542,42 @@ public class ContractServiceImpl implements ContractService {
contract.setMoney(resource.getMoney()); contract.setMoney(resource.getMoney());
} }
if (!resource.getRebateMoney().equals(contract.getRebateMoney())) {
cc.setContent(cc.getContent() + " 回款金额变更： " + contract.getMoney() + "-->" + resource.getMoney());
newRebat = true;
contract.setMoney(resource.getMoney());
}
if (!resource.getSale().equals(contract.getSale())) { if (!resource.getSale().equals(contract.getSale())) {
cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale())); cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
contract.setSale(resource.getSale()); contract.setSale(resource.getSale());
} }
if (newRebat && !"adi".equals(contract.getPlatform())) { // if (newRebat && !"adi".equals(contract.getPlatform())) {
Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney()); // Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney());
BigDecimal bg = new BigDecimal(rebat); // BigDecimal bg = new BigDecimal(rebat);
double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); // double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
// contract.setRebate(f1); //// contract.setRebate(f1);
// }
if (!resource.getSale().equals(contract.getSale())) {
cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
contract.setSale(resource.getSale());
} }
cc.setPlatform(contract.getPlatform()); cc.setPlatform(contract.getPlatform());
contractChangeRepository.save(cc); contractChangeRepository.save(cc);
//同步修改trackingio的数据 //同步修改trackingio的数据
if (contract.getPlatform().equals("tkio") && resource.getType().equals("main")) { // if (contract.getPlatform().equals("tkio") && resource.getType().equals("main")) {
accountService.update(contract); // accountService.update(contract);
} // }
if (contract.getPlatform().equals("io") && resource.getType().equals("main")) { // if (contract.getPlatform().equals("io") && resource.getType().equals("main")) {
accountIOService.update(contract); // accountIOService.update(contract);
} // }
if (contract.getPlatform().equals("adi")) { // if (contract.getPlatform().equals("adi")) {
adiAccountService.updateAccount(contract); // adiAccountService.updateAccount(contract);
} // }
if (contract.getPlatform().equals("tkio")) { if (contract.getPlatform().equals("tkio")) {
if (contract.getType().equals("main")) { if (contract.getType().equals("main")) {
...@@ -594,11 +603,65 @@ public class ContractServiceImpl implements ContractService { ...@@ -594,11 +603,65 @@ public class ContractServiceImpl implements ContractService {
} }
contract.setExtraFlow(resource.getExtraFlow()); contract.setExtraFlow(resource.getExtraFlow());
contract.setTradeType(resource.getTradeType());
contract.setInvoiceMoney(resource.getInvoiceMoney());
contract.setRelationContract(resource.getRelationContract());
contract.setDiscountTimeLong(resource.getDiscountTimeLong());
return contractRepository.save(contract); return contractRepository.save(contract);
} }
private void dealContractStatus(Contract resource){
if (resource.getRebateMoney() != null) {
if (resource.getMoney() == null) {
resource.setMoney(0L);
}
if (resource.getRebateMoney().compareTo(BigDecimal.ZERO) < 0) {
//未回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
}else if(resource.getRebateMoney().compareTo(new BigDecimal(resource.getMoney()+""))< 0){
// 部分回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
}else{
// 已回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
}
} else {
//未回款
resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
}
}
// private Map dealContractChangeMap(Contract resource, Contract contract) throws IllegalAccessException {
//
// Map data = new HashMap();
//
// Class contractClass = contract.getClass();
// Field[] files = contractClass.getDeclaredFields();
//
// for(Field f :files){
// String fieldName = f.getName();
// f.setAccessible(true);
// data.put(fieldName, f.get(fieldName));
// }
// Class resourcec = resource.getClass();
// Field[] resourcecFields = resourcec.getDeclaredFields();
// for(Field f :resourcecFields){
// String fieldName = f.getName();
// f.setAccessible(true);
// data.put(fieldName+"_new", f.get(fieldName));
// }
//
// return data;
//
// }
/** /**
* *
* @param loginAccount * @param loginAccount
...@@ -991,7 +1054,16 @@ public class ContractServiceImpl implements ContractService { ...@@ -991,7 +1054,16 @@ public class ContractServiceImpl implements ContractService {
@Override @Override
public List<Map> contractCodeAll(String platform) { public List<Map> contractCodeAll(String platform) {
return contractRepository.contractCodePlatform(platform);
Map<String,String> data = new HashMap<>();
data.put("id","-1");
data.put("contractCode","无");
List result = new ArrayList();
result.add(data);
result.addAll(contractRepository.contractCodePlatform(platform));
return result;
} }
public Map<Long, String> getPackageMap() { public Map<Long, String> getPackageMap() {
...@@ -1043,4 +1115,17 @@ public class ContractServiceImpl implements ContractService { ...@@ -1043,4 +1115,17 @@ public class ContractServiceImpl implements ContractService {
return returnMap; return returnMap;
} }
// public static void main(String[] args) {
//
// ContractServiceImpl contractService = new ContractServiceImpl();
// try {
// Map data = contractService.dealContractChangeMap(new Contract(), new Contract());
// System.out.println(data);
//
// } catch (IllegalAccessException e) {
// e.printStackTrace();
// }
//
// }
} }
src/main/java/util/Constant.java
...@@ -16,6 +16,8 @@ public class Constant { ...@@ -16,6 +16,8 @@ public class Constant {
public static String mailPassword = mailBundle.getString("mail.password"); public static String mailPassword = mailBundle.getString("mail.password");
public static String mailContentType = mailBundle.getString("mail.content_type"); public static String mailContentType = mailBundle.getString("mail.content_type");
public static String mailList = mailBundle.getString("mail.list"); public static String mailList = mailBundle.getString("mail.list");
public static String mailprod = mailBundle.getString("mail.prod");
public static String mailtestUser = mailBundle.getString("mail.test");
public static List<String> mlist = Arrays.asList(mailList.split(",")); public static List<String> mlist = Arrays.asList(mailList.split(","));
public static String mailValidTime = mailBundle.getString("mail.valid_time"); public static String mailValidTime = mailBundle.getString("mail.valid_time");
......
src/main/java/util/MailUtils.java
...@@ -14,6 +14,7 @@ import org.xbill.DNS.Type; ...@@ -14,6 +14,7 @@ import org.xbill.DNS.Type;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -36,10 +37,21 @@ public class MailUtils { ...@@ -36,10 +37,21 @@ public class MailUtils {
SimpleEmail email = new SimpleEmail(); SimpleEmail email = new SimpleEmail();
email.setHostName(Constant.mailHost); email.setHostName(Constant.mailHost);
email.setAuthentication(FROM_EMAIL_ADDRESS,Constant.mailPassword); email.setAuthentication(FROM_EMAIL_ADDRESS,Constant.mailPassword);
if(!Boolean.getBoolean(Constant.mailprod)){
//测试环境
userEmailAddress = new ArrayList<>();
List<String> users = Arrays.asList(Constant.mailtestUser.split(","));
for(String u :users){
userEmailAddress.add(u+"@reyun.com");
}
}
// 发送给多个人 // 发送给多个人
for (int i = 0; i < userEmailAddress.size(); i++) { for (int i = 0; i < userEmailAddress.size(); i++) {
email.addTo(userEmailAddress.get(i), userEmailAddress.get(i)); email.addTo(userEmailAddress.get(i), userEmailAddress.get(i));
} }
email.setFrom(FROM_EMAIL_ADDRESS, FROM_EMAIL_ADDRESS); email.setFrom(FROM_EMAIL_ADDRESS, FROM_EMAIL_ADDRESS);
email.setSubject(subject); email.setSubject(subject);
email.setContent(contents, CONTENT_TYPE); email.setContent(contents, CONTENT_TYPE);
...@@ -89,6 +101,17 @@ public class MailUtils { ...@@ -89,6 +101,17 @@ public class MailUtils {
MultiPartEmail email = new MultiPartEmail(); MultiPartEmail email = new MultiPartEmail();
email.setHostName(Constant.mailHost); email.setHostName(Constant.mailHost);
email.setAuthentication(Constant.mailUsername,Constant.mailPassword); email.setAuthentication(Constant.mailUsername,Constant.mailPassword);
if(!Boolean.getBoolean(Constant.mailprod)){
//测试环境
userEmailAddress = new ArrayList<>();
List<String> users = Arrays.asList(Constant.mailtestUser.split(","));
for(String u :users){
userEmailAddress.add(u+"@reyun.com");
}
}
// 发送给多个人 // 发送给多个人
for (int i = 0; i < userEmailAddress.size(); i++) { for (int i = 0; i < userEmailAddress.size(); i++) {
email.addTo(userEmailAddress.get(i), userEmailAddress.get(i)); email.addTo(userEmailAddress.get(i), userEmailAddress.get(i));
...@@ -124,6 +147,16 @@ public class MailUtils { ...@@ -124,6 +147,16 @@ public class MailUtils {
HtmlEmail email = new HtmlEmail(); HtmlEmail email = new HtmlEmail();
email.setHostName(Constant.mailHost); email.setHostName(Constant.mailHost);
email.setAuthentication(Constant.mailUsername,Constant.mailPassword); email.setAuthentication(Constant.mailUsername,Constant.mailPassword);
if(!Boolean.getBoolean(Constant.mailprod)){
//测试环境
userEmailAddress = new ArrayList<>();
List<String> users = Arrays.asList(Constant.mailtestUser.split(","));
for(String u :users){
userEmailAddress.add(u+"@reyun.com");
}
}
// 发送给多个人 // 发送给多个人
for (int i = 0; i < userEmailAddress.size(); i++) { for (int i = 0; i < userEmailAddress.size(); i++) {
email.addTo(userEmailAddress.get(i), userEmailAddress.get(i)); email.addTo(userEmailAddress.get(i), userEmailAddress.get(i));
......
src/main/resources/mail.properties
...@@ -3,4 +3,6 @@ mail.username=${mail.username} ...@@ -3,4 +3,6 @@ mail.username=${mail.username}
mail.password=${mail.password} mail.password=${mail.password}
mail.content_type=${mail.content_type} mail.content_type=${mail.content_type}
mail.list=${mail.list} mail.list=${mail.list}
mail.valid_time=${mail.valid_time} mail.valid_time=${mail.valid_time}
\ No newline at end of file mail.prod=${mail.prod}
mail.test=${mail.test}
\ No newline at end of file
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