Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

app/Admin/Service/OrderService.php

@@ -117,18 +117,18 @@ class OrderService extends BaseService
 //            dd($returnItems);
             foreach ($orderItems as $orderItem){
                 OrderItem::updateOrderItem(["rec_id"=>$orderItem["order_items_id"]],[
-                    "goods_price"=>$orderItem["goods_price"],
-                    "goods_number"=>$orderItem["goods_number"],
+                    "goods_price"=>floatval($orderItem["goods_price"]) <= 0 ? 0 : decimal_number_format($orderItem["goods_price"],DIGITS_SIX),
+                    "goods_number"=>intval($orderItem["goods_number"]) <= 0 ? 0 : $orderItem["goods_number"],
                 ]);
 
                 $returnItems = OrderReturnItems::getOrderReturnItem($orderItem["order_items_id"]);
                 $insertReturnItemData = [
-                    "type"=>$orderItem["return_type"],
+                    "type"=>intval($orderItem["return_type"]),
                     "order_id"=>$order_id,
                     "rec_id"=>$orderItem["order_items_id"],
-                    "return_num"=>$orderItem["return_goods_number"],
-                    "return_price"=>$orderItem["return_goods_price"],
-                    "return_amount"=> $orderItem["return_amount"],
+                    "return_num"=>intval($orderItem["return_goods_number"]) <= 0 ? 0 : intval($orderItem["return_goods_number"]),
+                    "return_price"=>floatval($orderItem["return_goods_price"]) <= 0 ? 0 : decimal_number_format($orderItem["return_goods_price"],DIGITS_SIX),
+                    "return_amount"=> decimal_number_format($orderItem["return_amount"]),
 //                    "return_amount"=> decimal_number_format($orderItem["return_goods_number"] * $orderItem["return_goods_price"]),
                 ];
 
@@ -136,9 +136,8 @@ class OrderService extends BaseService
 
                 $createOrEdit = false;
                 if(!empty($returnItems)){
-
                     foreach($insertReturnItemData as $field=>$val){
-                        if($field != "type" ||  !in_array($val,[1,2])){
+                        if($field == "type"   &&   !in_array($val,[1,2])){
                             continue;
                         }
                         if($field == "return_goods_number" && !$val){
@@ -155,6 +154,9 @@ class OrderService extends BaseService
                         }
 
                     }
+
+
+
                 }else{
                     if(in_array($insertReturnItemData["type"],[1,2]) && $insertReturnItemData["return_price"]  && $insertReturnItemData["return_num"]){
                         $createOrEdit = true;