Merge branch 'sh/28' into test01

app/Http/Controllers/Api/OrderController.php

@@ -417,6 +417,7 @@ class OrderController extends Controller {
         $order['receiverState'] = str_replace(['省', '市'], '', $order['receiverState']);
         $order['receiverCity'] = str_replace('市', '', $order['receiverCity']);
 
+        $order['receiverDistrict'] = trim($request->input('receiverDistrict')); //区
         $order['receiverAddress'] = trim($request->input('receiverAddress')); //详细地址
         $order['receivedAmount'] = trim($request->input('receivedAmount')); //付款金额        
         $order['buyerMemo'] = trim($request->input('buyerMemo', '')); // 买家备注
@@ -457,15 +458,16 @@ class OrderController extends Controller {
             $res = DB::table('order')->where('id', $id)->update($order); 
             //商品信息
             $skus = $request->input('skus');
-            $gnum = $request->input('gnum');
-            if(empty($skus)) $skus = [];
+            $sku_ids = array_column($skus, 'sku_id');
             //先删除
-            $del_re = DB::table('order_goods_skus')->where('order_id', $id)->whereNotIn('sku_id', $skus)->update(['is_del'=>1]);
+            $del_re = DB::table('order_goods_skus')->where('order_id', $id)->whereNotIn('sku_id', $sku_ids)->update(['is_del'=>1]);
             if(!empty($skus)){            
                 //再同步
-                foreach($skus as $k=>$sku_id){
+                foreach($skus as $k=>$sku){
+                    $sku_id = $sku['sku_id'];
+                    $num = $sku['num'];
                     $sku_info = GoodsSkus::select('goodsCode', 'price', 'propsName','is_weigh')->where('id', $sku_id)->first();
-                    $sync_re = OrderGoodsSkus::updateOrCreate(['order_id'=>$id, 'sku_id'=>$sku_id, 'goods_id'=>$sku_info->goodsCode], ['num'=>$gnum[$k], 'is_del'=>0, 'price'=>$sku_info->price]);
+                    $sync_re = OrderGoodsSkus::updateOrCreate(['order_id'=>$id, 'sku_id'=>$sku_id, 'goods_id'=>$sku_info->goodsCode], ['num'=>$num, 'is_del'=>0, 'price'=>$sku_info->price]);
                 }
 
             }