gorden před 9 měsíci
rodič
revize
537a715e70

+ 24 - 8
app/admin/controller/order/WholeController.php

@@ -651,14 +651,30 @@ class WholeController extends Curd
             
             // 入配送记录表            
             $model->join_express_order_id = $params['order_id'];
-            $model->order_express_goods = $params['order_express_goods'];
-            $model->order_express_type = $params['order_express_type'];
-            $model->order_express_code = $params['order_express_code'];
-            $model->order_express_city = $params['order_express_city'];
-            $model->order_express_address = $params['order_express_address'];
-            $model->order_express_mobile = $params['order_express_mobile'] ?? '';
-            $model->order_express_telephone = $params['order_express_telephone'] ?? null;
-            $model->order_express_person = $params['order_express_person'] ?? null;
+            if (isset($params['order_express_goods'])){
+                $model->order_express_goods = $params['order_express_goods'];
+            }
+            if (isset($params['order_express_type'])){
+                $model->order_express_type = $params['order_express_type'];
+            }
+            if (isset($params['order_express_code'])){
+                $model->order_express_code = $params['order_express_code'];
+            }
+            if (isset($params['order_express_city'])){
+                $model->order_express_city = $params['order_express_city'];
+            }
+            if (isset($params['order_express_address'])){
+                $model->order_express_address = $params['order_express_address'];
+            }
+            if (isset($params['order_express_mobile'])){
+                $model->order_express_mobile = $params['order_express_mobile'];
+            }
+            if (isset($params['order_express_telephone'])){
+                $model->order_express_telephone = $params['order_express_telephone'];
+            }
+            if (isset($params['order_express_person'])){
+                $model->order_express_person = $params['order_express_person'];
+            }
             $model->order_express_remark = $params['order_express_remark'] ?? null;
             $model->order_express_addtimes = $params['order_express_addtimes'] ?? time();
             $model->save();

+ 2 - 1
app/admin/service/goods/GoodsService.php

@@ -1089,7 +1089,8 @@ class GoodsService
             $model->goods_classify = $params['goods_classify'] ?? '';
             $model->goods_status = $params['goods_status'] ?? '';
             $model->goods_category = $params['goods_category'] ?? '';
-            $model->goods_prefix = $params['goods_prefix'] ?? ($category->category_name ? '【' . $category->category_name . '】' : '');
+//            $model->goods_prefix = $params['goods_prefix'] ?? 】($category->category_name ? '【' . $category->category_name . '' : '');
+            $model->goods_prefix = $params['goods_prefix'] ?? '';
             $model->goods_name = $params['goods_name'];
             $model->goods_market_price = $params['goods_market_price'] ?? 0;
             $model->goods_sales_price = $params['goods_sales_price'] ?? 0;