Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Services/CartService.php

@@ -44,9 +44,9 @@ class CartService
             $digikeyInfo = ThirdService::getSemourData("sku_raw_map",$goods_id); //digikey 编码
             $digikeyInfo = ThirdService::getSemourData("sku_raw_map",$goods_id); //digikey 编码
             if ($digikeyInfo){
             if ($digikeyInfo){
                 $digikeyArr = json_decode($digikeyInfo,true);
                 $digikeyArr = json_decode($digikeyInfo,true);
-                $temp["raw_goods_sn"]= $digikeyArr["raw_goods_id"];
-                $temp["raw_goods_packing"]= $digikeyArr["pack"];
-                $temp["raw_brand_name"]= $digikeyArr["raw_brand_name"];
+                $temp["raw_goods_sn"]= \Arr::get($digikeyArr,"raw_goods_id","");
+                $temp["raw_goods_packing"]= \Arr::get($digikeyArr,"pack","");
+                $temp["raw_brand_name"]= \Arr::get($digikeyArr,"raw_brand_name","");
             }
             }
 
 
             //购买时价格
             //购买时价格
@@ -112,7 +112,7 @@ class CartService
             return $te;
             return $te;
         }catch (\Exception $e){
         }catch (\Exception $e){
             $con->rollback();
             $con->rollback();
-          #  throw new InvalidRequestException($e->getMessage().$e->getLine());
+            throw new InvalidRequestException($e->getMessage().$e->getLine());
             return false;
             return false;
         }
         }
     }
     }
@@ -172,9 +172,9 @@ class CartService
                 $digikeyInfo = ThirdService::getSemourData("sku_raw_map",$goods_id); //digikey 编码
                 $digikeyInfo = ThirdService::getSemourData("sku_raw_map",$goods_id); //digikey 编码
                 if ($digikeyInfo){
                 if ($digikeyInfo){
                     $digikeyArr = json_decode($digikeyInfo,true);
                     $digikeyArr = json_decode($digikeyInfo,true);
-                    $temp["raw_goods_sn"]= $digikeyArr["raw_goods_id"];
-                    $temp["raw_goods_packing"]= $digikeyArr["pack"];
-                    $temp["raw_brand_name"]= $digikeyArr["raw_brand_name"];
+                    $temp["raw_goods_sn"]= \Arr::get($digikeyArr,"raw_goods_id","");
+                    $temp["raw_goods_packing"]= \Arr::get($digikeyArr,"pack","");
+                    $temp["raw_brand_name"]= \Arr::get($digikeyArr,"raw_brand_name","");
                 }
                 }
 
 
                 $temp["buy_number"] = $skuInfo["stock"] > $v['buy_number'] ? $v['buy_number'] : $skuInfo["stock"]; //购买数量
                 $temp["buy_number"] = $skuInfo["stock"] > $v['buy_number'] ? $v['buy_number'] : $skuInfo["stock"]; //购买数量

app/Http/Services/OrderService.php

@@ -180,9 +180,9 @@ class OrderService
                     "purchase_name"=>"",	//采购员
                     "purchase_name"=>"",	//采购员
                     "contract_remark"=>"",	//合同备注 6个汉子
                     "contract_remark"=>"",	//合同备注 6个汉子
                     "tax_rate"=>0,	//税率
                     "tax_rate"=>0,	//税率
-                    "raw_goods_sn"=>\Arr::get($cartInfo,"raw_goods_sn",0),	//DGK原始编码
-                    "raw_goods_packing"=>\Arr::get($cartInfo,"raw_goods_packing",0),	//DGK原始包装
-                    "raw_brand_name"=>\Arr::get($cartInfo,"raw_brand_name",0),	//DGK原始品牌名称
+                    "raw_goods_sn"=>\Arr::get($cartInfo,"raw_goods_sn",""),	//DGK原始编码
+                    "raw_goods_packing"=>\Arr::get($cartInfo,"raw_goods_packing",""),	//DGK原始包装
+                    "raw_brand_name"=>\Arr::get($cartInfo,"raw_brand_name",""),	//DGK原始品牌名称
                     "discount_amount"=>0,	//折扣金额
                     "discount_amount"=>0,	//折扣金额
                     "other_amount"=>0,	//其它费用金额
                     "other_amount"=>0,	//其它费用金额
                     "remarks"=>$v["remark"],	//客户备注
                     "remarks"=>$v["remark"],	//客户备注
@@ -310,7 +310,8 @@ class OrderService
             $priceArr = array_column($priceInfo,"price","price_type");
             $priceArr = array_column($priceInfo,"price","price_type");
 
 
           #  $sub_total = OrderPriceModel::getOrderSubTotal($order_id);
           #  $sub_total = OrderPriceModel::getOrderSubTotal($order_id);
-            $payment_surcharge_paypal = round($merchandise_total*0.046+0.5,2);
+            $shipping = \Arr::get($priceArr,3,0); //运费
+            $payment_surcharge_paypal = round(($merchandise_total+$shipping)*0.046+0.5,2);
 
 
             $ts =[
             $ts =[
                 "order_id"=>$order_id,
                 "order_id"=>$order_id,
@@ -323,7 +324,7 @@ class OrderService
                 "email"=>\Arr::get($receiveAddress,"email"),
                 "email"=>\Arr::get($receiveAddress,"email"),
                 "phone"=>\Arr::get($receiveAddress,"phone"),
                 "phone"=>\Arr::get($receiveAddress,"phone"),
                 "shipping_address"=>\Arr::get($receiveAddress,"detail_address"),
                 "shipping_address"=>\Arr::get($receiveAddress,"detail_address"),
-                "shipping"=>\Arr::get($priceArr,3,0), //运费
+                "shipping"=>$shipping, //运费
                 "payment_surcharge_paypal"=>$payment_surcharge_paypal, //paypal 支付手续费
                 "payment_surcharge_paypal"=>$payment_surcharge_paypal, //paypal 支付手续费
                 "payment_surcharge_ttl"=>35, //ttl 支付手续费
                 "payment_surcharge_ttl"=>35, //ttl 支付手续费
                 "merchandise_total"=>$merchandise_total, //商品总额
                 "merchandise_total"=>$merchandise_total, //商品总额