充值升级会员

app-hd/controllers/MemberLevelController.php

@@ -89,7 +89,7 @@ class MemberLevelController extends BaseController
                     'name' => $name,
                     'amount' => $amount,
                 ];
-                $has = MemberLevelClass::getByCondition(['shopId' => $shopId, 'level' => $level], true);
+                $has = MemberLevelClass::getByCondition(['mainId' => $mainId, 'level' => $level], true);
                 if (!empty($has)) {
                     $has->amount = $amount;
                     $has->save();

app-hd/controllers/MemberWealController.php

@@ -94,7 +94,7 @@ class MemberWealController extends BaseController
                 $prevGive = $currentGive;
                 $sn = $key + 1;
                 $add = ['shopId' => $shopId, 'mainId' => $mainId, 'recharge' => $currentRecharge, 'give' => $currentGive, 'sn' => $sn];
-                $has = MemberWealClass::getByCondition(['shopId' => $shopId, 'sn' => $sn], true);
+                $has = MemberWealClass::getByCondition(['mainId' => $mainId, 'sn' => $sn], true);
                 if (!empty($has)) {
                     $has->recharge = $currentRecharge;
                     $has->give = $currentGive;

biz-hd/custom/classes/CustomClass.php

@@ -7,6 +7,7 @@ use bizHd\balance\classes\BalanceChangeClass;
 use bizHd\balance\classes\BalanceGiveChangeClass;
 use bizHd\balance\classes\BalancePayChangeClass;
 use bizHd\member\classes\MemberChangeClass;
+use bizHd\member\classes\MemberLevelClass;
 use bizHd\member\classes\MemberWealClass;
 use bizHd\order\classes\OrderClass;
 use bizHd\order\classes\SettleClass;
@@ -185,14 +186,13 @@ class CustomClass extends BaseClass
         $staffName = $params['staffName'] ?? '';
         $style = $params['style'] ?? 0;
         $target = $params['target'] ?? [];
-        $onlinePay = $params['onlinePay'] ?? 1;
         $rechargeAmount = $params['rechargeAmount'] ?? 0;
         $targetId = $target->id ?? 0;
         $mainId = $shop->mainId;
         $shopId = $shop->id;
-        $weal = MemberWealClass::getAllByCondition(['mainId' => $mainId], null, '*', 'level');
-        $current = $weal[$newLevel] ?? [];
-        $before = $weal[$oldLevel] ?? [];
+        $levelData = MemberLevelClass::getAllByCondition(['mainId' => $mainId], null, '*', 'level');
+        $current = $levelData[$newLevel] ?? [];
+        $before = $levelData[$oldLevel] ?? [];
         $beforeName = $before['name'] ?? '普通客户';
         $discount = $current['discount'] ?? 1;
         $memberName = $current['name'] ?? '';
@@ -209,11 +209,7 @@ class CustomClass extends BaseClass
 
         $event = '手动修改';
         if ($style == 0) {
-            if ($onlinePay == 2) {
-                $event = '线上充值' . $rechargeAmount . '元';
-            } else {
-                $event = '线下充值' . $rechargeAmount . '元';
-            }
+            util::fail('充值不支持升级会员');
         }
 
         $change = [