!150 修改

Merge pull request !150 from 赵世界/develop

app/Console/Commands/Test.php

@@ -47,13 +47,5 @@ class Test extends Command
      */
     public function handle()
     {
-        $shop = Shop::query()->find(3);
-        $business = BusinessFactory::init()->make($shop->plat_id);
-        $business->setShop($shop);
-//        $order = BusinessOrder::query()->where('shop_id', 1)->where('participate_no', 6436)->first();
-//        $res = $business->getOrderInfo($order->order_sn);
-        $endTime = DateTimeUtils::getMicroTime('2023-04-04 19:27:27');
-//        $beginTime = $endTime - 3000;
-        $beginTime = DateTimeUtils::getMicroTime('2023-04-04 19:15:29');
     }
 }

app/Http/Controllers/Business/BusinessOrderController.php

@@ -34,26 +34,50 @@ class BusinessOrderController extends Controller
         $shopId = $request->get('shop_id');
         $startNo = $request->get('start_no');
         $endNo = $request->get('end_no');
-        $startTime = BusinessOrder::query()->where('shop_id', $shopId)->where('participate_no', $startNo)->value('confirm_at');
+        $isSupplier = $request->get('is_supplier');
-        $endTime = BusinessOrder::query()->where('shop_id', $shopId)->where('participate_no', $endNo)->value('confirm_at');
+        $field = 'participate_no';
+        if ($isSupplier) {
+            $field = 'supply_participate_no';
+        }
+        $startTime = BusinessOrder::query()
+            ->where('shop_id', $shopId)
+            ->where('is_supplier', $isSupplier)
+            ->where($field, $startNo)
+            ->value('confirm_at');
+        if (empty($startTime)) {
+            exit('开始跟团号订单未查询到或正在同步中,请稍后再次获取');
+        }
+        $startTime = DateTimeUtils::getMicroTime($startTime);
+        $endTime = BusinessOrder::query()
+            ->where('shop_id', $shopId)
+            ->where('is_supplier', $isSupplier)
+            ->where($field, $endNo)
+            ->value('confirm_at');
+        if (empty($endTime)) {
+            exit('结束跟团号订单未查询到或正在同步中,请稍后再次获取');
+        }
+        $endTime = DateTimeUtils::getMicroTime($endTime);
+        if ($startTime > $endTime) {
+            exit('开始跟团号订单 成交时间 大于 结束跟团号订单时间,请查验后再试!');
+        }
         $orders = BusinessOrder::query()
             ->with([
                 'items:id,business_order_id,external_sku_id,goods_number,goods_name',
                 'items.goodsSkuLocation:id,external_sku_id,location,goods_name'
             ])
             ->where('shop_id', $shopId)
-            ->where('confirm_at', '>=', DateTimeUtils::getMicroTime($startTime))
+            ->where('confirm_at', '>=', $startTime)
-            ->where('confirm_at', '<=', DateTimeUtils::getMicroTime($endTime))
+            ->where('confirm_at', '<=', $endTime)
             ->where('after_sales_status', 0)
             ->where('cancel_status', 0)
-            ->where('is_supplier', 1)
+            ->where('is_supplier', $isSupplier)
             ->orderByDesc('confirm_at')
-            ->get(['id', 'participate_no']);
+            ->get(['id', $field]);
         $distribution = [];
         $no = [];
         foreach ($orders as $key => $order) {
             $index = $key + 1;
-            $no[] = 'P' . $index . '(' . $order->participate_no . ')';
+            $no[] = 'P' . $index . '(' . $order->$field . ')';
             foreach ($order->items as $item) {
                 $item = $item->toArray();
                 if (empty($item['external_sku_id'])) {

app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php

@@ -97,6 +97,9 @@ class KuaiTuanTuan extends BusinessClient
             $responseName = 'ktt_order_list_response';
         }
         $res = $this->doRequest($type, $appendParams);
+        if (!isset($res[$responseName])) {
+            return;
+        }
         $this->saveOrders($res[$responseName]['order_list']);
         $pageNum = ceil($res[$responseName]['total_count'] / $appendParams['page_size']);
         if ($pageNum > $page && 30 >= $page) {

public/dist/css/chunk-7cdb40b2.e7ded070.css

@@ -0,0 +1 @@
+.block[data-v-f275e28e]{margin-top:20px}

public/dist/css/chunk-7e09c5c4.749f9966.css

@@ -1 +0,0 @@
-.block[data-v-8ac9ae68]{margin-top:20px}

public/dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0b2fb3a8.ebe80e03.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-281ed902.b3153d73.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-7e09c5c4.749f9966.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-dae6d032.c998c48a.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.e3b91ba7.js" rel="prefetch"><link href="js/chunk-0b2fb3a8.c7277f66.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-26daa808.9e326ce2.js" rel="prefetch"><link href="js/chunk-281ed902.01d8bc0c.js" rel="prefetch"><link href="js/chunk-35db73ce.ae2590c3.js" rel="prefetch"><link href="js/chunk-4caed774.d65d1796.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0070e388.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.ee4aa3e0.js" rel="prefetch"><link href="js/chunk-743f0316.cc5e2a5b.js" rel="prefetch"><link href="js/chunk-75426f71.128f599c.js" rel="prefetch"><link href="js/chunk-7e09c5c4.5e89acae.js" rel="prefetch"><link href="js/chunk-904e5abc.e6a5edbe.js" rel="prefetch"><link href="js/chunk-a3ddd952.0482ce75.js" rel="prefetch"><link href="js/chunk-ab4d3e40.c28d58b3.js" rel="prefetch"><link href="js/chunk-dae6d032.7fa60b44.js" rel="prefetch"><link href="js/chunk-e35186f0.f1d6b68d.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.b774c023.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.7aa7bce6.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.7aa7bce6.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0b2fb3a8.ebe80e03.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-281ed902.b3153d73.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-7cdb40b2.e7ded070.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-dae6d032.c998c48a.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.e3b91ba7.js" rel="prefetch"><link href="js/chunk-0b2fb3a8.c7277f66.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-26daa808.9e326ce2.js" rel="prefetch"><link href="js/chunk-281ed902.01d8bc0c.js" rel="prefetch"><link href="js/chunk-35db73ce.ae2590c3.js" rel="prefetch"><link href="js/chunk-4caed774.d65d1796.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0070e388.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.ee4aa3e0.js" rel="prefetch"><link href="js/chunk-743f0316.cc5e2a5b.js" rel="prefetch"><link href="js/chunk-75426f71.128f599c.js" rel="prefetch"><link href="js/chunk-7cdb40b2.c5de1e6d.js" rel="prefetch"><link href="js/chunk-904e5abc.e6a5edbe.js" rel="prefetch"><link href="js/chunk-a3ddd952.0482ce75.js" rel="prefetch"><link href="js/chunk-ab4d3e40.c28d58b3.js" rel="prefetch"><link href="js/chunk-dae6d032.7fa60b44.js" rel="prefetch"><link href="js/chunk-e35186f0.f1d6b68d.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.b774c023.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.0762f328.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.0762f328.js"></script></body></html>

resources/frontend/src/views/plat/orderList.vue

@@ -30,7 +30,7 @@
                     <el-select v-model="form.is_supplier" placeholder="订单类型">
                         <el-option value="" label="全部订单"></el-option>
                         <el-option value="1" label="自卖团订单"></el-option>
-                        <el-option value="0" label="帮忙团订单"></el-option>
+                        <el-option value="0" label="帮卖团订单"></el-option>
                     </el-select>
                 </el-form-item>
 
@@ -100,6 +100,12 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="订单类型">
+                    <el-radio-group v-model="exportForm.is_supplier">
+                        <el-radio :label="1">自卖团订单</el-radio>
+                        <el-radio :label="0">帮卖团订单</el-radio>
+                    </el-radio-group>
+                </el-form-item>
                 <el-form-item label="开始跟团号" prop="start_no">
                     <el-input v-model="exportForm.start_no"></el-input>
                 </el-form-item>
@@ -140,7 +146,8 @@ export default {
             exportForm: {
                 shop_id: "",
                 start_no: "",
-                end_no: ""
+                end_no: "",
+                is_supplier: 1,
             },
             exportFormRules: {
                 shop_id: [
@@ -225,7 +232,7 @@ export default {
         derivation(formName) {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
-                    window.open("/plat_orders/export?shop_id=" + this.exportForm.shop_id + '&start_no=' + this.exportForm.start_no + '&end_no=' + this.exportForm.end_no);
+                    window.open("/plat_orders/export?shop_id=" + this.exportForm.shop_id + '&start_no=' + this.exportForm.start_no + '&end_no=' + this.exportForm.end_no + '&is_supplier=' + this.exportForm.is_supplier);
                 } else {
                     return false;
                 }