Merge branch 'master' of http://101.200.220.49:8001/sunhao/seafood

app/Console/Commands/SyncMjWarehouse.php

@@ -58,19 +58,23 @@ class SyncMjWarehouse extends Command {
             //2.更新商品库存总成本(有可能为空)
             //3.计算商品真实价格
             //4.计算商品外部价格
+            $cost = DB::table('goods_skus')->where('code', $code)->select('referenceCost', 'is_weigh')->first(); //获取规格成本/是否称重
+            if($cost){
+                $quantity = $cost->is_weigh == 1 ? $sku['quantity']/2 : $sku['quantity']; //对应规格数量
+                $up['quantity'] = $quantity;
+                $up['totalCost'] = isset($sku['totalCost']) ? $sku['totalCost'] : 0;
+                if($up['quantity'] != 0 ){
+                    $up['realPrice'] = $up['totalCost'] / $up['quantity'];
+                    $up['outPrice'] = ceil($up['realPrice'] * 1.1);
+                } else {
+                    $up['realPrice'] = 0;
+                    $up['outPrice'] = 0;
+                }
+                $up['cost'] = isset($sku['cost']) ? $sku['cost'] : 0;
 
-            $up['quantity'] = $sku['quantity'];
-            $up['totalCost'] = isset($sku['totalCost']) ? $sku['totalCost'] : 0;
-            if($up['quantity'] != 0 ){
-                $up['realPrice'] = $up['totalCost'] / $up['quantity'];
-                $up['outPrice'] = ceil($up['realPrice'] * 1.1);
-            } else {
-                $up['realPrice'] = 0;
-                $up['outPrice'] = 0;
+                $up_re = DB::table('goods_skus')->where('code', $code)->update($up);
             }
-            $up['cost'] = isset($sku['cost']) ? $sku['cost'] : 0;
 
-            $up_re = DB::table('goods_skus')->where('code', $code)->update($up);
         }
 
         return true;

app/Console/Commands/freightCost.php

@@ -189,10 +189,10 @@ class freightCost extends Command {
         foreach( $data as $value ) {
             if( $value['logisticsCost'] > 0 ){
                 $freightCost = $value['logisticsCost'];
-                $re = DB::table('order_20191115')->where('logistics_id',$value['expressCode'])->where('is_del',0)->where('warehouse',3)
+                $re = DB::table('order')->where('logistics_id',$value['expressCode'])->where('is_del',0)->where('warehouse',3)
                     ->update(['freight_cost'=>$freightCost]);
 //                echo $value['expressCode'].' ';
-                $message = ' success update code:'.$value['expressCode'];
+                $message = ' success update code:'.$value['expressCode'].' freight_cost:'.$freightCost.' result:'.$re;
                 $this->log($message);
             } else {
                 continue;