shish 1 year ago
parent
commit
0ab31a9b17

+ 2 - 0
app-hd/controllers/RechargeController.php

@@ -69,6 +69,7 @@ class RechargeController extends BaseController
                 util::fail('没有找到客户');
             }
             $customName = $custom->name;
+            $userId = $custom->userId ?? 0;
             $hdId = $custom->hdId;
             $hd = HdClass::getById($hdId, true);
             if (empty($hd)) {
@@ -96,6 +97,7 @@ class RechargeController extends BaseController
                 'remark' => $remark,
                 'customId' => $customId,
                 'customName' => $customName,
+                'userId' => $userId,
             ];
             $respond = \bizHd\recharge\classes\RechargeClass::addRecharge($rechargeData);
 

+ 15 - 8
app-mall/controllers/RechargeController.php

@@ -23,15 +23,20 @@ class RechargeController extends BaseController
     {
         $get = Yii::$app->request->get();
         $hdId = $get['hdId'] ?? 0;
-        $custom = CustomClass::getById($customId, true);
-        if (empty($custom)) {
-            util::fail('没有找到客户');
+        $status = $get['status'] ?? -1;
+        $hd = \bizMall\hd\classes\HdClass::getById($hdId, true);
+        $where = ['mainId' => $this->mainId];
+        if (!empty($hd)) {
+            if ($hd->shopId != $this->shopId) {
+                util::fail('不是你的门店');
+            }
+            $customId = $hd->customId ?? 0;
+            $where['customId'] = $customId;
         }
-        if ($custom->shopId != $this->shopId) {
-            util::fail('不是你的客户');
+        if ($status > -1) {
+            $where['status'] = $status;
         }
-        $where = ['shopId' => $this->shopId, 'customId' => $customId];
-        $list = RechargeClass::getRechargeList($where);
+        $list = \bizMall\recharge\classes\RechargeClass::getRechargeList($where);
         util::success($list);
     }
 
@@ -180,7 +185,7 @@ class RechargeController extends BaseController
         $userId = $this->userId;
         $shopId = $this->shopId;
         if ($recharge->userId != $userId || $recharge->shopId != $shopId) {
-            util::fail('不是你的充值单');
+            util::fail('不是你的单');
         }
         util::success($recharge);
     }
@@ -204,6 +209,7 @@ class RechargeController extends BaseController
         }
 
         $mainId = $this->mainId;
+        $userId = $this->userId;
         $hdId = $post['hdId'] ?? 0;
         $salt = $post['salt'] ?? '';
         $hd = HdClass::getById($hdId, true);
@@ -245,6 +251,7 @@ class RechargeController extends BaseController
             'status' => 0,
             'customId' => $customId,
             'customName' => $customName,
+            'userId' => $userId,
         ];
         $respond = RechargeClass::addRecharge($rechargeData);
         $rechargeId = $respond->id;

+ 24 - 0
biz-mall/recharge/classes/RechargeClass.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace bizMall\recharge\classes;
+
+use bizMall\base\classes\BaseClass;
+use common\components\imgUtil;
+
+class RechargeClass extends BaseClass
+{
+
+    public static $baseFile = '\bizMall\recharge\models\Recharge';
+
+    public static function getRechargeList($where)
+    {
+        $data = self::getList('*', $where, 'addTime DESC');
+        if (!empty($data['list'])) {
+            foreach ($data['list'] as $key => $value) {
+                $data['list'][$key]['hdSmallAvatar'] = imgUtil::groupImg('') . "?x-oss-process=image/resize,m_fill,h_80,w_80";
+            }
+        }
+        return $data;
+    }
+
+}

+ 14 - 0
biz-mall/recharge/models/Recharge.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace bizMall\recharge\models;
+
+use bizMall\base\models\Base;
+
+class Recharge extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhRecharge';
+    }
+}

+ 12 - 0
biz-mall/recharge/services/RechargeService.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizMall\recharge\services;
+
+use bizMall\base\services\BaseService;
+
+class RechargeService extends BaseService
+{
+
+    public static $baseFile = '\bizMall\recharge\classes\RechargeClass';
+
+}