From 70b7c5fd3bdb8c2d2a3dd17d9ca419d951228132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 19 Dec 2023 16:59:54 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=85=A5=E5=8F=82=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/controller/ExhibitionController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java index 064596b93..5c111feb8 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -45,12 +45,12 @@ public class ExhibitionController { @GetMapping(value = "/getMyExhibitionList") @ApiOperation("我的会销") - public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedTye") String closedTye, + public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedType") String closedType, @RequestParam(required = false,value = "startDate") String startDate, @RequestParam(required = false,value = "pageNum") Integer pageNum, @RequestParam(required = false,value = "pageSize") Integer pageSize) { LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedTye,startDate,pageSize,pageNum)); + return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedType,startDate,pageSize,pageNum)); } @GetMapping(value = "/getMyExhibitionGroupList") From 8e0e41672daeae71da340f29e97c74688401677f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 19 Dec 2023 19:28:54 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/controller/ExhibitionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java index 5c111feb8..53cc773b7 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -50,7 +50,7 @@ public class ExhibitionController { @RequestParam(required = false,value = "pageNum") Integer pageNum, @RequestParam(required = false,value = "pageSize") Integer pageSize) { LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedType,startDate,pageSize,pageNum)); + return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),startDate ,closedType,pageSize,pageNum)); } @GetMapping(value = "/getMyExhibitionGroupList") From e109a752bac69df010f7d485f2235455cc166618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 13:38:25 +0800 Subject: [PATCH 03/11] =?UTF-8?q?startDate=20=E6=A0=BC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/constants/CommonConstants.java | 1 + .../src/main/resources/mapper/HyExhibitionMapper.xml | 2 ++ .../java/com/cool/store/dto/exhibition/ExhibitionDTO.java | 4 ++++ .../java/com/cool/store/vo/exhibition/ExhibitionVO.java | 4 ++++ .../service/impl/exhibition/ExhibitionServiceImpl.java | 6 ++++-- .../src/main/resources/bootstrap-pre.properties | 8 ++++++-- .../src/main/resources/bootstrap.properties | 2 +- 7 files changed, 22 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 70e93c0cd..4ea75bed9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -68,6 +68,7 @@ public class CommonConstants { public static final String SQUAREBRACKETSRIGHT = "]"; public static final String PATH_SPILT = "/"; + public static final String PATH_BAR = "-"; public static final String ROOT_REGION_PATH = "/1/"; /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index aff427604..fda49919d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -322,6 +322,8 @@ start_date as startDate, close_time as closeTime, location as location, + closed_type as closedType, + creator as creator, exhibition_name as exhibitionName, collaborators as collaboratorStr from hy_exhibition diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java index e328c2af1..cf7d6abfd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java @@ -27,6 +27,10 @@ public class ExhibitionDTO { private String collaboratorStr; + private String creator; + + private Integer closedType; + private List collaborators; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java index dd10ac5b5..eb16c07e1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java @@ -18,6 +18,10 @@ public class ExhibitionVO { private String startDate; + private Integer closedType; + + private String createId; + private Integer id; private List collaborators; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index e62bb5c50..3c0073c32 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -330,7 +330,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { list.forEach(exhibitionDTO->{ ExhibitionVO exhibitionVO = new ExhibitionVO(); exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); - exhibitionVO.setStartDate(exhibitionDTO.getStartDate()); + exhibitionVO.setCreateId(exhibitionDTO.getCreator()); + exhibitionVO.setClosedType(exhibitionDTO.getClosedType()); + exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); exhibitionVO.setId(exhibitionDTO.getId()); exhibitionVOS.add(exhibitionVO); }); @@ -368,7 +370,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { exhibitionDTOS.forEach(exhibitionDTO->{ ExhibitionVO exhibitionVO = new ExhibitionVO(); exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); - exhibitionVO.setStartDate(exhibitionDTO.getStartDate()); + exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); exhibitionVO.setLocation(exhibitionDTO.getLocation()); exhibitionVO.setId(exhibitionDTO.getId()); //需要加载协作人才加载 不需要的时候 不加载 diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties index a17d74480..4b73f0cb0 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties @@ -1,4 +1,8 @@ -spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.server-addr=120.92.151.10:8848 spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index e8cb5a145..fd6fa0390 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=dev +spring.profiles.active=pre server.port=31000 server.servlet.context-path=/partner/pc From 64d8f1920f5cb437ea658b1fe56db96e1f528c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 13:42:41 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-pre.properties | 8 ++------ .../src/main/resources/bootstrap-pre.properties | 8 ++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties index 4b73f0cb0..a17d74480 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties @@ -1,8 +1,4 @@ -#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 -#spring.cloud.nacos.config.file-extension=properties -#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 -spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 -spring.cloud.nacos.config.server-addr=120.92.151.10:8848 +spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +spring.cloud.nacos.config.server-addr=10.0.0.192:8848 spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties index a17d74480..4b73f0cb0 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties @@ -1,4 +1,8 @@ -spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.server-addr=120.92.151.10:8848 spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file From 3f62edd24800c8f9d50167e2f1f19dbe14437d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 13:43:37 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap-pre.properties | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index fd6fa0390..8d49f76e5 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=pre +spring.profiles.active=de server.port=31000 server.servlet.context-path=/partner/pc diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties index 4b73f0cb0..cf1ca14d3 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties @@ -1,8 +1,4 @@ #spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 #spring.cloud.nacos.config.server-addr=10.0.0.192:8848 #spring.cloud.nacos.config.file-extension=properties -#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 -spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 -spring.cloud.nacos.config.server-addr=120.92.151.10:8848 -spring.cloud.nacos.config.file-extension=properties -spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file From 118678c7ef1c9eec12d11985e89010d5909be953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 13:43:59 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-pre.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties index cf1ca14d3..a17d74480 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties @@ -1,4 +1,4 @@ -#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 -#spring.cloud.nacos.config.file-extension=properties -#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file +spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +spring.cloud.nacos.config.file-extension=properties +spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file From 497bf63c3d59996d8ad56d7e126aad621f0ad4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 13:49:43 +0800 Subject: [PATCH 07/11] 1 --- coolstore-partner-webb/src/main/resources/bootstrap.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index 8d49f76e5..e8cb5a145 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=de +spring.profiles.active=dev server.port=31000 server.servlet.context-path=/partner/pc From 80a9f5bfc5a666253539ce77753099e1403cd426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 14:06:36 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BC=9A=E9=94=80?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/exhibition/ExhibitionServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index 3c0073c32..b5e125e18 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -280,7 +280,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { myExhibitionVO.setLocation(x.getLocation()); myExhibitionVO.setId(x.getId()); myExhibitionVO.setClosedType(x.getClosedType()); - myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),DateUtils.DATE_FORMAT_10)); + myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2)); if (StringUtils.isNotEmpty(x.getCollaborators())){ List userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA)); List coll = new ArrayList<>(); @@ -372,6 +372,8 @@ public class ExhibitionServiceImpl implements ExhibitionService { exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); exhibitionVO.setLocation(exhibitionDTO.getLocation()); + exhibitionVO.setClosedType(exhibitionDTO.getClosedType()); + exhibitionVO.setCreateId(exhibitionDTO.getCreator()); exhibitionVO.setId(exhibitionDTO.getId()); //需要加载协作人才加载 不需要的时候 不加载 if (includeCollaborators&&StringUtils.isNotEmpty(exhibitionDTO.getCollaboratorStr())){ From 8fd08a0ac4b684cdf1bfa9a4c0b35c4b1564a4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 20 Dec 2023 18:28:51 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=9A=E9=94=80=E6=9D=A5=E6=BA=90ID?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/exhibition/ExhibitionServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index b5e125e18..a96470f86 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,8 +86,8 @@ public class ExhibitionServiceImpl implements ExhibitionService { @Resource HyPartnerUserInfoDAO hyPartnerUserInfoDAO; -// @Value("${offline.exhibition.channel.id}") -// private Integer offlineExhibition; + @Value("${offline.exhibition.channel.id:null}") + private String offlineExhibition; @Override @Transactional @@ -533,7 +534,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { partnerId = UUIDUtils.get32UUID(); HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); resultUser.setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile()).setPartnerId(partnerId).setCreateTime(new Date()) - .setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(111111111); + .setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(Integer.valueOf(offlineExhibition)); hyPartnerUserInfoDAO.insertSelective(resultUser); } HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); From 148af56746d8cce6bcc74658f9696aa8e6594d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 21 Dec 2023 10:28:37 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=98=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java | 2 +- .../java/com/cool/store/vo/exhibition/ExhibitionLineVO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java index b57fe5209..4507e968e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java @@ -22,7 +22,7 @@ public class ExhibitionLineDTO { private Integer wantShopArea; - private Integer wantShopAreaName; + private String wantShopAreaName; private Integer participationStatus; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java index ad7662fbf..d3cd9a6b4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java @@ -22,7 +22,7 @@ public class ExhibitionLineVO { private Integer wantShopArea; - private Integer wantShopAreaName; + private String wantShopAreaName; private Integer participationStatus; From d8a2e6532d4067634ff67fe51f34292d7ac48f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 21 Dec 2023 16:25:53 +0800 Subject: [PATCH 11/11] =?UTF-8?q?sql=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerExhibitionMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index 0ef1287f3..ad319443a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -426,10 +426,10 @@ on hpe.partner_id = hpui.partner_id - hpui.username like concat("%", #{partnerName}, "%") + and hpui.username like concat("%", #{partnerName}, "%") - hpe.exhibition_id = #{id} + and hpe.exhibition_id = #{id}