|
@@ -507,17 +507,14 @@ public class CmRefundsProductController extends BaseController {
|
|
|
cmReturnedPurchase.setRefundOnlineBalanceFee(refundFee - userMoney);
|
|
|
}
|
|
|
//统计填写的拆分金额
|
|
|
- Double refundBanlace = null == cmReturnedPurchase.getRefundBalanceFee() ? 0 : cmReturnedPurchase.getRefundBalanceFee();
|
|
|
- Double refundOnline = null == cmReturnedPurchase.getRefundOnlineFee() ? 0 : cmReturnedPurchase.getRefundOnlineFee();
|
|
|
- Double refundOffline = null == cmReturnedPurchase.getRefundOfflineFee() ? 0 : cmReturnedPurchase.getRefundOfflineFee();
|
|
|
- Double refundOnlineBalance = null == cmReturnedPurchase.getRefundOnlineBalanceFee() ? 0 : cmReturnedPurchase.getRefundOnlineBalanceFee();
|
|
|
- Double totalRefundFee = refundBanlace + refundOnline + refundOffline + refundOnlineBalance;
|
|
|
+ Double totalRefundFee = cmReturnedPurchase.getRefundBalanceFee() + cmReturnedPurchase.getRefundOnlineFee() + cmReturnedPurchase.getRefundOfflineFee() + cmReturnedPurchase.getRefundOnlineBalanceFee();
|
|
|
if (rechargeGoods) {
|
|
|
CmUser user = cmUserDao.get(newOrder.getUserID().toString());
|
|
|
if (user != null && user.getAbleUserMoney() != null && user.getAbleUserMoney() < refundFee) {
|
|
|
refundFee = user.getAbleUserMoney();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
//判断退款金额和打款金额是否一致
|
|
|
double v = totalRefundFee - refundFee;
|
|
|
if (v > 0.1 || v < -0.1) {
|