Merge branch 'debt' into dev

biz-hd/recharge/classes/RechargeClass.php

@@ -157,6 +157,7 @@ class RechargeClass extends BaseClass
         $settleId = $recharge->settleId;
         $settleAmount = 0;
         $lastClearOrderId = 0;
+        $realClearAmount = 0;
         $lastClearOrderAmount = 0;
         if (!empty($settleId)) {
             //如果有结账单，按结账单销账
@@ -164,10 +165,6 @@ class RechargeClass extends BaseClass
             $res = SettleClass::clearSettle($set);
             $realClearAmount = $res['totalDebtPrice'] ?? 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 {
             //没有结账单，按顺序去销账，这里的逻辑，请去查看原型文档,来理解需求
             $orderList = OrderClass::getAllByCondition(['customId' => $customId, 'debt' => 1], 'id asc', '*', null, true);
@@ -202,10 +199,17 @@ class RechargeClass extends BaseClass
                     $set = SettleClass::addSettle($orderData, $shop, $custom, $hd, $settleParams);
                     $settleId = $set->id;
                     $settleAmount = $set->actPrice ?? 0;
-                    SettleClass::clearSettle($set);
+                    $res = SettleClass::clearSettle($set);
+                    $realClearAmount = $res['totalDebtPrice'] ?? 0;
                 }
             }
         }
+        if ($settleId > 0) {
+            if (floatval($totalAmount) != floatval($realClearAmount) || floatval($totalAmount) != floatval($settleAmount)) {
+                $rechargeId = $recharge->id;
+                noticeUtil::push("注意，充值单，结账单，和实际清掉欠款金额不一致：{$totalAmount} {$realClearAmount} {$settleAmount}，settleId:{$settleId} recharge:{$rechargeId}", '15280215347');
+            }
+        }
 
         $change = [
             'customId' => $customId,