|
@@ -161,8 +161,13 @@ class RechargeClass extends BaseClass
|
|
|
if (!empty($settleId)) {
|
|
if (!empty($settleId)) {
|
|
|
//如果有结账单,按结账单销账
|
|
//如果有结账单,按结账单销账
|
|
|
$set = SettleClass::getById($settleId, true);
|
|
$set = SettleClass::getById($settleId, true);
|
|
|
- SettleClass::clearSettle($set);
|
|
|
|
|
|
|
+ $res = SettleClass::clearSettle($set);
|
|
|
|
|
+ $realClearAmount = $res['totalDebtPrice'] ?? 0;
|
|
|
$settleAmount = $set->actPrice ?? 0;
|
|
$settleAmount = $set->actPrice ?? 0;
|
|
|
|
|
+ if (floatval($totalAmount) != floatval($realClearAmount) || floatval($totalAmount) != floatval($settleAmount)) {
|
|
|
|
|
+ $rechargeId = $recharge->id;
|
|
|
|
|
+ noticeUtil::push("注意,充值单,结账单,和实际清掉欠款金额不一致:{$totalAmount} {$realClearAmount} {$settleAmount},settleId:{$settleId} recharge:{$rechargeId}", '15280215347');
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
//没有结账单,按顺序去销账,这里的逻辑,请去查看原型文档,来理解需求
|
|
//没有结账单,按顺序去销账,这里的逻辑,请去查看原型文档,来理解需求
|
|
|
$orderList = OrderClass::getAllByCondition(['customId' => $customId, 'debt' => 1], 'id asc', '*', null, true);
|
|
$orderList = OrderClass::getAllByCondition(['customId' => $customId, 'debt' => 1], 'id asc', '*', null, true);
|