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

modules/Order/app/Services/CashierService.php

@@ -42,7 +42,17 @@ class CashierService {
 		//通过扫码获取商品编号
 		if(!empty($request->input('goods_sn'))){
 			$goods_sn=$request->input('goods_sn');
-			$firstChar = substr($goods_sn, 0, 1); // 截取第一个字符
+			$goodsSN=Goods::where(['goods_sn' => $goods_sn])->first();
+			if(!empty($goodsSN)){
+				$goods_id = empty($goodsSN)?$goods_id:$goodsSN->id;
+			}else{
+				$goodsSKUSN=GoodsSku::where(['goods_sn' => $goods_sn])->first();
+				if(!empty($goodsSKUSN)){
+					$goods_id = empty($goodsSKUSN)?$goods_id:$goodsSKUSN->goods_id;
+					$goods_sku_id = empty($goodsSKUSN)?$goods_id:$goodsSKUSN->id;
+				}
+			}
+			/*$firstChar = substr($goods_sn, 0, 1); // 截取第一个字符
 			if($firstChar == "G"){
 				$goodsSN=Goods::where(['goods_sn' => $goods_sn])->first();
 				$goods_id = empty($goodsSN)?$goods_id:$goodsSN->id;
@@ -50,7 +60,8 @@ class CashierService {
 				$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;
-			}
+			}*/
+
 		}
 		/////////////////////////////////////////////////////////