Browse Source

feat: 芳华臻选的快递配置

xdd 1 month ago
parent
commit
b5c855be51

+ 0 - 1
fs-service-system/src/main/java/com/fs/oms/config/DeliverConfig.java

@@ -15,7 +15,6 @@ import java.util.Map;
 @Getter
 @Configuration
 @ConfigurationProperties(prefix = "deliver")
-@ConditionalOnProperty(prefix = "deliver", name = "enabled", havingValue = "true", matchIfMissing = false)
 public class DeliverConfig {
     private Map<String, DeliverCompanyConfig> companies = new HashMap<>();
 

+ 11 - 10
fs-service-system/src/main/resources/application-config.yml

@@ -115,13 +115,14 @@ snowflake:
 
 # 发货快递配置
 deliver:
-  GY:
-    pub:
-      omsCode: 'WXSPHYD'
-    pri:
-      omsCode: 'MPSF0235506547'
-  JST:
-    pub:
-      omsCode: 'YUNDA.18'
-    pri:
-      omsCode: 'SF.34'
+  companies:
+    GY:
+      pub:
+        omsCode: 'WXSPHYD'
+      pri:
+        omsCode: 'MPSF0235506547'
+    JST:
+      pub:
+        omsCode: 'YUNDA.18'
+      pri:
+        omsCode: 'SF.34'