feat(commission): 支持计奖商品参与设置、独立分成与多规格规则，完善团队中心与微信快捷登录

application/admin/controller/shopro/app/ScoreShop.php

@@ -317,6 +317,10 @@ class ScoreShop extends Common
             unset($skuPrice['createtime'], $skuPrice['updatetime'], $skuPrice['deletetime']);  // 不手动更新时间
             $skuPrice['goods_id'] = $goods_id;
 
+            $skuPrice['score'] = isset($skuPrice['score']) && $skuPrice['score'] !== '' ? intval($skuPrice['score']) : 0;
+            $skuPrice['price'] = isset($skuPrice['price']) && $skuPrice['price'] !== '' ? round(floatval($skuPrice['price']), 2) : 0.00;
+            $skuPrice['stock'] = isset($skuPrice['stock']) && $skuPrice['stock'] !== '' ? intval($skuPrice['stock']) : 0;
+
             $model = new ScoreSkuPrice;
             if (isset($skuPrice['id'])) {
                 $model = $this->model->find($skuPrice['id']);

application/admin/controller/shopro/commission/Goods.php

@@ -42,14 +42,21 @@ class Goods extends Common
         });
 
         $config = sheep_config('shop.commission');
+        $defaultPartnerRules = \addons\shopro\service\partner\PartnerConfig::defaultRules();
+        $roleNames = \addons\shopro\service\partner\PartnerConfig::roleNames();
+        $levels = \app\admin\model\shopro\commission\Level::order('level asc')->select();
+
         $this->success('分销商品详情', null, [
             'goods' => $goodsList,
-            'config' => $config
+            'config' => $config,
+            'default_partner_rules' => $defaultPartnerRules,
+            'role_names' => $roleNames,
+            'levels' => $levels,
         ]);
     }
 
     /**
-     * 设置佣金(支持批量)
+     * 设置计奖规则/佣金(支持批量)
      *
      * @param  $id
      */
@@ -61,18 +68,50 @@ class Goods extends Common
 
         // 接受全部参数
         $params = $this->request->only(['status', 'self_rules', 'commission_order_status', 'commission_config', 'commission_rules']);
+        if (empty($id)) {
+            $id = $this->request->param('id', '');
+        }
+        if (empty($id)) {
+            $this->error('缺少必要参数: id');
+        }
+
+        // 状态规范化
+        if (isset($params['status'])) {
+            $params['status'] = intval($params['status']) === 1 ? 1 : 0;
+        }
+        if (isset($params['commission_order_status'])) {
+            $params['commission_order_status'] = intval($params['commission_order_status']) === 0 ? 0 : 1;
+        }
+        if (isset($params['self_rules'])) {
+            $params['self_rules'] = intval($params['self_rules']);
+        }
+
+        // 针对 commission_rules 防御性处理
+        if (isset($params['commission_rules'])) {
+            if (is_string($params['commission_rules'])) {
+                $decoded = json_decode($params['commission_rules'], true);
+                if (json_last_error() === JSON_ERROR_NONE && is_array($decoded)) {
+                    $params['commission_rules'] = $decoded;
+                }
+            }
+        }
 
         $result = Db::transaction(function () use ($id, $params) {
             $count = 0;
-            $ids = explode(',', $id);
+            $ids = explode(',', (string)$id);
 
             foreach ($ids as $goods_id) {
+                $goods_id = intval($goods_id);
+                if ($goods_id <= 0) {
+                    continue;
+                }
                 if ($row = $this->model->get($goods_id)) {
                     $row->save($params);
                 } else {
                     $model = new CommissionGoodsModel();
-                    $params['goods_id'] = $goods_id;
-                    $model->save($params);
+                    $saveData = $params;
+                    $saveData['goods_id'] = $goods_id;
+                    $model->save($saveData);
                 }
                 $count++;
             }