Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/jwhx into dev

modules/Order/app/Services/CashierService.php

@@ -10,7 +10,6 @@ namespace Modules\Order\Services;
 
 use Illuminate\Support\Str;
 use Modules\Goods\Models\GoodsSku;
-use Modules\Member\Models\MemberAddress;
 use Modules\Order\Models\Cart;
 use Modules\Goods\Models\Goods;
 use Modules\Order\Models\Order;
@@ -45,18 +44,16 @@ class CashierService {
 			$goods_sn=$request->input('goods_sn');
 			$firstChar = substr($goods_sn, 0, 1); // 截取第一个字符
 			if($firstChar == "G"){
-				$goodsSN=Goods::where(['goods_sn' => $goods_sn])->find();
+				$goodsSN=Goods::where(['goods_sn' => $goods_sn])->first();
 				$goods_id = empty($goodsSN)?$goods_id:$goodsSN->id;
 			}else if($firstChar == "S"){
-				$goodsSKUSN=GoodsSku::where(['goods_sn' => $goods_sn])->find();
+				$goodsSKUSN=GoodsSku::where(['goods_sn' => $goods_sn])->first();
 				$goods_id = empty($goodsSKUSN)?$goods_id:$goodsSKUSN->goods_id;
 				$goods_sku_id = empty($goodsSKUSN)?$goods_id:$goodsSKUSN->id;
 			}
 		}
 		/////////////////////////////////////////////////////////
 
-
-
 		$goods = Goods::find($goods_id);
 		if(!$goods){
 			throw new \Exception("商品不存在！", 1);
@@ -85,6 +82,12 @@ class CashierService {
 			$cart->num = $cart->num + $request->input('num', 1);
 		}
 
+		$cart->goods_id = $goods_id;
+
+		$cart->goods_sku_id = $goods_sku_id;
+
+		$cart->store_id = $goods->store_id;
+
 		$cart->save();
 		return $cart;
 	}