Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/app/adminapi/controller/v1/export/ExportExcel.php

@@ -95,6 +95,7 @@ class ExportExcel extends AuthController
             ['pay_type', ''],
             ['order', ''],
             ['field_key', ''],
+            ['ids', []],
         ]);
         $where['is_system_del'] = 0;
         $where['pid'] = 0;

crmeb/app/model/order/StoreOrder.php

@@ -589,4 +589,13 @@ class StoreOrder extends BaseModel
     {
         if ($value !== '') $query->where('agent_id', $value);
     }
+
+    /**
+     * @param $query
+     * @param $value
+     */
+    public function searchIdsAttr($query, $value)
+    {
+        if ($value !== '') $query->whereIn('id', $value);
+    }
 }

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']);
         }

crmeb/app/services/order/StoreOrderRefundServices.php

@@ -1037,7 +1037,13 @@ class StoreOrderRefundServices extends BaseServices
         foreach ($cartInfo as $cart) {
             if (isset($cart['cart_info'])) $cart = $cart['cart_info'];
             if ($is_unit) {
-                $SumPrice = bcadd($SumPrice, bcmul($cart['cart_num'] ?? 1, $cart[$key] ?? 0, 2), 2);
+                if ($key == 'level' || $key == 'member') {
+                    if ($cart['price_type'] == $key) {
+                        $SumPrice = bcadd($SumPrice, bcmul($cart['cart_num'] ?? 1, $cart['vip_truePrice'], 2), 2);
+                    }
+                } else {
+                    $SumPrice = bcadd($SumPrice, bcmul($cart['cart_num'] ?? 1, $cart[$key] ?? 0, 2), 2);
+                }
             } else {
                 $SumPrice = bcadd($SumPrice, $cart[$key] ?? 0, 2);
             }

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
         ],

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',

crmeb/public/install/crmeb.sql

@@ -33509,7 +33509,9 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (426, 'allin_appid', 'text', '', 108, '', 1, '', 100, 0, '\"\"', '通联支付Appid', '通联商户后台的设置-》对接设置中查看', 98, 1),
 (428, 'queue_open', 'radio', 'input', 26, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '消息队列', '是否启用消息队列，启用后提升程序运行速度，启用前必须配置Redis缓存', 0, 1),
 (429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1),
-(430, 'share_qrcode', 'radio', 'input', 2, '0=>商城\n1=>公众号', 1, '', 0, 0, '\"0\"', '公众号推广码类型', '公众号生成的推广码类型：商城：扫码直接进入商城，公众号：扫码进入公众号后推送商城的链接', 0, 1);
+(430, 'share_qrcode', 'radio', 'input', 2, '0=>商城\n1=>公众号', 1, '', 0, 0, '\"0\"', '公众号推广码类型', '公众号生成的推广码类型：商城：扫码直接进入商城，公众号：扫码进入公众号后推送商城的链接', 0, 1),
+(431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 0, 1);
+
 -- --------------------------------------------------------
 
 --

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;