合同佣金修改bug

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

@@ -150,10 +150,13 @@ public class contractCommissionService {
                 String CONTRACT_COST_ID = commission.getString("CONTRACT_COST_ID");
                 String CONTRACT_SERVICE_ID = commission.getString("CONTRACT_SERVICE_ID");
 
+                serviceLogger.info("CONTRACT_SERVICE_ID=" + CONTRACT_SERVICE_ID);
+                serviceLogger.info("CONTRACT_COST_ID=" + CONTRACT_COST_ID);
+
                 if (StringUtils.isBlank(CONTRACT_COST_ID) && StringUtils.isBlank(CONTRACT_SERVICE_ID))
                     continue;
 
-                List<RowMap> bills = DBSql.getMaps("SELECT a.* FROM VIEW_EU_DNCTT_INVOICE_DETAIL a WHERE a.CONTRACT_ID =? AND a.RECEIVE_AMOUNT > 0 AND a.INVOICE_AMOUNT = 0 AND NOT EXISTS( SELECT 1 FROM BO_EU_DNCTT_SALES_COMMISSION_PERIOD b WHERE b.SALES_COMMISSION_ID =? AND b.CONTRACT_ID = a.CONTRACT_ID AND b.PAY_AMOUNT > 0 AND b.INVOICE_DETAIL_ID = a.ID) AND EXISTS ( SELECT 1 FROM BO_EU_DNCRM_ACCOUNT_DEDUCTION c WHERE c.ID = a.ACCOUNT_DEDUCTION_ID AND ( ( c.TYPE_ID = 1325 AND FIND_IN_SET( c.OBJECT_ID, ? )) OR ( c.TYPE_ID = 1321 AND FIND_IN_SET( c.OBJECT_ID, ? ) ) ) )", new Object[]{commission.getString("CONTRACT_ID"), commission.getString("ID"), CONTRACT_SERVICE_ID, CONTRACT_COST_ID});
+                List<RowMap> bills = DBSql.getMaps("SELECT a.* FROM VIEW_EU_DNCTT_INVOICE_DETAIL a WHERE a.CONTRACT_ID =? AND a.RECEIVE_AMOUNT > 0 AND a.INVOICE_AMOUNT = 0 AND NOT EXISTS( SELECT 1 FROM BO_EU_DNCTT_SALES_COMMISSION_PERIOD b WHERE b.SALES_COMMISSION_ID =? AND b.CONTRACT_ID = a.CONTRACT_ID AND b.PAY_AMOUNT > 0 AND b.INVOICE_DETAIL_ID = a.ID) AND ( EXISTS ( SELECT 1 FROM BO_EU_DNCRM_ACCOUNT_DEDUCTION c WHERE c.ID = a.ACCOUNT_DEDUCTION_ID AND c.TYPE_ID = 1321 AND FIND_IN_SET( c.OBJECT_ID, ? ) ) OR EXISTS ( SELECT 1 FROM BO_EU_DNCRM_ACCOUNT_DEDUCTION c JOIN BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD d ON c.OBJECT_ID = d.ID WHERE c.ID = a.ACCOUNT_DEDUCTION_ID AND c.TYPE_ID = 1325 AND FIND_IN_SET( d.CONTRACT_SERVICE_ID, ? ) ))", new Object[]{commission.getString("CONTRACT_ID"), commission.getString("ID"), CONTRACT_COST_ID, CONTRACT_SERVICE_ID});
 
                 serviceLogger.info("获取付款的收费条目：" + bills.size());
 
@@ -235,20 +238,20 @@ public class contractCommissionService {
                     //period.set("COST_INCLUDE_TAX", bill.get(""));//本期成本（含税）
                     //period.set("COST_BF_INCLUDE_TAX", bill.get(""));//上期结转成本（含税）
 
-                    if (shou_tax.compareTo(BigDecimal.ZERO) > 0) {
+                   // if (shou_tax.compareTo(BigDecimal.ZERO) > 0) {
                         shou_tax = BigDecimal.ONE.add(shou_tax);
                         period.set("RECEIVABLE_DOLLARS", TypeUtil.convert(period.get("RECEIVABLE_DOLLARS_INCLUDE_TAX"), BigDecimal.class).divide(shou_tax, 10, BigDecimal.ROUND_HALF_UP));//本期应收款（不含税）
 
                         period.set("RECEIVED_DOLLARS", TypeUtil.convert(period.get("RECEIVED_DOLLARS_INCLUDE_TAX"), BigDecimal.class).divide(shou_tax, 10, BigDecimal.ROUND_HALF_UP));//本期已收款（不含税）
-                    }
+                   // }
 
-                    if (fu_tax.compareTo(BigDecimal.ZERO) > 0) {
+                   // if (fu_tax.compareTo(BigDecimal.ZERO) > 0) {
                         fu_tax = BigDecimal.ONE.add(fu_tax);
                         if (period.containsKey("COST_INCLUDE_TAX") && period.get("COST_INCLUDE_TAX") != null)
                             period.set("COST", TypeUtil.convert(period.get("COST_INCLUDE_TAX"), BigDecimal.class).divide(fu_tax, 10, BigDecimal.ROUND_HALF_UP));//本期成本（不含税）
                         if (period.containsKey("COST_BF_INCLUDE_TAX") && period.get("COST_BF_INCLUDE_TAX") != null)
                             period.set("COST_BF", TypeUtil.convert(period.get("COST_BF_INCLUDE_TAX"), BigDecimal.class).divide(fu_tax, 10, BigDecimal.ROUND_HALF_UP));//上期结转成本（不含税）
-                    }
+                   // }
 
 
                     switch (RULE_CATE) {