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 @@
{$detail.status_text}
+ + {if $detail.own_city} +
+ +
{$detail.own_city}
+
+ {/if} + + {if isset($detail.partner)} +
+ +
{$detail.partner}
+
金额:¥{$detail.partner_money}
+
+ {/if} + + {if isset($detail.store)} +
+ +
{$detail.store.title}
+
金额:¥{$detail.store.money}
+
+ {/if} +
{$detail.reason}