入账bug
diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java b/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
index 6163c00..dad6b2b 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
@@ -50,13 +50,13 @@
/**
* feetype
- * -消费，折扣、搭伙费
- * -充值，优惠、服务费（手续费）
+ * - 消费：折扣、搭伙费（管理费）
+ * - 充值：优惠、服务费（手续费）
* */
- public static final String FEETYPE_CONSUME_MEALER="mealer";
- public static final String FEETYPE_CONSUME_DISCOUNT="discount";
+ public static final String FEETYPE_CONSUME_MEALER="mealer"; //收管理费
+ public static final String FEETYPE_CONSUME_DISCOUNT="discount"; //折扣款抵扣
- public static final String PAYTYPE_DPS_COUPON="coupon";
- public static final String PAYTYPE_DPS_SERVICEFEE="servicefee";
+ public static final String PAYTYPE_RECHARGE_COUPON="coupon"; // 充值优惠
+ public static final String PAYTYPE_RECHARGE_SERVICEFEE="servicefee"; //收服务费
}
diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt
index b592a60..e0d792f 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/consume/service/impl/pay_service_impl.kt
@@ -234,10 +234,10 @@
for (detail in debitCreditDtlDao.findByRefno(userdtl.refno)) {
//个人账户入账
if (TradeDict.SUBJNO_ACCOUNT == detail.drsubjno) {
- doDealAccount(detail.drsubjno, -1 * detail.amount, false) //借方消费
+ doDealAccount(detail.draccno, -1 * detail.amount, false) //借方消费
}
if (TradeDict.SUBJNO_ACCOUNT == detail.crsubjno) {
- doDealAccount(detail.drsubjno, detail.amount, false) //贷方充值
+ doDealAccount(detail.craccno, detail.amount, false) //贷方充值
}
//商户入账
@@ -245,7 +245,7 @@
doDealShopacc(detail.draccno, -1 * detail.amount)
}
if (TradeDict.SUBJNO_SHOP == detail.crsubjno) {
- doDealShopacc(detail.draccno, detail.amount)
+ doDealShopacc(detail.craccno, detail.amount)
}
}