clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修改日志和子订单结算时手续费问题

This commit is contained in:
HH 2022-12-21 15:17:46 +08:00
parent 1803c04e4c
commit c743577b2b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghy-admin/src/main/resources/logback.xml
View File

@ -27,14 +27,14 @@
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<level>DEBUG</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<onMatch>DENY</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
<onMismatch>ACCEPT</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->

13
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.ghy.common.adapay.model.PaymentDTO;
import com.ghy.common.constant.UserConstants;
import com.ghy.common.core.text.Convert;
import com.ghy.common.enums.AdapayOrderType;
import com.ghy.common.enums.FinancialDetailType;
import com.ghy.common.enums.OrderStatus;
import com.ghy.common.enums.PayStatus;
import com.ghy.common.exception.base.BaseException;
@ -357,10 +358,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
}
Long financialMasterId = financialDetail.getFinancialMasterId();
// 找到 type=平台抽成 的子财务单 用来承担手续费
List<FinancialDetail> details = financialDetailService.selectByFinancialMasterIdAndType(financialMasterId, 3);
FinancialDetail platformFD = details.get(0);
List<FinancialDetail> details = financialDetailService.selectByFinancialMasterIdAndType(financialMasterId, FinancialDetailType.PLATFORM_FEE.getCode());
FinancialDetail platformFeeFD = details.get(0);
FinancialDetail update = new FinancialDetail();
update.setId(platformFD.getId());
update.setId(platformFeeFD.getId());
logger.debug("子订单[code={}]的完单流程开始", odCode);
@ -401,9 +402,9 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 这是被扣掉的手续费
String fee_amt = response.getString("fee_amt");
feeAmt = new BigDecimal(fee_amt);
if (feeAmt.compareTo(platformFD.getPayMoney()) < 0 && !"0.00".equals(fee_amt)) {
if (feeAmt.compareTo(platformFeeFD.getPayMoney()) < 0 && !"0.00".equals(fee_amt)) {
// 用平台抽成来补偿改价单的手续费 修改平台抽成子财务单金额
update.setPayMoney(platformFD.getPayMoney().subtract(feeAmt));
update.setPayMoney(platformFeeFD.getPayMoney().subtract(feeAmt));
int i = financialDetailService.updateFinancialDetail(update);
compensate = i > 0;
} else {
@ -470,7 +471,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 待提现金额里加入子财务单金额
dtx = dtx.add(payMoney);
// 修改平台抽成子财务单金额
update.setPayMoney(platformFD.getPayMoney().subtract(fee));
update.setPayMoney(platformFeeFD.getPayMoney().subtract(fee));
financialDetailService.updateFinancialDetail(update);
}
// --------------------- 子财务单分账部分 end ---------------------