From 49d26627b480ec30f3916a4fbec2c494e6a7d95e Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 6 Sep 2023 13:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/community/Community.php        | 11 ++++++++---
 app/controller/api/server/StoreProduct.php        |  1 +
 app/controller/merchant/store/product/Product.php |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controller/api/community/Community.php b/app/controller/api/community/Community.php
index d8be646a..9cd53615 100644
--- a/app/controller/api/community/Community.php
+++ b/app/controller/api/community/Community.php
@@ -707,13 +707,18 @@ class Community extends BaseController
             $queryBuilder->where('c.mer_status', 2);
         }
         $count = $queryBuilder->count();
-        $list  = $queryBuilder->setOption('field', [])->field(['c.community_id', 'c.uid', 'c.title', 'c.image', 'c.entrust_mer_id','m.mer_name','m.mer_avatar', 'c.mer_status'])->order('c.community_id', 'desc')->page($page, $limit)->fetchSql(false)->select();
+        $list  = $queryBuilder->setOption('field', [])->field(['c.community_id', 'c.uid', 'c.title', 'c.image', 'c.entrust_mer_id', 'm.credit_buy', 'm.settle_cycle', 'm.interest_rate', 'm.mer_name', 'm.mer_avatar', 'c.mer_status'])->order('c.community_id', 'desc')->page($page, $limit)->fetchSql(false)->select();
         if ($list) $list = $list->toArray();
         foreach($list as $k => $v) {
+            $list[$k]['mer_name'] = 0;
+            // type：1发起的委托 2收到的委托
             if ($type == 2) {
                 $merchantInfo = Db::name('merchant')->where('uid', $v['uid'])->find();
-                $list[$k]['mer_name'] = $merchantInfo['mer_name'];
-                $list[$k]['mer_avatar'] = $merchantInfo['mer_avatar'];
+                $list[$k]['credit_buy'] = $merchantInfo['credit_buy'] ?? 0;
+                $list[$k]['settle_cycle'] = $merchantInfo['settle_cycle'] ?? 0;
+                $list[$k]['interest_rate'] = $merchantInfo['interest_rate'] ?? 0;
+                $list[$k]['mer_name'] = $merchantInfo['mer_name'] ?? '';
+                $list[$k]['mer_avatar'] = $merchantInfo['mer_avatar'] ?? '';
             }
         }
         return app('json')->success(compact('count', 'list'));
diff --git a/app/controller/api/server/StoreProduct.php b/app/controller/api/server/StoreProduct.php
index c373ca55..9573c9ca 100644
--- a/app/controller/api/server/StoreProduct.php
+++ b/app/controller/api/server/StoreProduct.php
@@ -20,6 +20,7 @@ use app\validate\merchant\StoreProductValidate;
 use crmeb\basic\BaseController;
 use crmeb\services\UploadService;
 use think\App;
+use think\facade\Db;
 use think\exception\HttpResponseException;
 use think\exception\ValidateException;
 
diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php
index a931785b..b0836968 100644
--- a/app/controller/merchant/store/product/Product.php
+++ b/app/controller/merchant/store/product/Product.php
@@ -24,6 +24,7 @@ use crmeb\basic\BaseController;
 use app\validate\merchant\StoreProductValidate as validate;
 use app\common\repositories\store\product\ProductRepository as repository;
 use think\exception\ValidateException;
+use think\facade\Db;
 
 class Product extends BaseController
 {