充值修改

app-ghs/controllers/CustomController.php

@@ -114,7 +114,8 @@ class CustomController extends BaseController
         $customId = $get['customId'] ?? 0;
         $payWay = $get['payWay'] ?? -1;
         $remark = $get['remark'] ?? '';
-        if ($payWay < 0) {
+        $rechargeType = $get['rechargeType'] ?? 0;
+        if ($rechargeType == 0 && $payWay < 0) {
             util::fail('请选择付款方式');
         }
         if ($amount <= 0) {
@@ -146,7 +147,7 @@ class CustomController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             $staff = $this->shopAdmin;
-            $params = ['remark' => $remark];
+            $params = ['remark' => $remark,'rechargeType'=>$rechargeType];
             $recharge = CustomService::rechargeClear($custom, $amount, $this->shop, $staff, $payWay, $params);
             $transaction->commit();
 
@@ -886,7 +887,7 @@ class CustomController extends BaseController
         if (isset($custom->seatSnName) && !empty($custom->seatSnName)) {
             $customName = $custom->seatSnName ?? '';
         }
-        $customName = stringUtil::subStringUtf8($customName,7,'..');
+        $customName = stringUtil::subStringUtf8($customName, 7, '..');
         $a4Print = [
             'customName' => $customName,
             'seatSn' => $seatSn,

biz-ghs/custom/classes/CustomClass.php

@@ -197,6 +197,7 @@ class CustomClass extends BaseClass
         $staffId = $staff->id ?? 0;
         $staffName = $staff->name ?? '';
         $remark = $params['remark'] ?? '';
+        $rechargeType = $params['rechargeType'] ?? 0;
         $cData = [
             'orderSn' => $orderSn,
             'onlinePay' => 1,
@@ -219,6 +220,7 @@ class CustomClass extends BaseClass
             'customName' => $customName,
             'remark' => $remark,
             'payTime' => $payTime,
+            'rechargeType' => $rechargeType,
         ];
         $cRecharge = CustomRechargeClass::add($cData, true);
         $cRechargeId = $cRecharge->id ?? 0;
@@ -273,6 +275,7 @@ class CustomClass extends BaseClass
             'customName' => $customName,
             'remark' => $remark,
             'payTime' => $payTime,
+            'rechargeType' => $rechargeType,
         ];
         $gRecharge = GhsRechargeClass::add($gData, true);
         $gRechargeId = $gRecharge->id ?? 0;