增加认证

app-ghs/controllers/TestController.php

@@ -359,7 +359,8 @@ class TestController extends BaseController
             //['name' => '海沧好多花换店', 'merchantNo' => '8223930599200CN', 'wx' => [772684174, 772684211], 'zfb' => '2088370864383343'],
             //['name' => '九江伊朵鲜花批发', 'merchantNo' => '82242405992002A', 'wx' => [774681090, 774681246], 'zfb' => '2088470298005142'],
             //['name' => '徐州云之南鲜花', 'merchantNo' => '82230305992006C', 'wx' => [788161779, 788162410], 'zfb' => '2088670707622207'],
-            ['name' => '济南伟伟鲜花', 'merchantNo' => '8224510599200EL', 'wx' => [789073494, 789074603], 'zfb' => '2088670850497224'],
+            //['name' => '济南伟伟鲜花', 'merchantNo' => '8224510599200EL', 'wx' => [789073494, 789074603], 'zfb' => '2088670850497224'],
+            ['name' => '赣州紫荆鲜花批发', 'merchantNo' => '82242805992004J', 'wx' => [790052021, 790051859], 'zfb' => '2088670969143838'],
             //['name' => '日照温暖小筑', 'merchantNo' => '82247705992002F', 'wx' => [781363841, 781362087], 'zfb' => '2088570557754874'],
             //['name' => '昆明建芳基地鲜花直发', 'merchantNo' => '8223970599200AH', 'wx' => [775915046, 775915051], 'zfb' => '2088470558755358'],
             //['name' => '日照月下鲜花批发', 'merchantNo' => '82247705992002D', 'wx' => [759404451, 759404055], 'zfb' => '2088170264295192'],

app-hd/controllers/RechargeController.php

@@ -101,15 +101,10 @@ class RechargeController extends BaseController
 
             $id = $respond->id;
             $recharge = RechargeClass::getLockById($id);
-            $params = [
-                'onlinePay' => 1,
-                'side' => 0,
-            ];
+            $params = ['onlinePay' => 1, 'side' => 0];
+            //充值成功并且销账
             \bizHd\recharge\classes\RechargeClass::complete($recharge, $payWay, $params);
 
-            //这边要有销账单的动作
-            SettleClass::clearSettle();
-
             $transaction->commit();
             util::success($post);
         } catch (\Exception $e) {
@@ -125,13 +120,13 @@ class RechargeController extends BaseController
         $get = Yii::$app->request->get();
         $customId = $get['customId'] ?? 0;
         $custom = \bizHd\custom\classes\CustomClass::getById($customId, true);
-        if(empty($custom)) {
+        if (empty($custom)) {
             util::fail('没有找到客户');
         }
-        if($custom->shopId != $this->shopId) {
+        if ($custom->shopId != $this->shopId) {
             util::fail('不是你的客户');
         }
-        $where = ['shopId' => $this->shopId,'customId' => $customId];
+        $where = ['shopId' => $this->shopId, 'customId' => $customId];
         $list = RechargeClass::getRechargeList($where);
         util::success($list);
     }

biz-hd/recharge/classes/RechargeClass.php

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