wugg 2 years ago
parent
commit
a59a669d75
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/admin/controller/CatPlat.php
  2. 1 1
      app/command/NowReportHandle.php

+ 1 - 1
app/admin/controller/CatPlat.php

@@ -362,7 +362,7 @@ use think\App;class CatPlat extends Base{
                    $rate =round( ($value['final_price'] - $salec['nake_total']) / $value['final_price'],2)/100;
                    if ($rate>=$sale_rate){
                        continue;
-                   }
+                 }
                }
                $spucode[]=$value['spuCode'];
             }

+ 1 - 1
app/command/NowReportHandle.php

@@ -187,7 +187,7 @@ class NowReportHandle extends Command
             ->leftJoin('warehouse_info wwi', 'wwi.wsm_code = wgs.wsm_code')
             ->leftJoin('business wb', 'wb.companyNo = wwi.companyNo')
             ->leftJoin('good_basic wgb', 'wgb.spuCode = wgs.spuCode')
-            ->leftJoin('supplier ws', 'wwi.supplierNo = ws.`code`')
+            ->leftJoin('supplier ws', 'wgb.supplierNo = ws.`code`')
             ->where('wgs.is_del', 0)
             ->where('wgb.is_stock', 1)
             ->whereBetween('wgs.updatetime', [$start_date, $end_date])