添加：提交内容

app/common/repositories/system/groupData/GroupDataRepository.php

@@ -339,44 +339,73 @@ class GroupDataRepository extends BaseRepository
         }
         $form = Elm::createForm($url);
         $rules = [
-            Elm::input('svip_name', '会员名')->required(),
+            Elm::input('svip_name','会员卡名称')->required(),
             Elm::radio('svip_type','会员类别','2')
                 ->setOptions([
                     ['value' => '1','label' => '试用期',],
                     ['value' => '2','label' => '有限期',],
                     ['value' => '3','label' => '永久期',],
-                ])->control([
+                ])
+                ->control([
                     [
                         'value' => '1',
                         'rule'  => [
-                            Elm::number('svip_number', '有效期（天）')->required()->min(0),
+                            Elm::number('svip_number','有效期（天）')
+                                ->required()
+                                ->min(0)->col(12),
                         ]
                     ],
                     [
                         'value' => '2',
                         'rule'  => [
-                            Elm::number('svip_number', '有效期（天）')->required()->min(0),
+                            Elm::number('svip_number','有效期（天）')
+                                ->required()
+                                ->min(0)->col(12),
                         ]
                     ],
                     [
                         'value' => '3',
                         'rule'  => [
-                            Elm::input('svip_number1', '有效期（天）','永久期')->disabled(true),
+                            Elm::input('svip_number1','有效期（天）','永久期')
-                            Elm::input('svip_number', '有效期（天）','永久期')->hiddenStatus(true),
+                                ->disabled(TRUE)->col(12),
+                            Elm::input('svip_number','有效期（天）','永久期')
+                                ->hiddenStatus(TRUE)->col(12),
                         ]
                     ],
-                ])->appendRule('suffix', [
+                ])
+                ->appendRule('suffix',[
                     'type'     => 'div',
                     'style'    => ['color' => '#999999'],
                     'domProps' => [
                         'innerHTML' => '试用期每个用户只能购买一次，购买过付费会员之后将不在展示，不可购买',
                     ]
                 ]),
-            Elm::number('cost_price', '原价')->required(),
+            Elm::number('cost_price','原价')->required()->col(12)->min(0),
-            Elm::number('price', '优惠价')->required(),
+            Elm::number('price','优惠价')->required()->col(12)->min(0),
-            Elm::number('sort', '排序'),
+            Elm::number('sort','排序')->col(12)->min(0),
-            Elm::number('quota', '赠送酒卡额度')->required(),
+            Elm::number('quota','赠送酒卡额度')->required()->col(12)->min(0),
-            Elm::switches('status', '是否显示')->activeValue(1)->inactiveValue(0)->inactiveText('关')->activeText('开'),
+            Elm::switches('status','是否显示')
+                ->activeValue(1)
+                ->inactiveValue(0)
+                ->inactiveText('关')
+                ->activeText('开')->col(12),
+            // 分佣设置
+            Elm::radio('is_open_brokerage','是否开启分佣','1')
+                ->setOptions([['value' => '1','label' => '关闭'],['value' => '2','label' => '开启']])
+                ->control([
+                    [
+                        'value' => '2',
+                        'rule'  => [
+                            Elm::number('brokerage_staff','门店员工')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                            Elm::number('brokerage_store','门店')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                            Elm::number('brokerage_area','区县合伙人')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                            Elm::number('brokerage_area_store','区县运营商')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                            Elm::number('brokerage_delivery','配送商')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                            Elm::number('brokerage_province','省公司')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                            Elm::number('brokerage_platform','平台')->required()->min(0)->step(0.01)->precision(3)->col(12),
+                        ]
+                    ],
+                ]),
         ];
         $form->setRule($rules);
         if ($formData && $formData['svip_type'] == 3) $formData['svip_number'] = '永久期';

app/listener/exchangeQuota/OrderVipPayEvent.php

@@ -14,23 +14,31 @@ class OrderVipPayEvent{
     public function handle($data){
         try{
             $order = $data[0] ?? [];
+            $vipInfo = json_decode($order->order_info,TRUE);
+            // 会员卡开通成功 - 赠送酒卡额度
+            $this->giveQuotaHandle($order, $vipInfo);
+            // 会员卡开通成功 - 分佣操作
+            $this->agentBrokerageHandle($order, $vipInfo);
+
+
+        }catch(\Exception $e){
+            Log::info('会员卡开通成功 - 错误： '.$e->getMessage());
+        }
+    }
+    // 会员卡开通成功 - 赠送酒卡额度
+    private function giveQuotaHandle($order,$vipInfo){
         // Log::info('会员卡开通成功 - 酒卡额度相关处理 - 开始： '.var_export([
         //         'order_id'   => $order->order_id ?? '',
         //         'uid'        => $order->uid ?? '',
         //         'order_info' => $order->order_info ?? ''
         //     ],1));
+
+        // 赠送数量
+        $giveNum = (float)$vipInfo['quota'] ?? 0;
+        if((float)$giveNum > 0){
             // 获取用户当前持有
             $userHoldInfo = ExchangeQuota::where('uid',$order->uid )->findOrEmpty();
             if((int)$userHoldInfo->uid <= 0) $userHoldInfo->uid = $order->uid;
-            // 赠送数量
-            $vipInfo = json_decode($order->order_info,TRUE);
-            $giveNum = (float)$vipInfo['quota'] ?? 0;
-            // Log::info('会员卡开通成功 - 酒卡额度相关处理 - 开始1111111111111： '.var_export([
-            //         '$giveNum'        => $giveNum ?? '',
-            //         '$vipInfo' => $vipInfo ?? ''
-            //     ],1));
-
-            if((float)$giveNum > 0){
             // 赠送
             $changeFront                 = (float)$userHoldInfo->surplus_quota;
             $userHoldInfo->total_quota   += (float)$giveNum;// 总额度
@@ -51,10 +59,29 @@ class OrderVipPayEvent{
             ];
             ExchangeQuotaRecord::insertAll($insertData);
         }
-        }catch(\Exception $e){
-            Log::info('会员卡开通成功 - 酒卡额度相关处理 - 错误： '.$e->getMessage());
-        }
     }
+    // 会员卡开通成功 - 分佣操作
+    private function agentBrokerageHandle($order, $vipInfo){
+        Log::info('会员卡开通成功 - 分佣操作 - 开始： '.var_export($vipInfo,1));
+
+
+
+
+
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
 
 
 

route/admin/marketing.php

@@ -476,18 +476,6 @@ Route::group(function () {
             '_alias' => '获取编辑信息',
         ]);
 
-
-
-
-
-
-
-
-
-
-
-
-
     })->prefix('admin.marketing.Agent')->option([
         '_path' => '/marketing/agent/list',
         '_auth' => true,