充值和结账

biz-hd/order/classes/SettleClass.php

@@ -111,8 +111,25 @@ class SettleClass extends BaseClass
         return $set;
     }
 
-    public static function clearSettle($set)
+    public static function clearSettle($set, $recharge = [])
     {
+        //如果带有充值，互相要给信息
+        if (!empty($recharge)) {
+            $settleId = $set->id;
+            $recharge->settleId = $settleId;
+            $recharge->settleNo = $set->orderSn;
+            $recharge->settleAmount = $set->actPrice;
+            $recharge->save();
+
+            $payWay = $recharge->payWay ?? 0;
+            $onlinePay = $recharge->onlinePay ?? 1;
+            $rechargeId = $recharge->id;
+            $rechargeSn = $recharge->orderSn;
+            $set->payWay = $payWay;
+            $set->rechargeId = $rechargeId;
+            $set->rechargeSn = $rechargeSn;
+            $set->onlinePay = $onlinePay;
+        }
         $set->status = 2;
         $set->save();
 

biz-hd/recharge/classes/RechargeClass.php

@@ -161,7 +161,7 @@ class RechargeClass extends BaseClass
         if (!empty($settleId)) {
             //如果有结账单，按结账单销账
             $set = SettleClass::getById($settleId, true);
-            $res = SettleClass::clearSettle($set);
+            $res = SettleClass::clearSettle($set, $recharge);
             $realClearAmount = $res['totalClearAmount'] ?? 0;
             $settleAmount = $set->actPrice ?? 0;
             $settleNo = $set->orderSn ?? '';
@@ -215,6 +215,7 @@ class RechargeClass extends BaseClass
             }
         }
 
+        $remark = $recharge->remark;
         $change = [
             'customId' => $customId,
             'customName' => $customName,
@@ -234,7 +235,7 @@ class RechargeClass extends BaseClass
             'settleId' => $settleId,
             'settleNo' => $settleNo,
             'settleAmount' => $settleAmount,
-            'remark' => '',
+            'remark' => $remark,
         ];
         $returnChange = BalanceChangeClass::add($change, true);
         if ($recharge->onlinePay == 2) {