diff --git a/crmeb/app/services/order/OtherOrderServices.php b/crmeb/app/services/order/OtherOrderServices.php index 64d08c4ad..a188d2191 100644 --- a/crmeb/app/services/order/OtherOrderServices.php +++ b/crmeb/app/services/order/OtherOrderServices.php @@ -336,15 +336,14 @@ class OtherOrderServices extends BaseServices $capitalFlowServices->setFlow($orderInfo, $type); } $res = $res1 && $res2 && $res3 && $res4; - //购买付费会员返佣设置 if (sys_config('member_brokerage', 0) == 1 && sys_config('brokerage_func_status', 0) == 1) { $spread_one = sys_config('is_self_brokerage') ? $orderInfo['uid'] : $userServices->getSpreadUid($orderInfo['uid']); $spread_two = sys_config('brokerage_level', 2) == 2 ? $userServices->getSpreadUid($spread_one) : 0; $spread_one_price = bcmul((string)$orderInfo['pay_price'], (string)bcdiv((string)sys_config('store_brokerage_ratio', 0), '100', 4), 2); $spread_two_price = bcmul((string)$orderInfo['pay_price'], (string)bcdiv((string)sys_config('store_brokerage_two', 0), '100', 4), 2); - if ($spread_one && $spread_one_price > 0) $this->memberBrokerage($spread_one, $spread_one_price, sys_config('is_self_brokerage') ? 'get_self_brokerage' : 'get_brokerage', $orderInfo); - if ($spread_two && $spread_two_price > 0) $this->memberBrokerage($spread_two, $spread_two_price, 'get_two_brokerage', $orderInfo); + if ($spread_one && $spread_one_price > 0) $this->memberBrokerage($spread_one, $spread_one_price, sys_config('is_self_brokerage') ? 'get_self_member_brokerage' : 'get_member_brokerage', $orderInfo); + if ($spread_two && $spread_two_price > 0) $this->memberBrokerage($spread_two, $spread_two_price, 'get_two_member_brokerage', $orderInfo); } return false !== $res; @@ -375,8 +374,8 @@ class OtherOrderServices extends BaseServices $userBrokerageServices = app()->make(UserBrokerageServices::class); $userBrokerageServices->income($type, $uid, [ 'nickname' => $userInfo['nickname'], - 'pay_price' => floatval($price), - 'number' => floatval($userInfo['brokerage_price']), + 'pay_price' => floatval($orderInfo['pay_price']), + 'number' => floatval($price), 'frozen_time' => $frozen_time ], $balance, $orderInfo['id']); } diff --git a/crmeb/app/services/system/config/SystemConfigServices.php b/crmeb/app/services/system/config/SystemConfigServices.php index dc0802b4d..d919fc80d 100644 --- a/crmeb/app/services/system/config/SystemConfigServices.php +++ b/crmeb/app/services/system/config/SystemConfigServices.php @@ -91,7 +91,6 @@ class SystemConfigServices extends BaseServices 'spread_banner' => '', 'brokerage_level' => '', 'division_status' => '', - 'member_brokerage' => '', ], 'show_value' => 1 ], diff --git a/crmeb/app/services/user/UserBrokerageServices.php b/crmeb/app/services/user/UserBrokerageServices.php index cb490f461..36e15e6d1 100644 --- a/crmeb/app/services/user/UserBrokerageServices.php +++ b/crmeb/app/services/user/UserBrokerageServices.php @@ -28,6 +28,27 @@ class UserBrokerageServices extends BaseServices * @var array[] */ protected $incomeData = [ + 'get_self_member_brokerage' => [ + 'title' => '获得自购付费会员佣金', + 'type' => 'self_member_brokerage', + 'mark' => '您成功消费{%pay_price%}元,奖励自购佣金{%number%}', + 'status' => 1, + 'pm' => 1 + ], + 'get_member_brokerage' => [ + 'title' => '获得下级购买付费会员佣金', + 'type' => 'one_member_brokerage', + 'mark' => '{%nickname%}成功消费{%pay_price%}元,奖励推广佣金{%number%}', + 'status' => 1, + 'pm' => 1 + ], + 'get_two_member_brokerage' => [ + 'title' => '获得二级购买付费会员佣金', + 'type' => 'two_member_brokerage', + 'mark' => '二级推广人{%nickname%}成功消费{%pay_price%}元,奖励推广佣金{%number%}', + 'status' => 1, + 'pm' => 1 + ], 'get_self_brokerage' => [ 'title' => '获得自购订单佣金', 'type' => 'self_brokerage', diff --git a/template/admin/src/pages/order/orderList/components/tableFrom.vue b/template/admin/src/pages/order/orderList/components/tableFrom.vue index 68d7ccd44..a82833c87 100644 --- a/template/admin/src/pages/order/orderList/components/tableFrom.vue +++ b/template/admin/src/pages/order/orderList/components/tableFrom.vue @@ -305,6 +305,7 @@ export default { let excelData = JSON.parse(JSON.stringify(this.orderData)); excelData.page = 1; excelData.limit = 200; + excelData.ids = this.delIdList; for (let i = 0; i < excelData.page + 1; i++) { let lebData = await this.getExcelData(excelData); if (!fileName) fileName = lebData.filename;