From 06e98c57e0e8fd5da11790e12c069c7f2149a9ba Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 17 Sep 2026 15:23:30 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=90=88=E4=BC=99?= =?UTF-8?q?=E8=82=A1=E4=B8=9C=E6=96=87=E6=A1=88=E4=B8=BA=E8=BF=9B=E9=98=B6?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E4=B8=8E=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/partner/PartnerRewardService.php | 2 +- .../admin/controller/shopro/Config.php | 4 +- .../view/shopro/commission/agent/detail.html | 5 ++ .../view/shopro/commission/level/add.html | 2 +- .../view/shopro/commission/level/index.html | 2 +- .../admin/view/shopro/config/index.html | 4 +- .../admin/view/shopro/dashboard/index.html | 36 ++++++------ .../admin/view/shopro/order/order/detail.html | 4 +- docs/partner-api-contract.md | 13 +++-- docs/会员角色与收益体系规格及代码完善分析.md | 25 +++++---- docs/收益中心-后台与用户端功能规格.md | 55 ++++++++++--------- docs/收益中心二次开发文档.md | 45 ++++++++------- docs/收益中心多场景收益模拟测算表.md | 26 ++++----- .../js/backend/shopro/commission/agent.js | 31 +++++------ .../js/backend/shopro/commission/level.js | 2 +- tests/partner/AgentDetailTest.php | 2 +- tests/partner/DashboardWealthTest.php | 22 ++++---- uniapp/pages/commission/team.vue | 8 +-- .../components/s-user-card/s-user-card.vue | 46 +++++++++------- 19 files changed, 177 insertions(+), 157 deletions(-) diff --git a/addons/shopro/service/partner/PartnerRewardService.php b/addons/shopro/service/partner/PartnerRewardService.php index 49cd0dd..10b7241 100644 --- a/addons/shopro/service/partner/PartnerRewardService.php +++ b/addons/shopro/service/partner/PartnerRewardService.php @@ -78,7 +78,7 @@ class PartnerRewardService Wallet::change($reward->user_id, 'commission', -$reward->amount, 'reward_back', [ 'partner_reward_id' => $reward->id, 'order_id' => $orderId, - ], '合伙股东收益退回'); + ], '收益中心奖励退回'); AgentModel::where('user_id', $reward->user_id)->setDec('total_income', $reward->amount); } if ($reward->reward_type === 'push3' && $reward->user_id > 0) { diff --git a/application/admin/controller/shopro/Config.php b/application/admin/controller/shopro/Config.php index 892042f..21114e6 100644 --- a/application/admin/controller/shopro/Config.php +++ b/application/admin/controller/shopro/Config.php @@ -52,7 +52,7 @@ class Config extends Common 'status' => $this->auth->check('shopro/config/commission') ], [ - 'label' => '合伙股东规则', + 'label' => '收益中心规则', 'name' => 'shopro/config/partner', 'status' => $this->auth->check('shopro/config/commission') ], @@ -187,7 +187,7 @@ class Config extends Common } /** - * 合伙股东规则 + * 收益中心规则 */ public function partner() { diff --git a/application/admin/view/shopro/commission/agent/detail.html b/application/admin/view/shopro/commission/agent/detail.html index 554ff03..4a7ad89 100644 --- a/application/admin/view/shopro/commission/agent/detail.html +++ b/application/admin/view/shopro/commission/agent/detail.html @@ -257,10 +257,15 @@ 更换 +<<<<<<< Updated upstream
已切换为收益中心固定金额规则,旧百分比不再生效。
+======= + +
已切换为收益中心固定金额,旧百分比不再生效。
+>>>>>>> Stashed changes
diff --git a/application/admin/view/shopro/commission/level/add.html b/application/admin/view/shopro/commission/level/add.html index d0b568a..cb06fd4 100644 --- a/application/admin/view/shopro/commission/level/add.html +++ b/application/admin/view/shopro/commission/level/add.html @@ -71,7 +71,7 @@ diff --git a/application/admin/view/shopro/commission/level/index.html b/application/admin/view/shopro/commission/level/index.html index 61ee897..905a138 100644 --- a/application/admin/view/shopro/commission/level/index.html +++ b/application/admin/view/shopro/commission/level/index.html @@ -7,7 +7,7 @@
身份等级
- 等级 1 固定为品酒师;2–7 对应创客 V1–V6。百分比佣金在合伙股东模式下不使用。 + 等级 1 固定为品酒师;2–7 对应创客 V1–V6。百分比佣金在收益中心模式下不使用。
diff --git a/application/admin/view/shopro/config/index.html b/application/admin/view/shopro/config/index.html index 73765a4..23c10ae 100644 --- a/application/admin/view/shopro/config/index.html +++ b/application/admin/view/shopro/config/index.html @@ -864,13 +864,13 @@ - +