1.统一管理服务名称

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -5,40 +5,50 @@ package org.springblade.common.constant;
  */
 public interface ModuleNameConstant {
 
+	/**
+	 * 如果不需要 ""
+	 */
+	public static final String DEVAUTH ="-zhy";
+
 	/**
 	 * 工厂对接服务名称
 	 */
-	String APPLICATION_FACTORY_NAME = "logpm-factory"+TenantNum.DEVAUTH;
+	String APPLICATION_FACTORY_NAME = "logpm-factory"+DEVAUTH;
 	/**
 	 * 工厂对接服务名称
 	 */
-	String APPLICATION_OLDPROJECT_NAME = "logpm-old-project"+TenantNum.DEVAUTH;
+	String APPLICATION_OLDPROJECT_NAME = "logpm-old-project"+DEVAUTH;
 
 	/**
 	 * 基础信息服务名称
 	 */
-	String APPLICATION_BASIC_NAME = "logpm-basic"+TenantNum.DEVAUTH;
+	String APPLICATION_BASIC_NAME = "logpm-basic"+DEVAUTH;
 
 	/**
 	 * 基础信息data服务名称
 	 */
-	String APPLICATION_BASICDATA_NAME = "logpm-basicdata"+TenantNum.DEVAUTH;
+	String APPLICATION_BASICDATA_NAME = "logpm-basicdata"+DEVAUTH;
 
 
 	/**
 	 * 干线服务名称
 	 */
-	String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"+TenantNum.DEVAUTH;
+	String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"+DEVAUTH;
 
 
 	/**
 	 * 仓库服务名称
 	 */
-	String APPLICATION_WAREHOUSE_NAME = "logpm-warehouse"+TenantNum.DEVAUTH;
+	String APPLICATION_WAREHOUSE_NAME = "logpm-warehouse"+DEVAUTH;
 
 	/**
 	 * 配送签收服务名称
 	 */
-	String APPLICATION_DISTRIBUTION_NAME = "logpm-distribution"+TenantNum.DEVAUTH;
+	String APPLICATION_DISTRIBUTION_NAME = "logpm-distribution"+DEVAUTH;
+
+	/**
+	 * 网关
+	 */
+	String APPLICATION_GATEWAY_NAME = "blade-gateway"+DEVAUTH;
 
 }

blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java

@@ -7,10 +7,7 @@ public class TenantNum {;
 
 	public static final String HUITONGCODE ="627683";
 
-	/**
+
-	 * 如果不需要 ""
-	 */
-	public static final String DEVAUTH ="-zhy";
 
 
 

blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java

@@ -16,13 +16,13 @@
  */
 package org.springblade.gateway;
 
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import static org.springblade.common.constant.ModuleNameConstant.APPLICATION_GATEWAY_NAME;
+
 /**
  * 项目启动
  *
@@ -34,7 +34,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 public class GateWayApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat(TenantNum.DEVAUTH), GateWayApplication.class, args);
+		BladeApplication.run(APPLICATION_GATEWAY_NAME, GateWayApplication.class, args);
 	}
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java

@@ -16,8 +16,9 @@
  */
 package com.logpm.basicdata.feign;
 
-import org.springblade.core.mp.support.BladePage;
 import com.logpm.basicdata.entity.BasicdataBrandEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java

@@ -16,8 +16,9 @@
  */
 package com.logpm.basicdata.feign;
 
-import org.springblade.core.mp.support.BladePage;
 import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java

@@ -77,16 +77,27 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "订单自编号")
 	private String orderSelfNumbering;
 	/**
-	 * 商场编号
+	 * 商场id
 	 */
-	@ApiModelProperty(value = "商场编号")
+	@ApiModelProperty(value = "商场id")
 	private Long mallId;
 	/**
-	 * 门店编号
+	 * 门店id
 	 */
-	@ApiModelProperty(value = "门店编号")
+	@ApiModelProperty(value = "门店id")
 	private Long storeId;
 
+	/**
+	 * 商场编号
+	 */
+	@ApiModelProperty(value = "商场编码")
+	private String mallCode;
+	/**
+	 * 门店编号
+	 */
+	@ApiModelProperty(value = "门店编码")
+	private Long storeCode;
+
 	/**
 	 * 商场名称
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java

@@ -16,8 +16,9 @@
  */
 package com.logpm.distribution.feign;
 
-import org.springblade.core.mp.support.BladePage;
 import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelDetailsClient.java

@@ -16,8 +16,9 @@
  */
 package com.logpm.distribution.feign;
 
-import org.springblade.core.mp.support.BladePage;
 import com.logpm.distribution.entity.DistributionParcelDetailsEntity;
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java

@@ -3,7 +3,6 @@ package com.logpm.basic;
 
 
 import org.springblade.common.constant.ModuleNameConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
@@ -16,7 +15,7 @@ import org.springblade.core.launch.BladeApplication;
 public class BasicApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_BASIC_NAME.concat(TenantNum.DEVAUTH), BasicApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_BASIC_NAME, BasicApplication.class, args);
 	}
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java

@@ -2,7 +2,6 @@
 package com.logpm.basicdata;
 
 import org.springblade.common.constant.ModuleNameConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
@@ -15,7 +14,7 @@ import org.springblade.core.launch.BladeApplication;
 public class BasicDataApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat(TenantNum.DEVAUTH), BasicDataApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args);
 
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java

@@ -17,7 +17,6 @@
 package com.logpm.distribution;
 
 import org.springblade.common.constant.ModuleNameConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
@@ -30,7 +29,7 @@ import org.springblade.core.launch.BladeApplication;
 public class DistributionApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME.concat(TenantNum.DEVAUTH), DistributionApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args);
 	}
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java

@@ -17,7 +17,6 @@
 package com.logpm.factory;
 
 import org.springblade.common.constant.ModuleNameConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
@@ -30,7 +29,7 @@ import org.springblade.core.launch.BladeApplication;
 public class FactoryApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_FACTORY_NAME.concat(TenantNum.DEVAUTH), FactoryApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_FACTORY_NAME, FactoryApplication.class, args);
 	}
 
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java

@@ -16,9 +16,7 @@
  */
 package com.logpm.oldproject;
 
-import org.springblade.common.constant.LauncherConstant;
 import org.springblade.common.constant.ModuleNameConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
@@ -31,7 +29,7 @@ import org.springblade.core.launch.BladeApplication;
 public class OldProjectApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_OLDPROJECT_NAME.concat(TenantNum.DEVAUTH), OldProjectApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_OLDPROJECT_NAME, OldProjectApplication.class, args);
 	}
 
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java

@@ -16,9 +16,7 @@
  */
 package com.logpm.trunkline;
 
-import org.springblade.common.constant.LauncherConstant;
 import org.springblade.common.constant.ModuleNameConstant;
-import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
@@ -31,7 +29,7 @@ import org.springblade.core.launch.BladeApplication;
 public class TrunkLineApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME.concat(TenantNum.DEVAUTH), TrunkLineApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME, TrunkLineApplication.class, args);
 	}
 
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java

@@ -30,7 +30,7 @@ import org.springblade.core.launch.BladeApplication;
 public class WarehouseApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_WAREHOUSE_NAME.concat(TenantNum.DEVAUTH), WarehouseApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_WAREHOUSE_NAME, WarehouseApplication.class, args);
 	}
 
 }