Kaynağa Gözat

完善功能

gorden 10 ay önce
ebeveyn
işleme
b4fc8b5970

+ 1 - 1
app/admin/controller/member/WellnessRecordController.php

@@ -210,7 +210,7 @@ class WellnessRecordController extends Curd
 
 
     public function checkup($memberId)
     public function checkup($memberId)
     {
     {
-        $query = $this->model->where('wellness_record_category', '体检')
+        $query = $this->model->where('wellness_record_category', 'Examine')
             ->where('join_wellness_record_member_id', $memberId)
             ->where('join_wellness_record_member_id', $memberId)
             ->orderBy('wellness_record_addtimes', 'desc');
             ->orderBy('wellness_record_addtimes', 'desc');
         $paginator = $query->paginate(20);
         $paginator = $query->paginate(20);

+ 10 - 4
app/admin/service/goods/GoodsService.php

@@ -372,7 +372,15 @@ class GoodsService
                         ->toArray();
                         ->toArray();
                     foreach ($skus as $key => $sku2){
                     foreach ($skus as $key => $sku2){
                         if(!empty($sku2['goods_sku_specs_json'])){
                         if(!empty($sku2['goods_sku_specs_json'])){
-                            $skus[$key]['goods_sku_specs_json'] = json_decode($sku2['goods_sku_specs_json']);
+                            $skus[$key]['goods_sku_specs_json'] = json_decode($sku2['goods_sku_specs_json'],true);
+
+                            $skuName = '';
+                            foreach ($skus[$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs){
+                                if (is_array($skuSpecs)){
+                                    $skuName = $skuName.' '.$specsKey.' '.implode(' ',$skuSpecs);
+                                }
+                            }
+                            $skus[$key]['sku_name'] = $skuName;
                         }
                         }
                     }
                     }
                     $ids[] = $item['join_component_goods_id'];
                     $ids[] = $item['join_component_goods_id'];
@@ -749,11 +757,9 @@ class GoodsService
                     'join_component_goods_id' => $item['goods_id'] ?? '',
                     'join_component_goods_id' => $item['goods_id'] ?? '',
                     'goods_component_price' => $item['goods_sales_price'] ?? '',
                     'goods_component_price' => $item['goods_sales_price'] ?? '',
                     'goods_component_cover' => $goods->goods_cover,
                     'goods_component_cover' => $goods->goods_cover,
-                    'goods_component_json' => json_encode(['goods_name' => $item['goods_name'], 'nbr' => $item['nbr'], 'sku_id' => $item['sku'] ?? '']),
+                    'goods_component_json' => json_encode(['goods_name' => $item['goods_name'], 'nbr' => $item['nbr'], 'sku_id' => $item['sku_id'] ?? '']),
                     'goods_component_addtimes' => time()
                     'goods_component_addtimes' => time()
                 ];
                 ];
-
-                dump($data);
             }
             }
 
 
             if ($data) {
             if ($data) {