专题管理

app/admin/service/goods/GoodsService.php

@@ -327,11 +327,19 @@ class GoodsService
                     $data['appointment_times'] = $times;
                 }
             }
-            if (!empty($data['goods_json'])) {
+            if (!empty($data['goods_json']) && $data['join_goods_category_id'] == 65) {
                 foreach ($data['goods_json'] as $key => $datum) {
-                    dump($datum);
                     $data['goods_json'][$key]['color'] = rgbToHex($datum['color']);
                 }
+            }elseif (!empty($data['goods_json']) && $data['join_goods_category_id'] == 43){
+//                dump($data['goods_json']);
+                foreach ($data['goods_json'] as $key1 => $item1){
+                    $data['goods_json'][$key1]['title'] = $key1;
+                    foreach ($item1['items'] as $key2 => $item2){
+                        $data['goods_json'][$key1]['items'][$key2]['key'] = $key2;
+                        $data['goods_json'][$key1]['items'][$key2]['params'] = $item2;
+                    }
+                }
             }
 
             $data['goods_on_addtimes'] = date('Y-m-d\TH:i:s.u\Z', $data['goods_on_addtimes'] - 60 * 60 * 8);
@@ -732,6 +740,29 @@ class GoodsService
                     'times' => $times
                 ]);
             }
+            if (!empty($params['goods_json']) && $params['join_goods_category_id'] == 65) {
+                $goodsJson = json_decode($params['goods_json'], true);
+                foreach ($goodsJson as $key => $item) {
+                    $goodsJson[$key]['color'] = hexToRgb($item['color']);
+                }
+
+                $model->goods_json = json_encode($goodsJson);
+            }elseif (!empty($params['goods_json']) && $params['join_goods_category_id'] == 43){
+                $goodsJson = json_decode($params['goods_json'], true);
+                $newGoodsJson = [];
+                foreach ($goodsJson as $item1){
+                    $newItem1 = [];
+                    foreach ($item1['items'] as $item2){
+                        $newItem1['items'][$item2['key']] = $item2['params'];
+                    }
+                    $newItem1['service'] = $item1['service'];
+                    $newGoodsJson[$item1['title']] = $newItem1;
+                }
+                $model->goods_json = json_encode($newGoodsJson);
+            }else{
+                $model->goods_json = '[]';
+            }
+
             if ($model->save()) {
                 return $model->goods_id;
             }
@@ -952,13 +983,27 @@ class GoodsService
                     'times' => $times
                 ]);
             }
-            if (!empty($data['goods_json'])) {
+            if (!empty($data['goods_json']) && $data['join_goods_category_id'] == 65) {
                 $goodsJson = json_decode($data['goods_json'], true);
                 foreach ($goodsJson as $key => $item) {
                     $goodsJson[$key]['color'] = hexToRgb($item['color']);
                 }
 
                 $data['goods_json'] = json_encode($goodsJson);
+            }elseif (!empty($data['goods_json']) && $data['join_goods_category_id'] == 43){
+                $goodsJson = json_decode($data['goods_json'], true);
+                $newGoodsJson = [];
+                foreach ($goodsJson as $item1){
+                    $newItem1 = [];
+                    foreach ($item1['items'] as $item2){
+                        $newItem1['items'][$item2['key']] = $item2['params'];
+                    }
+                    $newItem1['service'] = $item1['service'];
+                    $newGoodsJson[$item1['title']] = $newItem1;
+                }
+                $data['goods_json'] = json_encode($newGoodsJson);
+            }else{
+                $data['goods_json'] = '[]';
             }
 
             foreach ($data as $key => $val) {
@@ -968,7 +1013,7 @@ class GoodsService
         } catch (BusinessException $e) {
             throw new BusinessException($e->getMessage());
         } catch (\Exception $e) {
-            dump($e->getTrace());
+            dump($e->getMessage());
             throw new BusinessException('数据更新异常~1');
         }
     }

app/admin/service/order/OrderService.php

@@ -44,7 +44,7 @@ class OrderService
     {
         try {
             Db::beginTransaction();
-            $timeUnix = strtotime("-15 minutes");
+            $timeUnix = strtotime("-30 minutes");
             $orders = Order::where('order_status_system', 'PAYING')
                 ->where('order_addtimes', '<', $timeUnix)
                 ->get();