gorden 5 months ago
parent
commit
34d4bef183

File diff suppressed because it is too large
+ 608 - 111
app/admin/controller/order/GoodsController.php


+ 19 - 0
app/admin/controller/order/WholeController.php

@@ -5015,6 +5015,25 @@ class WholeController extends Curd
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
     }
 
+//    public function getMergeOrder(Request $request)
+//    {
+//        $orderIds = $request->get('order_ids');
+//        if (!$orderIds) {
+//            return json_fail('参数异常');
+//        }
+//
+//        $orders = Order::whereIn('order_id', $orderIds)
+//            ->select('order_id', 'order_groupby', 'order_amount_total', 'order_amount_pay')
+//            ->get()
+//            ->toArray();
+//        $groupIds = array_column($orders, 'order_groupby');
+//        if (count(array_unique($groupIds)) > 1){
+//            return json_fail("请选择同批次下单的记录");
+//        }
+//
+//        return json_success("");
+//    }
+
     public static $goodsClassify = [
         // goodsClassify: {GOODS:"健康产品订单",SERVICE:"服务订单",DEVICE:"设备订单",SPECIAL:"专题业务订单",PACKAGE:"套餐订单",RECHARGE:"充值订单",OTHER:"其他订单"},
 

+ 3 - 0
app/functions.php

@@ -43,6 +43,9 @@ if (!function_exists('http_post_json')) {
 
         $output = curl_exec($ch);
         curl_close($ch);
+        // 写日志
+        \support\Log::info('模拟请求:',json_decode($output));
+
         return $output;
     }
 }

Some files were not shown because too many files changed in this diff