二版

pom.xml

@@ -93,25 +93,29 @@
         <!--数据源配置-->
         <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
         <!--//office-->
-        <default.datasource.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</default.datasource.url>
-        <default.datasource.username>reyuntest</default.datasource.username>
-        <default.datasource.password>reyuntest</default.datasource.password>
+        <default.datasource.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</default.datasource.url>
+        <default.datasource.username>reyun</default.datasource.username>
+        <default.datasource.password>reyun123</default.datasource.password>
 
-        <office.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8</office.url>
-        <office.username>reyuntest</office.username>
-        <office.password>reyuntest</office.password>
+        <office.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8</office.url>
+        <office.username>reyun</office.username>
+        <office.password>reyun123</office.password>
 
-        <tkio.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/trackingio_test?characterEncoding=utf-8</tkio.url>
-        <tkio.username>reyuntest</tkio.username>
-        <tkio.password>reyuntest</tkio.password>
+        <tkio.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/trackingio_test?characterEncoding=utf-8</tkio.url>
+        <tkio.username>reyun</tkio.username>
+        <tkio.password>reyun123</tkio.password>
 
-        <track.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/track_test?characterEncoding=utf-8</track.url>
-        <track.username>reyuntest</track.username>
-        <track.password>reyuntest</track.password>
+        <track.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/track_test?characterEncoding=utf-8</track.url>
+        <track.username>reyun</track.username>
+        <track.password>reyun123</track.password>
 
-        <dmp.url>jdbc:mysql://testreyun.cjxbwnaf9ore.rds.cn-northwest-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</dmp.url>
-        <dmp.username>reyuntest</dmp.username>
-        <dmp.password>reyuntest</dmp.password>
+        <dmp.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/manager?characterEncoding=utf-8</dmp.url>
+        <dmp.username>reyun</dmp.username>
+        <dmp.password>reyun123</dmp.password>
+
+        <io.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8</io.url>
+        <io.username>reyun</io.username>
+        <io.password>reyun123</io.password>
 
         <mail.host>smtp.exmail.qq.com</mail.host>
         <mail.username>manxiaoqiang@reyun.com</mail.username>

src/main/java/tkio/model/Account.java

@@ -68,6 +68,15 @@ public class Account {
     private Boolean isFlowRestrict;
 	private String modifyPricelevelTime;
 	private Boolean newContract;
+	private Boolean startByContract;
+
+	public Boolean getStartByContract() {
+		return startByContract;
+	}
+
+	public void setStartByContract(Boolean startByContract) {
+		this.startByContract = startByContract;
+	}
 
 	public Boolean getFlowRestrict() {
 		return isFlowRestrict;

src/main/java/tkio/service/impl/AccountServiceImpl.java

@@ -28,13 +28,17 @@ public class AccountServiceImpl implements AccountService {
         String today = DateUtil.getBeforeDays(0);
         Date pubDate = DateUtil.getDate(contract.getStartDate());
 
-        account.setPastDate(contract.getEndDate());
-        account.setNewContract(true);
         account.setPubDate(pubDate);
-        account.setModifyPricelevelTime(contract.getStartDate());
+        account.setPastDate(contract.getEndDate());
+        account.setPricelevel(contract.getPriceLevel());
+
         account.setModifyTime(new Date());
         account.setModifyAccount(0l);
-        account.setPricelevel(contract.getPriceLevel());
+        if(account.getStartByContract()){
+            account.setNewContract(true);
+            account.setModifyPricelevelTime(contract.getStartDate());
+
+        }
         if(!(contract.getEndDate().compareTo(today) < 0)){
             account.setStatus(1);
         }