From 6343605bb0cb201c0c570195201701eea183fee9 Mon Sep 17 00:00:00 2001
From: ljl <liaojinling@jiancent.com>
Date: Thu, 25 Jan 2024 14:02:46 +0800
Subject: [PATCH] yh

---
 .../services/OrderPrint/ExpressTplService.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/libs/services/OrderPrint/ExpressTplService.php b/app/libs/services/OrderPrint/ExpressTplService.php
index a9b6406..9c424db 100644
--- a/app/libs/services/OrderPrint/ExpressTplService.php
+++ b/app/libs/services/OrderPrint/ExpressTplService.php
@@ -751,7 +751,7 @@ class ExpressTplService extends AbstractService {
                 $attributeList[] = [
                     'name' => $attribute['attribute_name'],
                     'code' => $attribute['attribute_code'],
-                    'options' => $this->getNetSiteServiceSelectOptions($service['service_code'], $attribute['attribute_code'], $attribute['type_desc']),
+                    'options' => CommonTool::convertMapToOptions(json_decode($attribute['type_desc'], true)),
                     'type' => $attribute['attribute_type'],
                 ];
             }
@@ -763,21 +763,4 @@ class ExpressTplService extends AbstractService {
         }
         return $serviceList;
     }
-
-    private function getNetSiteServiceSelectOptions($serviceCode, $attributeCode, $typeDesc) {
-        if ($serviceCode == 'TIMED-DELIVERY' && $attributeCode == 'value') {
-            return CommonTool::convertMapToOptions(json_decode($typeDesc, true));
-        }
-        return [];
-    }
-
-    private function getNetSiteServiceInputType($serviceCode) {
-        if (in_array($serviceCode, ['PRODUCT_TYPE', 'TIMED-DELIVERY'])) {
-            return 'select';
-        } elseif (in_array($serviceCode, ['IN41'])) {
-            return 'checkbox';
-        } elseif (in_array($serviceCode, ['INSURE', 'IN144'])) {
-            return 'input';
-        }
-    }
 }
\ No newline at end of file