refactor: 移除多余空行并优化代码结构

移除OrderController和routes/api.php中的多余空行，优化代码可读性。在CarouselController中添加新方法orderDivByPoint用于测试订单积分生成。修复Adapay模型中createPointRecordByOrder方法的逻辑错误，确保纯现金支付订单才返积分。调整OrderDivideRecord模型中的日志记录，使其更清晰和准确。

app/Http/Controllers/Api/CarouselController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 namespace App\Http\Controllers\Api;
 
 
 use App\Models\OrderDivideRecord;
 use App\Models\OrderDivideRecord;
+use App\Models\Adapay;
 use App\Command\Log;
 use App\Command\Log;
 use App\Handlers\QqCos;
 use App\Handlers\QqCos;
 use App\Handlers\FileUploadHandler;
 use App\Handlers\FileUploadHandler;
@@ -42,4 +43,15 @@ public function orderDiv(Request $request)
         $payment_params = OrderDivideRecord::divide($order_id); //返回分账参数列表
         $payment_params = OrderDivideRecord::divide($order_id); //返回分账参数列表
         return  $this->JsonResponse($payment_params);
         return  $this->JsonResponse($payment_params);
     }
     }
+
+    
+    //测试订单积分生成
+    public function orderDivByPoint(Request $request)
+    {
+        $order_id = $request->order_id ?? 0;
+
+        //分账列表
+        $payment_params = Adapay::createPointRecordByOrder($order_id); //返回分账参数列表
+        return  $this->JsonResponse($payment_params);
+    }
 }
 }

app/Http/Controllers/Api/OrderController.php

@@ -288,8 +288,6 @@ public function CreateOrder(Request $request)
         }
         }
     }
     }
 
 
-
-
     private function getOrderSn()
     private function getOrderSn()
     {
     {
         $order_sn = '';
         $order_sn = '';
@@ -409,7 +407,6 @@ public function pay(Request $request)
         }
         }
     }
     }
     
     
-
     //付款回调
     //付款回调
     public function payNotify(Request $request)
     public function payNotify(Request $request)
     {
     {

app/Models/Adapay.php

@@ -600,10 +600,10 @@ public static function createPointRecordByOrder($order_id)
             $spuid = $userObj->spuid; // 直推用户ID
             $spuid = $userObj->spuid; // 直推用户ID
             $second_spuid = $userObj->second_spuid; // 间推用户ID
             $second_spuid = $userObj->second_spuid; // 间推用户ID
 
 
-            //获取订单商品积分
+            //获取订单商品积分【纯现金支付订单才返积分，混合支付的不返】
             $goodsObjList = DB::select('
             $goodsObjList = DB::select('
                         SELECT 
                         SELECT 
-                            log.id,
+                            loi.id,
                             log.goods_id,
                             log.goods_id,
                             loi.order_amount,
                             loi.order_amount,
                             log.goods_price,
                             log.goods_price,
@@ -625,10 +625,11 @@ public static function createPointRecordByOrder($order_id)
             ', [$order_id]);
             ', [$order_id]);
 
 
             if (!$goodsObjList) {
             if (!$goodsObjList) {
-                Log::add('积分记录创建失败', [
+                Log::add('搜索为空', [
                     'error' => '搜索为空',
                     'error' => '搜索为空',
                     'order_id' => $order_id
                     'order_id' => $order_id
                 ]);
                 ]);
+                return false;
             }
             }
 
 
             // 购物车结算会有多个商品，多笔分佣，遍历商品列表，为每个商品创建积分记录
             // 购物车结算会有多个商品，多笔分佣，遍历商品列表，为每个商品创建积分记录
@@ -636,7 +637,8 @@ public static function createPointRecordByOrder($order_id)
                 //判断直推是否存在
                 //判断直推是否存在
                 if ($spuid) {
                 if ($spuid) {
                     // 计算直推用户的积分
                     // 计算直推用户的积分
-                    $total_first_commission = $goodsObj->total_first_commission;
+                    $total_first_commission = number_format($goodsObj->total_first_commission , 2);
+
                     // 为直推用户创建积分记录
                     // 为直推用户创建积分记录
                     UserPointChangeRec::pointChangeRecord($spuid, $total_first_commission, 1, 1, 3, $order_id); // 
                     UserPointChangeRec::pointChangeRecord($spuid, $total_first_commission, 1, 1, 3, $order_id); // 
                 }
                 }
@@ -644,7 +646,8 @@ public static function createPointRecordByOrder($order_id)
                 //判断间推是否存在
                 //判断间推是否存在
                 if ($second_spuid) {
                 if ($second_spuid) {
                     // 计算间推用户的积分
                     // 计算间推用户的积分
-                    $total_second_commission = $goodsObj->total_second_commission;
+                    $total_second_commission =  number_format($goodsObj->total_second_commission, 2);
+
                     // 为间推用户创建积分记录
                     // 为间推用户创建积分记录
                     UserPointChangeRec::pointChangeRecord($second_spuid, $total_second_commission, 1, 2, 3, $order_id); // 
                     UserPointChangeRec::pointChangeRecord($second_spuid, $total_second_commission, 1, 2, 3, $order_id); // 
                 }
                 }

app/Models/OrderDivideRecord.php

@@ -94,7 +94,7 @@ public static function divide($order_id, $payconfirm_no = '')
                 ->select(DB::raw('SUM(goods_price * goods_number) as total'))
                 ->select(DB::raw('SUM(goods_price * goods_number) as total'))
                 ->value('total');
                 ->value('total');
             //计算现金支付比例
             //计算现金支付比例
-            $cash_ratio = number_format(($orderObj->order_amount / $orderGoodCash) * 100, 4); //保留4位小数
+            $cash_ratio = number_format(($orderObj->order_amount / $orderGoodCash) / 100, 4); //保留4位小数
         }
         }
 
 
         Log::add('divide', "订单ID:{$order_id}，支付类型:{$orderObj->pay_type}，现金支付比例:{$cash_ratio}");
         Log::add('divide', "订单ID:{$order_id}，支付类型:{$orderObj->pay_type}，现金支付比例:{$cash_ratio}");
@@ -114,17 +114,19 @@ public static function divide($order_id, $payconfirm_no = '')
             $employee_divide_price_log = $merchant_divide_price;
             $employee_divide_price_log = $merchant_divide_price;
 
 
             //应该分给商家的金额
             //应该分给商家的金额
-            Log::add('divide', "员工分佣:{$employeeObj->employee_commission}");
+            //Log::add('divide', "员工分佣:{$employeeObj->employee_commission}");
 
 
             //员工分佣记录
             //员工分佣记录
             if ($employee && $employeeObj->employee_commission >= 1 && $employeeObj->employee_commission < 100) {
             if ($employee && $employeeObj->employee_commission >= 1 && $employeeObj->employee_commission < 100) {
-                //应该分给商家的金额
-                Log::add('divide', "员工分佣:{$employeeObj->employee_commission}， 员工分佣记录:{$employee_divide_price}， 商户分佣记录:{$merchant_divide_price}");
 
 
                 // 基于商家分到佣金计算员工分佣
                 // 基于商家分到佣金计算员工分佣
                 $employee_divide_price = number_format($merchant_divide_price * ($employeeObj->employee_commission / 100), 2);
                 $employee_divide_price = number_format($merchant_divide_price * ($employeeObj->employee_commission / 100), 2);
                 $employeePreData['employee_amount'] += $employee_divide_price;
                 $employeePreData['employee_amount'] += $employee_divide_price;
                 $employeePreData['employee_member_id'] = $employeeObj->member_id;
                 $employeePreData['employee_member_id'] = $employeeObj->member_id;
+
+                
+                //应该分给员工的金额
+                Log::add('divide员工', "员工比例:{$employeeObj->employee_commission}， 员工分佣:{$employee_divide_price}， 商户分佣:{$merchant_divide_price}");
             }
             }
 
 
             //商户分佣记录
             //商户分佣记录
@@ -136,7 +138,7 @@ public static function divide($order_id, $payconfirm_no = '')
             }
             }
 
 
             //应该分给商家的金额
             //应该分给商家的金额
-            Log::add('divide', "，应该分给商家的金额:{$employee_divide_price_log}， 员工分佣记录:{$employee_divide_price}， 商户分佣记录:{$merchant_divide_price}");
+            Log::add('divide商家', "，应该分给商家的金额:{$employee_divide_price_log}， 员工分佣:{$employee_divide_price}， 商户分佣:{$merchant_divide_price}");
         }
         }
 
 
         //商户佣金
         //商户佣金

routes/api.php

@@ -25,13 +25,11 @@
     Route::get('updateOrderStatusToDiv','OrderDivideRecordController@updateOrderStatusToDiv');  //分佣订单解冻轮训
     Route::get('updateOrderStatusToDiv','OrderDivideRecordController@updateOrderStatusToDiv');  //分佣订单解冻轮训
     Route::get('pointUnfreezeEnd','OrderDivideRecordController@pointUnfreezeEnd');  //订单积分解冻轮训
     Route::get('pointUnfreezeEnd','OrderDivideRecordController@pointUnfreezeEnd');  //订单积分解冻轮训
 
 
-
     //调试路由
     //调试路由
     Route::post('simulate-login','LoginController@simulateLogin');  //模拟登陆
     Route::post('simulate-login','LoginController@simulateLogin');  //模拟登陆
     Route::get('test1','LoginController@test');  //测试内容-什么都测
     Route::get('test1','LoginController@test');  //测试内容-什么都测
     Route::get('test-order-div','CarouselController@orderDiv');  //测试订单分佣
     Route::get('test-order-div','CarouselController@orderDiv');  //测试订单分佣
-
-
+    Route::get('test-order-div-point','CarouselController@orderDivByPoint');  //测试订单积分生成
 
 
     Route::post('manual-divide','OrderDivideRecordController@manualDivide');  //手动分账【开发手动调接口修正数据】
     Route::post('manual-divide','OrderDivideRecordController@manualDivide');  //手动分账【开发手动调接口修正数据】