修改bug

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/job/ServicePeriodMonthJob.java

@@ -44,9 +44,10 @@ public class ServicePeriodMonthJob implements Job {
 
         for (RowMap servicePeriod : servicePeriodlist) {
 
-            double SERVICE_QUANTITY = servicePeriod.getDouble("SERVICE_QUANTITY");
+            double QUANTITY = servicePeriod.getDouble("QUANTITY");
+
             double PARTYA_UNIT_PRICE_MONTH = servicePeriod.getDouble("PARTYA_UNIT_PRICE_MONTH");//三方含税单位价格
-            PARTYA_UNIT_PRICE_MONTH = PARTYA_UNIT_PRICE_MONTH * SERVICE_QUANTITY;
+            PARTYA_UNIT_PRICE_MONTH = PARTYA_UNIT_PRICE_MONTH * QUANTITY;
 
             String PERIOD_TYPE = servicePeriod.getString("PERIOD_TYPE");
             //一次性
@@ -68,7 +69,7 @@ public class ServicePeriodMonthJob implements Job {
             LocalDate period_begin_date = getLocalDate(servicePeriod.get("PERIOD_BEGIN_DATE"));
             LocalDate period_end_date = getLocalDate(servicePeriod.get("PERIOD_END_DATE"));
             double UNIT_PRICE_MONTH = servicePeriod.getDouble("UNIT_PRICE_MONTH");
-            UNIT_PRICE_MONTH = UNIT_PRICE_MONTH * SERVICE_QUANTITY;//每月单位价格
+            UNIT_PRICE_MONTH = UNIT_PRICE_MONTH * QUANTITY;//每月单位价格
 
             List<Map<String, String>> monthRateList = getMonthRateList(period_begin_date, period_end_date);
 

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

@@ -1154,11 +1154,15 @@ public class contractService {
         }
 
         //删除历史数据
+        /*
         List<String> cspIdList = DBSql.getList(conn, "select ID from BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD where BINDID=? and CONTRACT_ID=? and OBJECT_ID=? and CONTRACT_SERVICE_ID=?", String.class, new Object[]{service.get("BINDID"), contract.get("ID"), service.get("OBJECT_ID"), service.get("ID")});
         for (String cspId : cspIdList) {
             DBSql.update(conn, "delete from BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD_BUNDLE_SERVICE where BINDID=? and CONTRACT_SERVICE_PERIOD_ID=? ", new Object[]{service.get("BINDID"), cspId});
         }
-        DBSql.update(conn, "delete from BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD where BINDID=? and CONTRACT_ID=? and OBJECT_ID=? and CONTRACT_SERVICE_ID=?", new Object[]{service.get("BINDID"), contract.get("ID"), service.get("OBJECT_ID"), service.get("ID")});
+         */
+
+        //删除历史服务周期
+        DBSql.update(conn, "delete from BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD where CONTRACT_SERVICE_ID=?", new Object[]{service.get("ID")});
 
 
         String PERIOD_TYPE = service.getString("PERIOD_TYPE");//服务周期类型
@@ -2662,6 +2666,8 @@ public class contractService {
 
                 String ORGID = uc.getCompanyModel().getId();
 
+                String BILL_TO_ACCOUNT_ID=DBSql.getString("select BILL_ACCOUNT_ID from VIEW_EU_DNV_PENDING_RECURRING_CONTRACT where ID=?",new Object[]{approveId});
+
                 //BO_EU_DNCTT_CONTRACT
                 BO bo = SDK.getBOAPI().get("BO_EU_DNCTT_CONTRACT", approveId);//合同初始费用
                 if (bo != null) {
@@ -2676,7 +2682,10 @@ public class contractService {
                     cad.set("QUANTITY", 1);
                     cad.set("BILL_CREATE_USER_ID", bo.getCreateUser());//创建人
                     cad.set("ACCOUNT_ID", bo.getString("ACCOUNT_ID"));
-                    cad.set("BILL_ACCOUNT_ID", bo.getString("BILL_TO_ACCOUNT_ID"));
+                   // cad.set("BILL_ACCOUNT_ID", bo.getString("BILL_TO_ACCOUNT_ID"));
+
+                    cad.set("BILL_ACCOUNT_ID",BILL_TO_ACCOUNT_ID);
+
                     cad.set("EXTENDED_PRICE", bo.get("ADJUST_SETUP_FEE"));
 
                     if (StringUtils.isNotBlank(bo.getString("SETUP_FEE_COST_CODE_ID"))) {
@@ -2702,7 +2711,9 @@ public class contractService {
 
                         cad.set("BILL_CREATE_USER_ID", bo.getCreateUser());//创建人
                         cad.set("ACCOUNT_ID", DBSql.getString("SELECT ACCOUNT_ID FROM BO_EU_DNCTT_CONTRACT WHERE ID = ?", new Object[]{bo.getString("CONTRACT_ID")}));
-                        cad.set("BILL_ACCOUNT_ID", DBSql.getString("SELECT BILL_TO_ACCOUNT_ID FROM BO_EU_DNCTT_CONTRACT WHERE ID = ?", new Object[]{bo.getString("CONTRACT_ID")}));
+                        //cad.set("BILL_ACCOUNT_ID", DBSql.getString("SELECT BILL_TO_ACCOUNT_ID FROM BO_EU_DNCTT_CONTRACT WHERE ID = ?", new Object[]{bo.getString("CONTRACT_ID")}));
+
+                        cad.set("BILL_ACCOUNT_ID",BILL_TO_ACCOUNT_ID);
 
                         cad.set("EXTENDED_PRICE", bo.get("PERIOD_ADJUSTED_PRICE"));
                         cad.set("EXTENDED_COST", bo.get("PERIOD_COST"));