!267 bug修复

Merge pull request !267 from 杨建炊/fix-release-1.0.0/yjc-migrate

app/Console/Commands/Inventory.php

@@ -66,8 +66,8 @@ class Inventory extends Command
                         'two_days_ago_num' => $sku->two_days_ago_num + $sku->yesterday_num,
                     ]);
                 }
-                $record = new DailyStockRecord();
+                //$record = new DailyStockRecord();
-                $record->batchInsert($data);
+                //$record->batchInsert($data);
                 DB::commit();
                 $log->message = '7点数据更新成功';
             } catch (\Exception $exception) {

app/Console/Kernel.php

@@ -5,6 +5,7 @@ namespace App\Console;
 use App\Console\Commands\CheckPrice;
 use App\Console\Commands\CheckSkuQualityPeriod;
 use App\Console\Commands\DailySalesReport;
+use App\Console\Commands\DailyStockRecordReport;
 use App\Console\Commands\GoodsSkuDailyReport;
 use App\Console\Commands\Inventory;
 use App\Console\Commands\KttOrderAfterSaleQuery;
@@ -56,7 +57,7 @@ class Kernel extends ConsoleKernel
         //快团团售后单拉取
         $schedule->command(KttOrderAfterSaleQuery::class)->everyFifteenMinutes();
         //同步售卖信息和报损相关数据
-        $schedule->command(GoodsSkuDailyReport::class)->dailyAt('03:30');
+        $schedule->command(DailyStockRecordReport::class)->dailyAt('03:30');
 
         //新增快团团订单状态同步
         $schedule->command(KttOrderSyncStatus::class)->everyTenMinutes();

app/Http/Controllers/Business/BusinessGoodsSkusController.php

@@ -93,7 +93,8 @@ class BusinessGoodsSkusController extends Controller
         if (empty($sku)) {
             $this->setValidatorFailResponse('未找到对应的商品,请核实后再次同步或删除此平台商品');
         } else {
-            event(new BusinessOrdersUpdate($businessGoodsSku, 0));
+            $shop = $businessGoodsSku->shop;
+            BusinessFactory::init()->make($shop['plat_id'])->setShopWithId($shop['id'])->incrQuantity($businessGoodsSku, 0, false);
             $this->res['message'] = '库存同步请求发送成功,具体结果查看日志';
         }
         return response($this->res, $this->res['httpCode']);

app/Http/Controllers/Goods/GoodsSkusController.php

@@ -109,7 +109,6 @@ class GoodsSkusController extends Controller
                 $sku['order_detail'] = [];
                 $sku['order_goods_num'] = 0;
             }
-            $sku['order_goods_num'] -= $sku['daily']['reissue_num'] ?? 0;
             $sku['inventory_time'] = $lastInventoryTime;
             if ('销售' === $rolesName[0]) {
                 $sku['cost'] = 0;

public/dist/css/193.434fb0ab.css

@@ -1 +1 @@
-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-41a7827f]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-41a7827f]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.searchBox .time[data-v-41a7827f]{margin-left:20px;color:#999;font-size:12px}.opaBox[data-v-41a7827f]{margin-bottom:15px}
+#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-01d60a76]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-01d60a76]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.searchBox .time[data-v-01d60a76]{margin-left:20px;color:#999;font-size:12px}.opaBox[data-v-01d60a76]{margin-bottom:15px}

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><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.304aa352.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.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></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><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.30de8ae3.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.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></body></html>

resources/frontend/src/views/dataCenter/skuStatistics.vue

@@ -286,10 +286,16 @@ export default {
       this.downloadLoading = true
       let params = {
         type: this.time_type == 'day' ? 1 : 2,
-        start_day: this.startTime,
-        end_day: this.endTime,
         page: 1,
-        per_page: this.total
+        per_page: this.total,
+        sku_id: this.sku_id
+      }
+      if(params.type == 1) {
+        params.start_time = this.startTime
+        params.end_time = this.endTime
+      } else {
+        params.start_day = this.startTime
+        params.end_day =  this.endTime
       }
       getSkuSalesCount(params).then((res) => {
         if(!res.data.data.data.length) {