Skip to content

H
huhu-partner
Commit a171a611 by guanchen
Options

修改结算公式, 代理商不扣税, 合伙人不转银行卡

parent 868a76c7
Showing with 28 additions and 52 deletions
pom.xml
......@@ -11,7 +11,7 @@
</parent>
<groupId>com.lanren.huhu</groupId>
<artifactId>partner</artifactId>
<artifactId>huhu_finance</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>partner</name>
<description>呼呼省钱合伙人相关服务</description>
......@@ -153,14 +153,11 @@
<redis.host>10.9.186.167</redis.host>
<redis.password>passwdredis</redis.password>
<spring.profiles.active>dev</spring.profiles.active>
<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>
<!--<providers-path>/data/java/service</providers-path>-->
<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>
<logfile_path>/data/logs/java</logfile_path>
<!--<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>-->
<providers-path>/data/java/service</providers-path>
<!--<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>-->
</properties>
<!-- 默认是本地开发环境 -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!-- 测试环境 -->
......@@ -175,11 +172,15 @@
<redis.host>10.9.186.167</redis.host>
<redis.password>passwdredis</redis.password>
<spring.profiles.active>dev</spring.profiles.active>
<!-- <logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>-->
<logfile_path>/data/logs/java</logfile_path>
<!--<providers-path>/data/java/service</providers-path>-->
<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>
<!--<logfile_path>/Users/chen/Develop/workspace/partner/data/release/dev/logs</logfile_path>-->
<providers-path>/data/java/service</providers-path>
<!--<providers-path>/Users/chen/Develop/workspace/partner/data/release/dev</providers-path>-->
</properties>
<!-- 默认是本地开发环境 -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<!-- 生产环境 -->
......
src/main/java/com/lanren/huhu/partner/schedule/AgentSettleTask.java
......@@ -120,15 +120,7 @@ public class AgentSettleTask {
}
private void updateTax(AgentSettle agentSettle) {
BigDecimal tax = agentSettle.getBalance()
.subtract(agentSettle.getZigoushengBalance())
.subtract(agentSettle.getShareBalance())
.subtract(agentSettle.getTechChargeRedpack())
.subtract(BigDecimal.valueOf(800L))
.multiply(BigDecimal.valueOf(0.1d));
if (tax.compareTo(BigDecimal.ZERO) <= 0) {
tax = BigDecimal.ZERO;
}
BigDecimal tax = BigDecimal.ZERO;
agentSettle.setTax(tax);
}
......
src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
......@@ -675,48 +675,31 @@ public class PartnerSettleTask {
private static boolean setIncomeAndTax(PartnerSettle partnerSettle) {
try {
/**
* base为算税部分收入
*/
BigDecimal base = partnerSettle.getSumRedpack().add(partnerSettle.getSumOthers());
/**
* 订单收入全部计入微信 并且不计税
* wxIncome 和 bankIncome 均为扣税后的收入
*/
BigDecimal wxIncome = partnerSettle.getSumOrderCommission();
BigDecimal wxTax = ZERO;
BigDecimal bankIncome = ZERO;
BigDecimal bankTax = ZERO;
// 所有按左开右闭统计
if (base.compareTo(Constants.TAX_STAGE_FREE_BASE) <= 0) {
/**
* [0,800]
*/
wxIncome = wxIncome.add(base);
} else if (base.compareTo(Constants.TAX_STAGE_FREE_BASE) == 1 && base.compareTo(Constants.TAX_STAGE_1) <= 0) {
/**
* (800,4000]
*/
wxTax = base.subtract(Constants.TAX_STAGE_FREE_BASE).multiply(Constants.TAX_STAGE_1_RATE1).multiply(Constants.TAX_STAGE_1_RATE2);
wxIncome = wxIncome.add(base).subtract(wxTax);
} else if (base.compareTo(Constants.TAX_STAGE_1) == 1 && base.compareTo(Constants.TAX_STAGE_WX_MAX) <= 0) {
BigDecimal taxRate = BigDecimal.valueOf(0.075).divide(BigDecimal.valueOf(1.075));
BigDecimal wxTax;
/**
* (4000-17076.5]
* 大于800的部分 按 乘以系数 ( 0.075 / (1 + 0.075) ) 算税
*/
wxTax = base.multiply(Constants.TAX_STAGE_WX_MAX_RATE1).multiply(Constants.TAX_STAGE_WX_MAX_RATE2).multiply(Constants.TAX_STAGE_WX_MAX_RATE3);
wxIncome = wxIncome.add(base).subtract(wxTax);
if (base.compareTo(Constants.TAX_STAGE_FREE_BASE) <= 0) {
wxTax = BigDecimal.ZERO;
} else {
/**
* (17076.5,)
*
* 微信收入: 17076.5-17076.5*0.8*0.2*0.76
*/
wxTax = Constants.TAX_STAGE_WX_MAX.multiply(Constants.TAX_STAGE_WX_MAX_RATE1).multiply(Constants.TAX_STAGE_WX_MAX_RATE2).multiply(Constants.TAX_STAGE_WX_MAX_RATE3);
wxIncome = wxIncome.add(Constants.TAX_STAGE_WX_MAX).subtract(wxTax);
bankTax = base.subtract(Constants.TAX_STAGE_WX_MAX).multiply(Constants.BANK_RATE);
bankIncome = base.subtract(Constants.TAX_STAGE_WX_MAX).subtract(bankTax);
BigDecimal calTaxPart = base.subtract(Constants.TAX_STAGE_FREE_BASE);
wxTax = calTaxPart.multiply(taxRate);
}
partnerSettle.setWxIncome(wxIncome);
partnerSettle.setWxTax(wxTax);
partnerSettle.setBankIncome(bankIncome);
partnerSettle.setBankTax(bankTax);
wxIncome = wxIncome.add(base).subtract(wxTax);
partnerSettle.setWxIncome(wxIncome);
partnerSettle.setBankIncome(BigDecimal.ZERO);
partnerSettle.setBankTax(BigDecimal.ZERO);
return true;
} catch (Exception e) {
logger.error(e.getMessage(), e);
......
src/main/resources/application.yml
......@@ -103,7 +103,7 @@ mybatis-plus:
logging:
level:
#打印SQL信息
com.lanren.huhu.partner.dao: info
com.lanren.huhu.partner.dao: debug
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment