充值问题

app-hd/controllers/MemberWealController.php

@@ -134,6 +134,24 @@ class MemberWealController extends BaseController
             util::fail('请填写内容');
         }
 
+        // 验证recharge和give值递增
+        $prevRecharge = -1;
+        $prevGive = -1;
+        foreach ($data as $index => $item) {
+            $currentRecharge = floatval($item['recharge'] ?? 0);
+            $currentGive = floatval($item['give'] ?? 0);
+            if ($currentRecharge <= $prevRecharge) {
+                util::fail('充值金额必须递增');
+            }
+            if ($rechargeWeal == 2) {
+                if ($currentGive <= $prevGive) {
+                    util::fail('赠送金额必须递增');
+                }
+            }
+            $prevRecharge = $currentRecharge;
+            $prevGive = $currentGive;
+        }
+
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {

biz-hd/recharge/classes/RechargeClass.php

@@ -97,7 +97,7 @@ class RechargeClass extends BaseClass
         $addGiveAmount = 0;
 
         //如果客户余额不足，本身有欠款，充值不享受任何福利；结账充值，不参与优惠
-        if ($custom->balance > 0 || $recharge->settleId > 0) {
+        if ($custom->balance >= 0 && $recharge->settleId == 0) {
             if ($rechargeWeal == 1 || $rechargeWeal == 2) {
                 $weal = MemberWealClass::getAllByCondition(['shopId' => $shopId], null, '*');
                 if (!empty($weal)) {