From ab020a93d928a4869cbede2d01ebda25a76834c6 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 2 Dec 2023 15:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=B7=B2=E5=85=91=E6=8D=A2=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cultural-space/src/models/GoodsCulturalSpace.php |  5 +++++
 plugins/use-staff/src/models/ExternalApi.php         | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/cultural-space/src/models/GoodsCulturalSpace.php b/plugins/cultural-space/src/models/GoodsCulturalSpace.php
index 9b0287b3..a675ab4c 100644
--- a/plugins/cultural-space/src/models/GoodsCulturalSpace.php
+++ b/plugins/cultural-space/src/models/GoodsCulturalSpace.php
@@ -4,6 +4,7 @@ namespace Yunshop\CulturalSpace\models;
 
 use app\common\facades\Setting;
 use app\common\models\BaseModel;
+use app\common\models\OrderGoods;
 use app\frontend\models\Goods;
 
 class GoodsCulturalSpace extends BaseModel{
@@ -82,6 +83,9 @@ class GoodsCulturalSpace extends BaseModel{
             // 使用的文创豆
             $useLegumes = ceil($item['legumes_exchange_price'] / $currentFee);
             $useLegumes = $useLegumes <= 1 ? 1 : $useLegumes;
+            // 获取已兑换数量
+            $exchangeNum = OrderGoods::uniacid()->where('goods_id',$item['goods_id'])->where('is_legumes_exchange',1)->count();
+
             return [
                 'id'                     => $item['id'],
                 'goods_id'               => $item['goods_id'],
@@ -91,6 +95,7 @@ class GoodsCulturalSpace extends BaseModel{
                 'goods_price'            => $item['belongs_to_goods']['price'],
                 'use_legumes'            => $useLegumes,
                 'is_allow_exchange'      => (int)$holdExchangeLegumesMoney >= $item['legumes_exchange_price'],
+                'exchange_num'           => (int)$exchangeNum,
             ];
         },$data['data']);
 
diff --git a/plugins/use-staff/src/models/ExternalApi.php b/plugins/use-staff/src/models/ExternalApi.php
index 9a47faa7..5dacd973 100644
--- a/plugins/use-staff/src/models/ExternalApi.php
+++ b/plugins/use-staff/src/models/ExternalApi.php
@@ -22,12 +22,12 @@ class ExternalApi extends BaseModel{
 
     // 生产环境
     // private $apiLink = 'https://ms.xs-ygj.com/bwmsweb';// 生产地址
-    // private $accessId = '';// 接入ID
-    // private $accessSecret = '';// 请求密钥
-    // private $groundAgentId = '';// 落地公司机构号
-    // private $bmemberId = '';// 落地公司商户号
-    // private $coreAgentId = '';// 核心企业机构号
-    // private $memberId = '';// 核心企业商户号
+    // private $accessId = 'ZLSS2023101015281525786620371101';// 接入ID
+    // private $accessSecret = 'ZGnDgGDSXeusnZjIWwzstRi4JgjwOS9M';// 请求密钥
+    // private $groundAgentId = 'L20230921161137004';// 落地公司机构号
+    // private $bmemberId = '763071836462340781';// 落地公司商户号
+    // private $coreAgentId = 'C20231130092957659';// 核心企业机构号
+    // private $memberId = '906487975715084884';// 核心企业商户号