From fb89b30e143789421404c3e9527e96fb0af593ca Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Sat, 9 Nov 2024 15:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E4=BC=99=E4=BA=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E5=BA=97=E9=93=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/distribution/ApplyLogic.php   | 22 +++++++++++++++++
 app/admin/view/distribution/apply/detail.html | 24 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/app/admin/logic/distribution/ApplyLogic.php b/app/admin/logic/distribution/ApplyLogic.php
index b52cb7cb..d3a93668 100755
--- a/app/admin/logic/distribution/ApplyLogic.php
+++ b/app/admin/logic/distribution/ApplyLogic.php
@@ -5,9 +5,12 @@ namespace app\admin\logic\distribution;
 
 
 use app\common\basics\Logic;
+use app\common\enum\DistributionPartnerEnum;
 use app\common\logic\DistributionLogic;
 use app\common\model\distribution\Distribution;
 use app\common\model\distribution\DistributionMemberApply;
+use app\common\model\distribution\DistributionPartner;
+use app\common\model\distribution\DistributionStoreType;
 use app\common\model\user\User;
 use app\common\server\AreaServer;
 use app\common\server\UrlServer;
@@ -99,6 +102,25 @@ class ApplyLogic extends Logic
                 $detail['district']]
         );
 
+        if ($detail['partner_id'] > 0) {
+            $partner = DistributionPartner::where([
+                'id' => $detail['partner_id'],
+                'is_delete' => 0
+            ])->find();
+            $detail['partner'] = DistributionPartnerEnum::getPartner($partner['type']);
+            $detail['partner_money'] = $partner['un_core_city_money'];
+            if (strpos($partner['city'], $detail['own_city']) !== false) {
+                $detail['partner_money'] = $partner['core_city_money'];
+            }
+
+            if ($detail['store_id'] > 0) {
+                $detail['store'] = DistributionStoreType::where([
+                    'id' => $detail['store_id'],
+                    'is_delete' => 0
+                ])->field('title, money')->find();
+            }
+        }
+
         return $detail;
     }
 
diff --git a/app/admin/view/distribution/apply/detail.html b/app/admin/view/distribution/apply/detail.html
index bf08f3a9..cab8d352 100755
--- a/app/admin/view/distribution/apply/detail.html
+++ b/app/admin/view/distribution/apply/detail.html
@@ -58,6 +58,30 @@
             <label class="layui-form-label">申请状态：</label>
             <div class="layui-input-block">{$detail.status_text}</div>
         </div>
+
+        {if $detail.own_city}
+            <div class="layui-form-item">
+                <label class="layui-form-label">所选城市：</label>
+                <div class="layui-input-block">{$detail.own_city}</div>
+            </div>
+        {/if}
+
+        {if isset($detail.partner)}
+            <div class="layui-form-item">
+                <label class="layui-form-label">合伙人类型：</label>
+                <div class="layui-input-block">{$detail.partner}</div>
+                <div class="layui-input-block">金额：￥{$detail.partner_money}</div>
+            </div>
+        {/if}
+
+        {if isset($detail.store)}
+            <div class="layui-form-item">
+                <label class="layui-form-label">店铺类型：</label>
+                <div class="layui-input-block">{$detail.store.title}</div>
+                <div class="layui-input-block">金额：￥{$detail.store.money}</div>
+            </div>
+        {/if}
+
         <div class="layui-form-item">
             <label class="layui-form-label">审核说明：</label>
             <div class="layui-input-block">{$detail.reason}</div>