diff --git a/ghy-admin/src/main/resources/logback.xml b/ghy-admin/src/main/resources/logback.xml
index 2e47b5e4..8534f160 100644
--- a/ghy-admin/src/main/resources/logback.xml
+++ b/ghy-admin/src/main/resources/logback.xml
@@ -27,14 +27,14 @@
- INFO
+ DEBUG
- ACCEPT
+ DENY
- DENY
+ ACCEPT
-
+
${log.path}/sys-error.log
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index f707e4c6..11aa5c68 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -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 details = financialDetailService.selectByFinancialMasterIdAndType(financialMasterId, 3);
- FinancialDetail platformFD = details.get(0);
+ List 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 ---------------------