fix: 修复订单分佣记录显示及库存验证问题

- 在OrderDivideRecordController中修正商户/员工显示字段及查询条件
- 在GoodController中添加商品规格库存的必填验证和数字验证
- 在OrderInfoController中添加实际支付和积分抵扣字段显示
- 在StoreAdminUsersController中添加分佣金额的调试日志
- 移除HfSettleAccountController中的多余空行

app/Admin/Controllers/GoodController.php

@@ -202,11 +202,11 @@ protected function form()
                         'name'    => '库存', // table 第一行 title 
                         'name'    => '库存', // table 第一行 title 
                         'field'   => 'stock', // input 的 field_name 名称
                         'field'   => 'stock', // input 的 field_name 名称
                         'default' => '', // 默认值
                         'default' => '', // 默认值
+                        'rules'   => 'required|numeric|min:0' // 添加必填和数字验证
                     ],
                     ],
                 ];
                 ];
 
 
                 $form->sku('sku', json_encode($sku_params))->display(true)->customFormat(function ($value) use ($form, $sku) {
                 $form->sku('sku', json_encode($sku_params))->display(true)->customFormat(function ($value) use ($form, $sku) {
-
                     return $sku;
                     return $sku;
                 })->required();
                 })->required();
             })->tab('文字标签', function (Form $form) {
             })->tab('文字标签', function (Form $form) {
@@ -267,6 +267,15 @@ protected function form()
             if (isset($_POST['sku']) && !$skuVal && $is_show) {
             if (isset($_POST['sku']) && !$skuVal && $is_show) {
                 $form->responseValidationMessages('sku', "商品规格不为空");
                 $form->responseValidationMessages('sku', "商品规格不为空");
             }
             }
+            // 添加库存验证
+            if ($skuVal) {
+                foreach ($skuVal as $index => $item) {
+                    if (!isset($item['stock']) || $item['stock'] === '') {
+                        $form->responseValidationMessages('sku', "第".($index+1)."个规格的库存不能为空");
+                        break;
+                    }
+                }
+            }
         });
         });
         return $form;
         return $form;
     }
     }

app/Admin/Controllers/OrderDivideRecordController.php

@@ -76,7 +76,7 @@ protected function grid()
                 'divide_price' => '分佣金额',
                 'divide_price' => '分佣金额',
                 'sh_type' => '分佣类型',
                 'sh_type' => '分佣类型',
                 'is_div' => '是否分账',
                 'is_div' => '是否分账',
-                'um_id' => '推荐人/商家',
+                'um_id' => '商户/员工',
                 'created_at' => '创建时间'
                 'created_at' => '创建时间'
             ];
             ];
 
 
@@ -93,7 +93,7 @@ protected function grid()
                     } else if ($row['sh_type'] == 3) {
                     } else if ($row['sh_type'] == 3) {
                         $row['um_id'] = Merchant::where('id',  $row['um_id'])->value('name');
                         $row['um_id'] = Merchant::where('id',  $row['um_id'])->value('name');
                     } else if ($row['sh_type'] == 5) {
                     } else if ($row['sh_type'] == 5) {
-                        $row['um_id'] = StoreAdminUsers::where('id',  $row['um_id'])->value('name');
+                        $row['um_id'] = StoreAdminUsers::where('member_id',  $row['um_id'])->value('name');
                     }
                     }
 
 
                     $row['sh_type'] = OrderDivideRecord::COMMISSION_TYPE[$row['sh_type']];
                     $row['sh_type'] = OrderDivideRecord::COMMISSION_TYPE[$row['sh_type']];

app/Admin/Controllers/OrderInfoController.php

@@ -219,6 +219,8 @@ protected function grid()
                 'goods_number' => '商品数量',
                 'goods_number' => '商品数量',
                 'goods_price' => '商品单价',
                 'goods_price' => '商品单价',
                 'goods_amount' => '订单金额',
                 'goods_amount' => '订单金额',
+                'order_amount' => '实际支付',
+                'point_amount' => '积分抵扣',
                 'order_status' => '订单状态',
                 'order_status' => '订单状态',
                 'created_at' => '下单时间'
                 'created_at' => '下单时间'
             ];
             ];

app/Http/Controllers/Api/HfSettleAccountController.php

@@ -76,7 +76,6 @@ public function createMemberAccount(Request $request)
         }
         }
     }
     }
 
 
-
     //创建企业用户结算账户
     //创建企业用户结算账户
     public function createCompanyAccount(Request $request)
     public function createCompanyAccount(Request $request)
     {
     {

app/Http/Controllers/Api/StoreAdminUsersController.php

@@ -95,17 +95,19 @@ public function info(Request $request)
            
            
                 //订单状态为已支付，未分账的应该分佣金额
                 //订单状态为已支付，未分账的应该分佣金额
                 $balance01=$this->getCommissionAmount(1,$merchant_id);
                 $balance01=$this->getCommissionAmount(1,$merchant_id);
-                Log::info('balance01:'.$balance01);
+                Log::info('balance01-1:'.$balance01);
             } else {//员工
             } else {//员工
                 //分佣记录[员工]
                 //分佣记录[员工]
                 $orderDivideRecord = OrderDivideRecord::where(['um_id' => $muser->member_id])->select('divide_price', 'is_div', 'created_at')->orderBy('created_at', 'desc')->get();
                 $orderDivideRecord = OrderDivideRecord::where(['um_id' => $muser->member_id])->select('divide_price', 'is_div', 'created_at')->orderBy('created_at', 'desc')->get();
             
             
                 //订单状态为已支付，未分账的应该分佣金额
                 //订单状态为已支付，未分账的应该分佣金额
                 $balance01=$this->getCommissionAmount(2,$muser->id);
                 $balance01=$this->getCommissionAmount(2,$muser->id);
+                Log::info('balance01-2:'.$balance01);
             }
             }
 
 
             //分佣记录中，状态为0的，未绑卡的
             //分佣记录中，状态为0的，未绑卡的
             $balance02= $orderDivideRecord->where('is_div', 0)->sum('divide_price'); //冻结中
             $balance02= $orderDivideRecord->where('is_div', 0)->sum('divide_price'); //冻结中
+            Log::info('balance02:'.$balance02);
             
             
             //已提现==分佣记录中，状态为2的
             //已提现==分佣记录中，状态为2的
             $cashout = number_format($orderDivideRecord->where('is_div', 1)->sum('divide_price'), 2); //已分账
             $cashout = number_format($orderDivideRecord->where('is_div', 1)->sum('divide_price'), 2); //已分账
@@ -345,6 +347,7 @@ public function getCommissionAmount($type,  $obj_id)
                 $totalCommission += $employee_divide_price;
                 $totalCommission += $employee_divide_price;
             }
             }
         }
         }
+        Log::add('zhu8',$totalCommission);
 
 
         return $totalCommission;
         return $totalCommission;