From dd1bd487fc9a274c6152409e47cbdc09147cc968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 6 Jun 2025 10:12:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E9=97=A8=E5=BA=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/enums/ExtendFieldTypeEnum.java | 6 +++++- .../src/main/java/com/cool/store/dto/StoreDTO.java | 4 ++++ .../com/cool/store/service/impl/StoreServiceImpl.java | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java index 2042c8dd8..d8efe12e4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java @@ -17,12 +17,16 @@ public enum ExtendFieldTypeEnum { TEST_SIGNATORY_NAME_2("extend_field_1746670671614","签约人2名称"), TEST_SIGNATORY_MOBILE_2("extend_field_1746670686307","签约人2手机号"), TEST_ORDER_NAME("extend_field_1747103227333","订单小程序名称"), + TEST_JOIN_MODE("extend_field_1749175173890","加盟模式"), + TEST_STORE_TYPE("extend_field_1749175177455","门店类型"), ONLINE_STORE_MANAGER_MOBILE("extend_field_1746598536903","店长手机号"), ONLINE_SIGNATORY_NAME_1("extend_field_1746598562255","签约人1名称"), ONLINE_SIGNATORY_MOBILE_1("extend_field_1746598570479","签约人2手机号"), ONLINE_SIGNATORY_NAME_2("extend_field_1746598584139","签约人2名称"), ONLINE_SIGNATORY_MOBILE_2("extend_field_1746598594140","签约人2手机号"), - ONLINE_ORDER_NAME("extend_field_1746599049206","订单小程序名称"),; + ONLINE_ORDER_NAME("extend_field_1746599049206","订单小程序名称"), + ONLINE_JOIN_MODE("extend_field_1748315801670","加盟模式"), + ONLINE_STORE_TYPE("extend_field_1748315809671","门店类型"),; private String key; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java index 184933008..09a5cc5ad 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java @@ -27,5 +27,9 @@ public class StoreDTO { private String signer2Phone; @ApiModelProperty("订单小程序名称") private String orderMiniProgramName; + @ApiModelProperty("加盟模式") + private String joinMode; + @ApiModelProperty("门店类型") + private String storeType; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index 81ee792d2..5c551f0c2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -100,6 +100,14 @@ public class StoreServiceImpl implements StoreService { case ONLINE_ORDER_NAME: dto.setOrderMiniProgramName(entry.getValue()); break; + case TEST_JOIN_MODE: + case ONLINE_JOIN_MODE: + dto.setJoinMode(entry.getValue()); + break; + case TEST_STORE_TYPE: + case ONLINE_STORE_TYPE: + dto.setStoreType(entry.getValue()); + break; } } } From 1c8c5085d5f176a58c2f559468f9a738fae1ac63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 6 Jun 2025 10:55:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E9=97=A8=E5=BA=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/enums/ExtendFieldTypeEnum.java | 4 +++- .../src/main/java/com/cool/store/dto/StoreDTO.java | 2 ++ .../java/com/cool/store/service/impl/StoreServiceImpl.java | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java index d8efe12e4..73e3245ef 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ExtendFieldTypeEnum.java @@ -19,6 +19,7 @@ public enum ExtendFieldTypeEnum { TEST_ORDER_NAME("extend_field_1747103227333","订单小程序名称"), TEST_JOIN_MODE("extend_field_1749175173890","加盟模式"), TEST_STORE_TYPE("extend_field_1749175177455","门店类型"), + TEST_BRAND("extend_field_1749177175079","品牌"), ONLINE_STORE_MANAGER_MOBILE("extend_field_1746598536903","店长手机号"), ONLINE_SIGNATORY_NAME_1("extend_field_1746598562255","签约人1名称"), ONLINE_SIGNATORY_MOBILE_1("extend_field_1746598570479","签约人2手机号"), @@ -26,7 +27,8 @@ public enum ExtendFieldTypeEnum { ONLINE_SIGNATORY_MOBILE_2("extend_field_1746598594140","签约人2手机号"), ONLINE_ORDER_NAME("extend_field_1746599049206","订单小程序名称"), ONLINE_JOIN_MODE("extend_field_1748315801670","加盟模式"), - ONLINE_STORE_TYPE("extend_field_1748315809671","门店类型"),; + ONLINE_STORE_TYPE("extend_field_1748315809671","门店类型"), + ONLINE_BRAND("extend_field_1749176993442","品牌"),; private String key; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java index 09a5cc5ad..876ac8795 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java @@ -31,5 +31,7 @@ public class StoreDTO { private String joinMode; @ApiModelProperty("门店类型") private String storeType; + @ApiModelProperty("品牌") + private String brand; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index 5c551f0c2..e9af16bac 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -108,6 +108,10 @@ public class StoreServiceImpl implements StoreService { case ONLINE_STORE_TYPE: dto.setStoreType(entry.getValue()); break; + case TEST_BRAND: + case ONLINE_BRAND: + dto.setBrand(entry.getValue()); + break; } } }