充值清账

app-ghs/controllers/CustomController.php

@@ -79,6 +79,7 @@ class CustomController extends BaseController
         $amount = $get['amount'] ?? 0;
         $customId = $get['customId'] ?? 0;
         $payWay = $get['payWay'] ?? -1;
+        $remark = $get['remark'] ?? '';
         if ($payWay < 0) {
             util::fail('请选择付款方式');
         }
@@ -101,7 +102,8 @@ class CustomController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             $staff = $this->shopAdmin;
-            CustomService::rechargeClear($custom, $amount, $this->shop, $staff, $payWay);
+            $params = ['remark' => $remark];
+            CustomService::rechargeClear($custom, $amount, $this->shop, $staff, $payWay, $params);
             $transaction->commit();
             util::complete('充值成功');
         } catch (\Exception $e) {

biz-ghs/custom/classes/CustomClass.php

@@ -149,7 +149,7 @@ class CustomClass extends BaseClass
     }
 
     //充值金额 ssh 20240310
-    public static function rechargeBalance($custom, $amount, $shop, $staff, $payWay)
+    public static function rechargeBalance($custom, $amount, $shop, $staff, $payWay, $params = [])
     {
         $ghsId = $custom->ghsId ?? 0;
         $ghsInfo = GhsClass::getLockById($ghsId);
@@ -180,6 +180,7 @@ class CustomClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $staffId = $staff->id ?? 0;
         $staffName = $staff->name ?? '';
+        $remark = $params['remark'] ?? '';
         $cData = [
             'orderSn' => $orderSn,
             'onlinePay' => 1,
@@ -200,6 +201,7 @@ class CustomClass extends BaseClass
             'customId' => $customId,
             'customShopId' => $customShopId,
             'customName' => $customName,
+            'remark' => $remark,
         ];
         $cRecharge = CustomRechargeClass::add($cData, true);
         $cRechargeId = $cRecharge->id ?? 0;
@@ -224,7 +226,7 @@ class CustomClass extends BaseClass
             'mainId' => $mainId,
             'shopId' => $shopId,
             'sjId' => $sjId,
-            'remark' => '',
+            'remark' => $remark,
         ];
         CustomBalanceChangeClass::add($cbData, true);
 
@@ -252,6 +254,7 @@ class CustomClass extends BaseClass
             'customId' => $customId,
             'customShopId' => $customShopId,
             'customName' => $customName,
+            'remark' => $remark,
         ];
         $gRecharge = GhsRechargeClass::add($gData, true);
         $gRechargeId = $gRecharge->id ?? 0;
@@ -272,7 +275,7 @@ class CustomClass extends BaseClass
             'sjId' => $customShopSjId,
             'mainId' => $customShopMainId,
             'shopId' => $customShopId,
-            'remark' => '',
+            'remark' => $remark,
         ];
         GhsBalanceChangeClass::add($gbData, true);
         return ['custom' => $custom, 'ghs' => $ghsInfo];

biz-ghs/custom/services/CustomService.php

@@ -15,9 +15,9 @@ class CustomService extends BaseService
     public static $baseFile = '\bizGhs\custom\classes\CustomClass';
 
     //充值和结账 ssh 20240309
-    public static function rechargeClear($custom, $amount, $shop, $staff, $payWay)
+    public static function rechargeClear($custom, $amount, $shop, $staff, $payWay, $params)
     {
-        $respond = CustomClass::rechargeBalance($custom, $amount, $shop, $staff, $payWay);
+        $respond = CustomClass::rechargeBalance($custom, $amount, $shop, $staff, $payWay, $params);
         $custom = $respond['custom'] ?? [];
         $ghs = $respond['ghs'] ?? [];
         if (empty($custom)) {