1. 零售门店开启充值满多少成为vip会员 2. 红包添加是否使用余额才可使用的开关

app-hd/controllers/RechargeController.php

@@ -347,7 +347,6 @@ class RechargeController extends BaseController
     {
         ini_set('date.timezone', 'Asia/Shanghai');
         $get = Yii::$app->request->get();
-        $hbId = $get['id'] ?? 0;
         $ghsId = $get['ghsId'] ?? 0;
         $ghsInfo = GhsClass::getById($ghsId, true);
         if (empty($ghsInfo)) {

app-hd/controllers/RechargeShbController.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace hd\controllers;
-
-use common\components\util;
-use Yii;
-
-class RechargeShbController extends BaseController
-{
-
-}

app-hd/controllers/ShopController.php

@@ -13,6 +13,7 @@ use bizHd\merchant\classes\SjClass;
 use bizHd\merchant\services\ShopService;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\saas\services\RegionService;
+use bizHd\shop\classes\ShopExtClass;
 use common\components\dict;
 use common\components\dirUtil;
 use common\components\imgUtil;
@@ -533,4 +534,48 @@ class ShopController extends BaseController
         }
         util::fail('头像参数出错');
     }
+
+    //获取充值设置
+    public function actionGetRechargeSetting()
+    {
+        $shopId = $this->shop->id;
+        $shop = ShopClass::getById($shopId, false, 'rechargeWeal');
+        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'reachVip');
+
+        $return = [
+            'rechargeRule' => $shop['rechargeWeal'] == 3 ? 2 : $shop['rechargeWeal'],
+            'isVipMember' => $shopExt['reachVip'] > 0 ? 1 : 0,
+            'vipAmount' => $shopExt['reachVip'],
+            'hbPayable' => $shop['rechargeWeal'] == 2 ? 1 : 0,
+        ];
+
+        util::success($return);
+    }
+
+    //充值设置
+    public function actionSaveRechargeSetting()
+    {
+        $data = Yii::$app->request->post();
+        $rechargeWeal = intval($data['rechargeRule']);
+        $isVipMember = intval($data['isVipMember']);
+        if ($isVipMember == 1 && $data['vipAmount'] > 0) {
+            $reachVip = floatval($data['vipAmount']);
+        } else {
+            $reachVip = 0.00;
+        }
+        $hbPayable = intval($data['hbPayable']);
+        if ($rechargeWeal == 2 && $hbPayable == 0) {
+            $rechargeWeal = 3;
+        }
+
+        $shopAdmin = $this->shopAdmin;
+        if (isset($shopAdmin->super) == false || $shopAdmin->super != 1) {
+            util::fail('超管才能操作');
+        }
+        $shopId = $this->shop->id;
+        ShopClass::updateById($shopId, ['rechargeWeal' => $rechargeWeal]);
+        ShopExtClass::updateByCondition(['shopId' => $shopId], ['reachVip' => $reachVip]);
+
+        util::complete('充值设置成功');
+    }
 }

app-mall/controllers/HdController.php

@@ -108,7 +108,7 @@ class HdController extends BaseController
                         $itemList[] = ['recharge' => $recharge, 'give' => $give];
                     }
                 }
-            } else if ($shop->rechargeWeal == 2) {
+            } else if ($shop->rechargeWeal == 2 || $shop->rechargeWeal == 3) {
                 $itemType = 'hb'; //送红包
                 $itemList = RechargeShbClass::getList('*', ['shopId' => $shop->id]);
             }

app-mall/controllers/RechargeSqController.php

@@ -28,8 +28,7 @@ class RechargeSqController extends BaseController
                 $weal[$key]['give'] = $give;
             }
         }
-        $rechargeWeal = $shop->rechargeWeal ?? 0;
-        util::success(['weal' => $weal, 'rechargeWeal' => $rechargeWeal]);
+        util::success(['weal' => $weal, 'rechargeWeal' => $shop->rechargeWeal]);
     }
 
 }

biz-hd/recharge/classes/RechargeClass.php

@@ -13,6 +13,7 @@ use bizHd\hb\classes\HbClass;
 use bizHd\hb\classes\HbManageClass;
 use bizHd\order\classes\OrderClass;
 use bizHd\order\classes\SettleClass;
+use bizHd\shop\classes\ShopExtClass;
 use bizHd\shop\classes\MainClass;
 use common\components\dict;
 use common\components\lakala\Lakala;
@@ -154,7 +155,7 @@ class RechargeClass extends BaseClass
         }
 
         $shop = ShopClass::getById($shopId, true);
-        $rechargeWeal = $shop->rechargeWeal ?? 0; //充值赠送: 0未设置 1设置了，充值送钱 2设置了，充值送红包
+        $rechargeWeal = $shop->rechargeWeal ?? 0; //充值赠送: 0未设置 2充值送红包--红包非余额支付可用，3充值送红包--红包非余额支付不可用
         $balanceGive = 0;
 
         //如果客户有欠款、结账充值、售后充值、售后付款充值，不参与优惠
@@ -174,7 +175,7 @@ class RechargeClass extends BaseClass
                         }
                     }
                 }
-            } elseif ($rechargeWeal == 2) {
+            } elseif ($rechargeWeal == 2 || $rechargeWeal == 3) {
                 //充值送红包
                 // 1.根据充值金额，查询符合条件的红包规则
                 $maxHbRule = RechargeShbClass::getByCondition(['shopId' => $shopId, 'amount<=' => $amount], false, 'allHbAmount DESC');
@@ -241,6 +242,12 @@ class RechargeClass extends BaseClass
             }
         }
 
+        //是否开启充值满多少成为 VIP
+        $shopExt = ShopExtClass::getById($shopId, false, 'reachVip');
+        if ($shopExt['reachVip'] > 0.00 && bccomp($amount, $shopExt['reachVip'], 2) == 1) {
+            $custom->vip = 1;
+        }
+
         $balancePay = $amount;
         if ($onlinePay == 2) {
             $event = $payWay == 0 ? '线上微信 充值' : '线上支付宝 充值';