完整头像

app-ghs/controllers/ApplyController.php

@@ -26,11 +26,9 @@ class ApplyController extends BaseController
         $where = [];
         $where['introSjId'] = $this->sjId;
         $status = $get['status'] ?? 0;
-        $style = $get['style'] ?? MerchantClass::STYLE_SUPPLIER;
         if (!empty($status)) {
             $where['status'] = $status;
         }
-        $where['style'] = $style;
         $data = ApplyService::getApplyList($where);
         util::success($data);
     }

biz-hd/saas/services/ApplyService.php

@@ -4,13 +4,13 @@ namespace bizHd\saas\services;
 
 use bizHd\admin\classes\AdminClass;
 use bizHd\base\services\BaseService;
-use bizHd\saas\models\Apply;
 use bizGhs\custom\classes\CustomClass;
 use biz\shop\classes\ShopAdminClass;
 use biz\sj\classes\MerchantClass;
 use bizHd\saas\classes\ApplyClass;
 use bizHd\saas\classes\ApplyExtendClass;
 use biz\sj\services\MerchantService;
+use common\components\imgUtil;
 use common\components\noticeUtil;
 use common\components\stringUtil;
 use common\components\util;
@@ -30,21 +30,27 @@ class ApplyService extends BaseService
         }
         //商家信息
         $oldList = array_column($list, 'introSjId');
-        $merchantIdList = array_column($list, 'merchantId');
-        $ids = array_merge($merchantIdList, $oldList);
+        $sjIdList = array_column($list, 'merchantId');
+        $ids = array_merge($sjIdList, $oldList);
         $ids = array_unique(array_filter($ids));
-        $merchant = MerchantClass::getMerchantByIds($ids);
+        $sj = MerchantClass::getMerchantByIds($ids);
 
         $applyIds = array_unique(array_filter(array_column($list, 'id')));
         $extend = ApplyExtendClass::getExtendByIds($applyIds);
 
+        $prefix = imgUtil::getPrefix();
         foreach ($list as $key => $val) {
             $currentId = $val['id'] ?? 0;
             $list[$key]['licenseNo'] = $extend[$currentId]['licenseNo'] ?? '';
             $list[$key]['license'] = $extend[$currentId]['license'] ?? '';
             $introSjId = $val['introSjId'];
-            $introSjName = $merchant[$introSjId]['merchantName'] ?? '';
+            $introSjName = $sj[$introSjId]['merchantName'] ?? '';
             $list[$key]['introSjName'] = $introSjName;
+            $avatar = $prefix . 'hhb_small.png';
+            if (isset($val['avatar']) && !empty($val['avatar'])) {
+                $avatar = $prefix . $val['avatar'];
+            }
+            $list[$key]['fullAvatar'] = $avatar;
         }
         $data['list'] = $list;
         $data['balance'] = 0.00;

sql.sql

@@ -1721,4 +1721,6 @@ CREATE TABLE IF NOT EXISTS `xhRenewSn` (
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=18623508 COMMENT='续费订单号';
 ALTER TABLE xhOrder DROP COLUMN `createTime`;
-ALTER TABLE xhAdmin ADD INDEX `admin`(`mobile`,`style`);
+ALTER TABLE xhAdmin ADD INDEX `admin`(`mobile`,`style`);
+ALTER TABLE xhApply ADD avatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '商家头像' AFTER `id`;
+ALTER TABLE xhApply MODIFY `name` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '商家名称';