|
|
@@ -171,7 +171,8 @@ public class contractCommissionService {
|
|
|
String FEE_DATE = DBSql.getString("SELECT MAX(c.RECEIVE_DATE) FROM BO_EU_DNCTT_INVOICE_PLAN a JOIN BO_EU_DNCTT_INVOICE_PLAN_DETAIL b ON a.BINDID=b.BINDID JOIN BO_EU_DNCTT_INVOICE_PLAN_RECEIVE c ON a.BINDID=c.BINDID WHERE a.ISEND=1 AND b.ACCOUNT_DEDUCTION_ID=? ", new Object[]{ACCOUNT_DEDUCTION_ID});
|
|
|
if (StringUtils.isBlank(FEE_DATE))
|
|
|
continue;
|
|
|
-
|
|
|
+ serviceLogger.info("FEE_DATE=" + FEE_DATE);
|
|
|
+ FEE_DATE = FEE_DATE.substring(0, 10);
|
|
|
//获取 FEE_DATE 的下个月
|
|
|
FEE_DATE = contractService.getLocalDate(FEE_DATE).plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
|
|
|
period.set("FEE_DATE", FEE_DATE);
|
|
|
@@ -190,11 +191,17 @@ public class contractCommissionService {
|
|
|
SDK.getProcessAPI().deleteById(comssionperiodBindId, uc.getUID());
|
|
|
}
|
|
|
//获取合同服务的周期
|
|
|
- RowMap service = DBSql.getMap("SELECT b.PERIOD_BEGIN_DATE,b.PERIOD_END_DATE,b.PERIOD_COST,b.CONTRACT_SERVICE_ID from BO_EU_DNCRM_ACCOUNT_DEDUCTION a JOIN BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD b ON a.OBJECT_ID=b.ID AND a.TYPE_ID=1325 AND a.ID=? ", new Object[]{ACCOUNT_DEDUCTION_ID});
|
|
|
+ RowMap service = DBSql.getMap("SELECT b.PERIOD_BEGIN_DATE,b.PERIOD_END_DATE,b.PERIOD_COST,b.CONTRACT_SERVICE_ID,b.CONTRACT_ID,c.MINIMUM_PROFIT_MARGIN,c.ALLOW_COMMISSION_PAYMENT from BO_EU_DNCRM_ACCOUNT_DEDUCTION a JOIN BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD b ON a.OBJECT_ID=b.ID AND a.TYPE_ID=1325 JOIN BO_EU_DNCTT_CONTRACT c ON b.CONTRACT_ID=c.ID WHERE a.ID=? ", new Object[]{ACCOUNT_DEDUCTION_ID});
|
|
|
|
|
|
RowMap ded = DBSql.getMap("select * from BO_EU_DNCRM_ACCOUNT_DEDUCTION where ID=?", new Object[]{ACCOUNT_DEDUCTION_ID});
|
|
|
|
|
|
if (service != null) {
|
|
|
+
|
|
|
+ //利润不达标,不需要计算佣金
|
|
|
+ if (RULE_CATE.equals("4648") && service.getDouble("MINIMUM_PROFIT_MARGIN") > 0 && service.getDouble("ALLOW_COMMISSION_PAYMENT") == 0) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
period.set("CONTRACT_SERVICE_ID", service.get("CONTRACT_SERVICE_ID"));
|
|
|
period.set("PERIOD_BEGIN_DATE", service.get("PERIOD_BEGIN_DATE"));//周期开始时间
|
|
|
period.set("PERIOD_END_DATE", service.get("PERIOD_END_DATE"));//周期结束
|
|
|
@@ -211,9 +218,10 @@ public class contractCommissionService {
|
|
|
COST_INCLUDE_TAX = COST_INCLUDE_TAX.subtract(RECEIVED_DOLLARS_INCLUDE_TAX);
|
|
|
|
|
|
if (lastPeriod.get("COST_BF_INCLUDE_TAX") != null) {
|
|
|
- COST_INCLUDE_TAX = COST_INCLUDE_TAX.subtract(TypeUtil.convert(lastPeriod.get("COST_BF_INCLUDE_TAX"), BigDecimal.class));
|
|
|
+ COST_INCLUDE_TAX = COST_INCLUDE_TAX.add(TypeUtil.convert(lastPeriod.get("COST_BF_INCLUDE_TAX"), BigDecimal.class));
|
|
|
}
|
|
|
|
|
|
+ //本次转结成本
|
|
|
if (COST_INCLUDE_TAX.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
period.set("COST_BF_INCLUDE_TAX", COST_INCLUDE_TAX);
|
|
|
}
|
|
|
@@ -264,7 +272,6 @@ public class contractCommissionService {
|
|
|
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) {
|
|
|
case "4647": {
|
|
|
if (commission.getString("INCLUDE_TAX").equals("1")) {
|
|
|
@@ -289,10 +296,10 @@ public class contractCommissionService {
|
|
|
//销售净利百分比:针对已经全部收款的合同服务进行生成,创建一条合同佣金周期记录
|
|
|
BigDecimal RATIO = TypeUtil.convert(commission.get("RATIO"), BigDecimal.class);
|
|
|
//使用含税价
|
|
|
+
|
|
|
if (commission.getString("INCLUDE_TAX").equals("1")) {
|
|
|
COMMISSION_DOLLARS = TypeUtil.convert(bill.get("RECEIVE_AMOUNT"), BigDecimal.class);
|
|
|
|
|
|
- //本期成本(含税)
|
|
|
if (period.containsKey("COST_INCLUDE_TAX") && period.get("COST_INCLUDE_TAX") != null)
|
|
|
COMMISSION_DOLLARS = COMMISSION_DOLLARS.subtract(TypeUtil.convert(period.get("COST_INCLUDE_TAX"), BigDecimal.class));
|
|
|
|
|
|
@@ -300,13 +307,6 @@ public class contractCommissionService {
|
|
|
if (period.containsKey("COST_BF_INCLUDE_TAX") && period.get("COST_BF_INCLUDE_TAX") != null)
|
|
|
COMMISSION_DOLLARS = COMMISSION_DOLLARS.subtract(TypeUtil.convert(period.get("COST_BF_INCLUDE_TAX"), BigDecimal.class));
|
|
|
|
|
|
- period.set("NET_PROFIT", COMMISSION_DOLLARS);//利润
|
|
|
-
|
|
|
- COMMISSION_DOLLARS = COMMISSION_DOLLARS.multiply(RATIO).divide(BigDecimal.valueOf(100), 10, BigDecimal.ROUND_HALF_UP);
|
|
|
-
|
|
|
- COMMISSION_DOLLARS = COMMISSION_DOLLARS.divide(BigDecimal.ONE.add(tax), 10, BigDecimal.ROUND_HALF_UP);
|
|
|
- period.set("COMMISSION_DOLLARS", COMMISSION_DOLLARS);//佣金金额
|
|
|
-
|
|
|
} else {
|
|
|
//使用不含税价
|
|
|
COMMISSION_DOLLARS = TypeUtil.convert(period.get("RECEIVED_DOLLARS"), BigDecimal.class);//不含税已收
|
|
|
@@ -319,13 +319,16 @@ public class contractCommissionService {
|
|
|
if (period.containsKey("COST_BF") && period.get("COST_BF") != null)
|
|
|
COMMISSION_DOLLARS = COMMISSION_DOLLARS.subtract(TypeUtil.convert(period.get("COST_BF"), BigDecimal.class));
|
|
|
|
|
|
- period.set("NET_PROFIT", COMMISSION_DOLLARS);//利润
|
|
|
+ }
|
|
|
|
|
|
+ if (COMMISSION_DOLLARS.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ period.set("NET_PROFIT", COMMISSION_DOLLARS);//利润
|
|
|
COMMISSION_DOLLARS = COMMISSION_DOLLARS.multiply(RATIO).divide(BigDecimal.valueOf(100), 10, BigDecimal.ROUND_HALF_UP);
|
|
|
-
|
|
|
COMMISSION_DOLLARS = COMMISSION_DOLLARS.divide(BigDecimal.ONE.add(tax), 10, BigDecimal.ROUND_HALF_UP);
|
|
|
period.set("COMMISSION_DOLLARS", COMMISSION_DOLLARS);//佣金金额
|
|
|
-
|
|
|
+ } else {
|
|
|
+ period.set("NET_PROFIT", BigDecimal.ZERO);
|
|
|
+ period.set("COMMISSION_DOLLARS", BigDecimal.ZERO);
|
|
|
}
|
|
|
|
|
|
}
|