修改bug

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/service/contractServiceAdj.java

@@ -383,7 +383,7 @@ public class contractServiceAdj {
     public String editServiceSaleEndDate(UserContext uc, String serviceId, LocalDate newEndDate) {
 
         //一次性收费，无需修改
-        if (DBSql.getString("select PERIOD_TYPE from BO_EU_DNCTT_CONTRACT_SERVICE where CONTRACT_SERVICE_ID=?", new Object[]{serviceId}).equals("609")) {
+        if (DBSql.getString("select PERIOD_TYPE from BO_EU_DNCTT_CONTRACT_SERVICE where ID=?", new Object[]{serviceId}).equals("609")) {
             return "无需修改";
         }
 
@@ -392,11 +392,12 @@ public class contractServiceAdj {
 
         LocalDate PERIOD_BEGIN_DATE = TypeUtil.convert(lastServicePeriod.get("PERIOD_BEGIN_DATE"), LocalDate.class);
         LocalDate PERIOD_END_DATE = TypeUtil.convert(lastServicePeriod.get("PERIOD_END_DATE"), LocalDate.class);
-        if (PERIOD_END_DATE.equals(newEndDate)) return "无需修改";
+        if (PERIOD_END_DATE.equals(newEndDate))
+            return "无需修改";
 
         String EFFECTIVE_DATE = DBSql.getString("SELECT max(PERIOD_BEGIN_DATE) as PERIOD_BEGIN_DATE FROM BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD WHERE APPROVE_AND_POST_DATE IS NOT NULL and CONTRACT_SERVICE_ID=? AND  PERIOD_END_DATE >=?", new Object[]{serviceId, LocalDateYYYYMMDD(newEndDate)});
-        if (StringUtils.isBlank(EFFECTIVE_DATE)) return "已审批不能修改了";
-
+        if (StringUtils.isNotBlank(EFFECTIVE_DATE))
+            return "已审批不能修改了";
 
         String bindId = editServiceSale(uc, serviceId, "修改结束日期");
 
@@ -416,11 +417,12 @@ public class contractServiceAdj {
                 LocalDate EFFECTIVE_DATE1 = null;
                 if (StringUtils.isBlank(EFFECTIVE_DATE)) {
                     EFFECTIVE_DATE = DBSql.getString("SELECT max(PERIOD_END_DATE) as PERIOD_END_DATE FROM BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD WHERE  CONTRACT_SERVICE_ID=? AND  PERIOD_BEGIN_DATE <=?", new Object[]{serviceId, LocalDateYYYYMMDD(newEndDate)});
-
+                    EFFECTIVE_DATE= EFFECTIVE_DATE.length() >= 10 ? EFFECTIVE_DATE.substring(0, 10) : EFFECTIVE_DATE;
                     EFFECTIVE_DATE1 = TypeUtil.convert(EFFECTIVE_DATE, LocalDate.class);
                     EFFECTIVE_DATE1 = EFFECTIVE_DATE1.plusDays(1);
 
                 } else {
+                    EFFECTIVE_DATE= EFFECTIVE_DATE.length() >= 10 ? EFFECTIVE_DATE.substring(0, 10) : EFFECTIVE_DATE;
                     EFFECTIVE_DATE1 = TypeUtil.convert(EFFECTIVE_DATE, LocalDate.class);
                 }
 
@@ -529,7 +531,7 @@ public class contractServiceAdj {
         RowMap lastServicePeriod = DBSql.getMap("SELECT * FROM BO_EU_DNIVT_ORDER_PAYMENT_PLAN WHERE CONTRACT_SERVICE_ID=? ORDER BY PERIOD_BEGIN_DATE DESC", new Object[]{serviceId});//最后一笔服务周期
 
         //一次性收费，无需修改
-        if (DBSql.getString("select PURCHASE_PERIOD_TYPE from BO_EU_DNCTT_CONTRACT_SERVICE where CONTRACT_SERVICE_ID=?", new Object[]{serviceId}).equals("609")) {
+        if (DBSql.getString("select PURCHASE_PERIOD_TYPE from BO_EU_DNCTT_CONTRACT_SERVICE where ID=?", new Object[]{serviceId}).equals("609")) {
             return "无需修改";
         }
 
@@ -561,10 +563,14 @@ public class contractServiceAdj {
                 if (StringUtils.isBlank(EFFECTIVE_DATE)) {
                     EFFECTIVE_DATE = DBSql.getString("SELECT max(PERIOD_END_DATE) as PERIOD_END_DATE FROM BO_EU_DNIVT_ORDER_PAYMENT_PLAN WHERE  CONTRACT_SERVICE_ID=? AND  PERIOD_BEGIN_DATE <=?", new Object[]{serviceId, LocalDateYYYYMMDD(newEndDate)});
 
+                    EFFECTIVE_DATE= EFFECTIVE_DATE.length() >= 10 ? EFFECTIVE_DATE.substring(0, 10) : EFFECTIVE_DATE;
+
                     EFFECTIVE_DATE1 = TypeUtil.convert(EFFECTIVE_DATE, LocalDate.class);
                     EFFECTIVE_DATE1 = EFFECTIVE_DATE1.plusDays(1);
 
                 } else {
+                    EFFECTIVE_DATE= EFFECTIVE_DATE.length() >= 10 ? EFFECTIVE_DATE.substring(0, 10) : EFFECTIVE_DATE;
+
                     EFFECTIVE_DATE1 = TypeUtil.convert(EFFECTIVE_DATE, LocalDate.class);
                 }
 
@@ -927,7 +933,7 @@ public class contractServiceAdj {
             for (RowMap payPlan : payPlanList) {
                 LocalDate PAY_PERIOD_BEGIN_DATE = TypeUtil.convert(payPlan.get("PERIOD_BEGIN_DATE"), LocalDate.class);
 
-                SDK.getLogAPI().consoleInfo("PAY_PERIOD_BEGIN_DATE：" + PAY_PERIOD_BEGIN_DATE.toString());
+                //SDK.getLogAPI().consoleInfo("PAY_PERIOD_BEGIN_DATE：" + PAY_PERIOD_BEGIN_DATE.toString());
 
                 // 跳过已处理过的付款计划（通过上一个周期末日期+1判断）
                 if (LAST_DATE != null && PAY_PERIOD_BEGIN_DATE.isBefore(LAST_DATE)) {

com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/service/PaymentPlanService.java

@@ -386,7 +386,7 @@ public class PaymentPlanService {
             for (RowMap payPlan : payPlanList) {
                 LocalDate PAY_PERIOD_BEGIN_DATE = TypeUtil.convert(payPlan.get("PERIOD_BEGIN_DATE"), LocalDate.class);
 
-                SDK.getLogAPI().consoleInfo("PAY_PERIOD_BEGIN_DATE：" + PAY_PERIOD_BEGIN_DATE.toString());
+              //  SDK.getLogAPI().consoleInfo("PAY_PERIOD_BEGIN_DATE：" + PAY_PERIOD_BEGIN_DATE.toString());
 
                 // 跳过已处理过的付款计划（通过上一个周期末日期+1判断）
                 if (LAST_DATE != null && PAY_PERIOD_BEGIN_DATE.isBefore(LAST_DATE)) {