From 795f8efee7b05d4a4b300a367827c0a40e5b0e48 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 20 May 2025 14:11:22 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=9D=A3?= =?UTF-8?q?=E5=AF=BC=E4=BB=A3=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/UserRoleEnum.java | 2 + .../cool/store/entity/LicenseTransactDO.java | 6 +++ .../license/BusinessLicenseRequest.java | 13 +++++ .../store/response/SubmitLicenseResponse.java | 11 ++++ .../com/cool/store/service/DeskService.java | 9 ++++ .../store/service/impl/DeskServiceImpl.java | 51 ++++++++++++++----- .../store/controller/webb/DeskController.java | 16 ++++++ .../webb/PCApplyLicenseController.java | 28 ++++++++-- 8 files changed, 118 insertions(+), 18 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index 636f95d8c..c0765650c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -64,6 +64,8 @@ public enum UserRoleEnum { OWN_SHOP_OFFICE(480000000L,"自有店财务"), BRAND_HEAD(490000000L,"品牌负责人"), + + QW_SUPERVISION(1725431698852L,"企微督导"), ; private Long code; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java index 1fd843c04..fc98bbd11 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java @@ -87,4 +87,10 @@ public class LicenseTransactDO { private Integer syncFlag; @Column(name = "legal_is_same_partner") private Boolean legalIsSamePartner; + @Column(name = "single_shop") + private Boolean singleShop; + @Column(name = "commitment_url") + private String commitmentUrl; + @Column(name = "food_shop_list_url") + private String foodShopListUrl; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java index 9bc88eda4..9b893cfc8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java @@ -75,6 +75,16 @@ public class BusinessLicenseRequest { //@NotBlank(message = "法人手机号不能为空") private String licenseLegalMobile; + @ApiModelProperty("是否单店使用") + @NotNull(message = "是否单店使用不能为空") + private Boolean singleShop; + + @ApiModelProperty("美食城承诺书") + private String commitmentUrl; + + @ApiModelProperty("美食城档口列表") + private String foodShopListUrl; + public LicenseTransactDO toLicenseTransactDO(LicenseTransactDO licenseTransactDO) { if (Objects.isNull(licenseTransactDO)){ licenseTransactDO = new LicenseTransactDO(); @@ -99,6 +109,9 @@ public class BusinessLicenseRequest { }else if (this.validityType == 1){ licenseTransactDO.setValidity(this.validity); } + licenseTransactDO.setSingleShop(this.singleShop); + licenseTransactDO.setCommitmentUrl(this.commitmentUrl); + licenseTransactDO.setFoodShopListUrl(this.foodShopListUrl); return licenseTransactDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index ccd4957a5..6076f66f7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; import java.util.Objects; @@ -122,7 +123,14 @@ public class SubmitLicenseResponse { private StoreDocument storeDocument; @ApiModelProperty("二证合一标识；0否 1 是") private Integer twoCertificatesOne; + @ApiModelProperty("是否单店使用") + private Boolean singleShop; + @ApiModelProperty("美食城承诺书") + private String commitmentUrl; + + @ApiModelProperty("美食城档口列表") + private String foodShopListUrl; @Data public static class StoreDocument { @ApiModelProperty("营业执照拍照上传") @@ -227,6 +235,9 @@ public class SubmitLicenseResponse { return new SubmitLicenseResponse(); } SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse(); + submitLicenseResponse.setSingleShop(licenseTransactDO.getSingleShop()); + submitLicenseResponse.setCommitmentUrl(licenseTransactDO.getCommitmentUrl()); + submitLicenseResponse.setFoodShopListUrl(licenseTransactDO.getFoodShopListUrl()); submitLicenseResponse.setLegalIsSamePartner(licenseTransactDO.getLegalIsSamePartner()); submitLicenseResponse.setLicenseLegalIdCardNo(licenseTransactDO.getLicenseLegalIdCardNo()); submitLicenseResponse.setLicenseLegalIdCardFront(licenseTransactDO.getLicenseLegalIdCardFront()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java index 36056f7d1..54858d82c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java @@ -186,4 +186,13 @@ public interface DeskService { */ PageInfo measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user); + /** + * 营业执照 + */ + PageInfo businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user); + + /** + * 食品安全许可证 + */ + PageInfo foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 40f4f2904..94a472cc3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -53,7 +53,7 @@ import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS; public class DeskServiceImpl implements DeskService { @Resource - private SignFranchiseDAO signFranchiseDAO; + private SignFranchiseDAO signFranchiseDAO; @Resource DecorationMeasureDAO decorationMeasureDAO; @Resource @@ -241,15 +241,21 @@ public class DeskServiceImpl implements DeskService { PageInfo pageInfo = new PageInfo<>(); List subStageStatusList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(userRoleIds)) { - if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { - subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); - } - if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { - subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()); - } - if (!subStageStatusList.isEmpty()) { + //督导代填 + if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - subStageStatusList, Boolean.TRUE); + Collections.singletonList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus()), Boolean.FALSE); + } else { + if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { + subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); + } + if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { + subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()); + } + if (!subStageStatusList.isEmpty()) { + pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, + subStageStatusList, Boolean.TRUE); + } } } List list = pageInfo.getList(); @@ -421,7 +427,7 @@ public class DeskServiceImpl implements DeskService { List lineInfoDOS = lineInfoDAO.getByLineIds(lineIds); Map lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line)); List signType = signFranchiseDAO.getSignType(shopIds); - Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); Set regionIdSet = list.stream().map(PreparationCommonPendingVO::getRegionId).collect(Collectors.toSet()); Map regionNameMap = regionService.getBelongWarRegionNameMap(new ArrayList<>(regionIdSet)); @@ -434,7 +440,7 @@ public class DeskServiceImpl implements DeskService { if (lineInfoDO == null) { continue; } - SignFranchiseDO signFranchiseDO = signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(),new SignFranchiseDO()); + SignFranchiseDO signFranchiseDO = signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(), new SignFranchiseDO()); preparationCommonPendingVO.setSignType(signFranchiseDO.getSignType()); preparationCommonPendingVO.setPartnerName(lineInfoDO.getUsername()); preparationCommonPendingVO.setPartnerPhone(lineInfoDO.getMobile()); @@ -558,6 +564,10 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); + if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()), Boolean.FALSE ); + } List subStageStatusList = new ArrayList<>(); if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); @@ -610,7 +620,7 @@ public class DeskServiceImpl implements DeskService { List lineInfoDOS = lineInfoDAO.getByLineIds(lineIds); Map lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line)); List signType = signFranchiseDAO.getSignType(shopIds); - Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); Set regionIdSet = list.stream().map(PreparationCommonPendingVO::getRegionId).collect(Collectors.toSet()); Map regionNameMap = regionService.getBelongWarRegionNameMap(new ArrayList<>(regionIdSet)); @@ -635,6 +645,18 @@ public class DeskServiceImpl implements DeskService { return new PageInfo<>(); } + @Override + public PageInfo businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_3, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE ); + } + + @Override + public PageInfo foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_4, + Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE ); + } + /** * 通用查询 * @@ -663,7 +685,7 @@ public class DeskServiceImpl implements DeskService { List lines = lineInfoDAO.getLines(lineIds); List signType = signFranchiseDAO.getSignType(shopIds); - Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); //将shopInfoList 转为map Map shopInfoMap = shopInfoList.stream().collect(Collectors.toMap(ShopInfoDO::getId, shop -> shop)); //将lines 转为map @@ -709,6 +731,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setPartnerPhone(planLineDTO.getMobile()); preparationCommonPendingVO.setShopManagerUserName(userNameMap.getOrDefault(shopInfoDO.getShopManagerUserId(), "")); preparationCommonPendingVO.setRegionNodeName(regionNameMap.getOrDefault(shopInfoDO.getRegionId(), "")); + preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, x.getUpdateTime())); list.add(preparationCommonPendingVO); }); result.setList(list); @@ -758,7 +781,7 @@ public class DeskServiceImpl implements DeskService { Map lineMap = lines.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, line -> line)); List signType = signFranchiseDAO.getSignType(shopIds); - Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); List regionIds = shopInfoList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java index 9cc187441..14ba249b0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java @@ -212,4 +212,20 @@ public class DeskController { LoginUserInfo userInfo = CurrentUserHolder.getUser(); return ResponseResult.success(deskService.measurePendingList(pageNumber,pageSize,userInfo)); } + + @ApiOperation("待处理-营业执照") + @GetMapping("/businessLicensePendingList") + public ResponseResult> businessLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { + LoginUserInfo userInfo = CurrentUserHolder.getUser(); + return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo)); + } + + @ApiOperation("待处理-食品许可证") + @GetMapping("/foodLicensePendingList") + public ResponseResult> foodLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) { + LoginUserInfo userInfo = CurrentUserHolder.getUser(); + return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo)); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java index c93096661..cbff7ea89 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java @@ -2,19 +2,21 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.request.LicenseListRequest; +import com.cool.store.request.license.BusinessLicenseRequest; +import com.cool.store.request.license.FoodLicenseRequest; import com.cool.store.response.LicenseListResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.service.ApplyLicenseService; +import com.cool.store.vo.PartnerUserInfoVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -60,4 +62,22 @@ public class PCApplyLicenseController { LoginUserInfo user = CurrentUserHolder.getUser(); return ResponseResult.success(applyLicenseService.licenseExamine(shopId, status, result, user)); } + + + @ApiOperation("证照办理提交-营业执照") + @PostMapping("/submitBusinessLicense") + public ResponseResult submitBusinessLicense(@RequestBody @Validated BusinessLicenseRequest request) { + PartnerUserInfoVO user = PartnerUserHolder.getUser(); + return ResponseResult.success(applyLicenseService.submitBusinessLicense(request,user)); + } + + + @ApiOperation("证照办理提交-食品许可证") + @PostMapping("/submitFoodLicense") + public ResponseResult submitFoodLicense(@RequestBody FoodLicenseRequest request) { + PartnerUserInfoVO user = PartnerUserHolder.getUser(); + return ResponseResult.success(applyLicenseService.submitFoodLicense(request,user)); + } + + } From 198a0319c88b54472e940f00fdb8be6452a26f7f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 20 May 2025 14:36:37 +0800 Subject: [PATCH 02/12] =?UTF-8?q?pc=20=E7=BC=B4=E7=BA=B3=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E8=B4=B9=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=BB=BA=E5=BA=97=E8=B5=84?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/DeskServiceImpl.java | 2 +- .../webb/PCBuildInformationController.java | 19 +++++++++++++++---- .../controller/webb/PCLinePayController.java | 8 ++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 94a472cc3..b229b4cca 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -244,7 +244,7 @@ public class DeskServiceImpl implements DeskService { //督导代填 if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus()), Boolean.FALSE); + Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_74.getShopSubStageStatus()), Boolean.FALSE); } else { if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java index 49428e962..777547942 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java @@ -1,14 +1,13 @@ package com.cool.store.controller.webb; +import com.cool.store.request.BuildInformationRequest; import com.cool.store.response.BuildInformationResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.BuildInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,4 +30,16 @@ public class PCBuildInformationController { return ResponseResult.success(buildInformationService.getBuildInformation(shopId)); } + @ApiOperation("提交/修改") + @PostMapping("/submitOrUpdate") + public ResponseResult submitBuildInformation(@RequestBody @Validated BuildInformationRequest request) { + return ResponseResult.success(buildInformationService.submitOrUpdate(request)); + } + + @ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟") + @GetMapping("/getJoinType") + public ResponseResult getJoinType(@RequestParam(value = "lineId", required = true) Long lineId) { + return ResponseResult.success(buildInformationService.getJoinType(lineId)); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java index cde4700ef..4b4273c43 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java @@ -44,4 +44,12 @@ public class PCLinePayController { return ResponseResult.success(linePayService.getAmount(lineId)); } + @ApiOperation("缴纳意向金/加盟费") + @PostMapping("/submitPayInfo") + public ResponseResult submitPayInfo(@RequestBody LinePaySubmitRequest request){ + PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser(); + return ResponseResult.success(linePayService.submitPayInfo(request, partnerUser)); + } + + } From f1b256205e74eab2b18b5ca0a5f283bfd46911b9 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 21 May 2025 19:36:44 +0800 Subject: [PATCH 03/12] fix --- .../src/main/resources/mapper/ApplyLicenseMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index fb0e7fc21..85a96d6c3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -37,7 +37,10 @@ update_time, deleted, two_certificates_one, - legal_is_same_partner + legal_is_same_partner, + single_shop, + commitment_url, + food_shop_list_url update xfsg_license_transact From 6310372d2a3077cfc8c9eca2467f70159a331dea Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 22 May 2025 16:03:22 +0800 Subject: [PATCH 04/12] =?UTF-8?q?pc=20ocr=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/webb/PCOcrController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java index 2dc03e278..e20c21ae5 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java @@ -1,8 +1,12 @@ package com.cool.store.controller.webb; import com.cool.store.dto.ocr.InvoiceDTO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; import com.cool.store.response.ResponseResult; import com.cool.store.service.AliyunService; +import com.cool.store.vo.BusinessLicenseInfoVO; +import com.cool.store.vo.FoodLicenseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -34,6 +38,27 @@ public class PCOcrController { return ResponseResult.success(aliyunService.getRecognizeInvoiceWithOptions(imageUrl)); } + @GetMapping(path = "/getBusinessLicenseInfo") + @ApiOperation("根据营业证照解析获取数据") + public ResponseResult getBusinessLicenseInfo(@RequestParam(value = "imageUrl")String imageUrl){ + try { + BusinessLicenseInfoVO businessLicenseInfo = aliyunService.getBusinessLicenseInfo(imageUrl); + return ResponseResult.success(businessLicenseInfo); + } catch (Exception e) { + throw new ServiceException(ErrorCodeEnum.BUSINESS_LICENSE_PARSE_FAIL); + } + } + + @GetMapping(path = "/getFoodBusinessLicense") + @ApiOperation("根据食营证照解析获取数据") + public ResponseResult getFoodLicense(@RequestParam(value = "imageUrl")String imageUrl){ + try { + FoodLicenseVO businessLicenseInfo = aliyunService.getFoodLicense(imageUrl); + return ResponseResult.success(businessLicenseInfo); + } catch (Exception e) { + throw new ServiceException(ErrorCodeEnum.FOOD_BUSINESS_LICENSE_PARSE_FAIL); + } + } } From ed1b79beb2cea1f9ead3a53ab9376a70539651b5 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 22 May 2025 16:07:47 +0800 Subject: [PATCH 05/12] =?UTF-8?q?pc=20ocr=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/controller/webb/PCOcrController.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java index e20c21ae5..60a62ed29 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java @@ -2,11 +2,13 @@ package com.cool.store.controller.webb; import com.cool.store.dto.ocr.InvoiceDTO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ServiceException; import com.cool.store.response.ResponseResult; import com.cool.store.service.AliyunService; import com.cool.store.vo.BusinessLicenseInfoVO; import com.cool.store.vo.FoodLicenseVO; +import com.cool.store.vo.IdentityCardInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -59,6 +61,16 @@ public class PCOcrController { throw new ServiceException(ErrorCodeEnum.FOOD_BUSINESS_LICENSE_PARSE_FAIL); } } - + @GetMapping(path = "/getIdentityCardInfo") + @ApiOperation("根据身份证正面解析获取数据") + public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl, + @RequestParam("side") IDCardSideEnum sideEnum){ + try { + IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, sideEnum); + return ResponseResult.success(identityCardInfo); + } catch (Exception e) { + throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL); + } + } } From 0501edfbefef08dd96f1be030fd467e54a8101b4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 23 May 2025 10:29:03 +0800 Subject: [PATCH 06/12] fix --- .../main/java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 7532ba8fe..6953140a5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -437,7 +437,7 @@ public class DeskServiceImpl implements DeskService { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, - Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()), Boolean.FALSE ); + Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE ); } //如果不是财务角色或者即是财务又是自有店财务 则不需要标识 Boolean ownShopFlag = null; From c5e2477f551c3932f8038b14941ee05679223023 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 23 May 2025 14:44:13 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=20add=20pc=20=E8=8E=B7=E5=8F=96=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=89=80=E5=B1=9E=E5=93=81=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/controller/webb/PCShopController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java index ea83ebc23..66f2a6b54 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java @@ -152,4 +152,10 @@ public class PCShopController { @RequestParam("subStage")Integer subStage) { return ResponseResult.success(shopService.getSubStageHandle(shopId,subStage)); } + + @ApiOperation("获取店铺所属品牌") + @GetMapping("/getFranchiseBrandName") + public ResponseResult getFranchiseBrandName(@RequestParam(name = "shopId")Long shopId) { + return ResponseResult.success(shopService.getFranchiseBrandName(shopId)); + } } From 7565e74feca0c33747bd75635eaa47c29df3ffa2 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 23 May 2025 21:31:40 +0800 Subject: [PATCH 08/12] =?UTF-8?q?PC=E9=93=B6=E8=A1=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/webb/PCBankController.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBankController.java diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBankController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBankController.java new file mode 100644 index 000000000..751616567 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBankController.java @@ -0,0 +1,51 @@ +package com.cool.store.controller.webb; + +import com.cool.store.entity.BankdocDO; +import com.cool.store.entity.BanktypeDO; +import com.cool.store.request.BankRequest; +import com.cool.store.request.BranchBankPageRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.BankService; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author Fun Li 2023/8/10 14:20 + * @version 1.0 + */ +@RestController +@RequestMapping("/pc/bank") +@Api(tags = "PC银行信息") +@Slf4j +public class PCBankController { + + @Autowired + private BankService bankService; + + @ApiOperation("银行类型") + @GetMapping("/listBank") + public ResponseResult> listBank() { + List result = bankService.listBank(); + return ResponseResult.success(result); + } + + @ApiOperation("添加银行") + @PostMapping("/addBank") + public ResponseResult listBank(@RequestBody(required = true) BankRequest bankRequest) { + return ResponseResult.success( bankService.addBank(bankRequest.getName())); + } + + @ApiOperation("支行列表查询") + @PostMapping("/listBranchBank") + public ResponseResult> listBranchBank(@RequestBody @Validated BranchBankPageRequest request) { + return ResponseResult.success(bankService.listBranchBank(request)); + } + +} \ No newline at end of file From 7f49647443376faa64c986734343655d0dd39e1a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 26 May 2025 10:14:54 +0800 Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=A3=85?= =?UTF-8?q?=E4=BF=AE/=E5=A4=96=E5=8D=96=E5=9B=A2=E8=B4=AD=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=BC=80=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/PlatformBuildRequest.java | 4 ++++ .../java/com/cool/store/request/ThreeAcceptanceRequest.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java index c2410f283..03fd8921a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java @@ -81,6 +81,10 @@ public class PlatformBuildRequest { @Length(max = 250, message = "快手平台账号 长度不能超过250") private String ksAccount; + @ApiModelProperty("抖音核销手机号") + private String dyMobile; + + public PlatformBuildDO toDO() { PlatformBuildDO platformBuildDO = new PlatformBuildDO(); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java index b9d735f30..add95a388 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java @@ -38,7 +38,7 @@ public class ThreeAcceptanceRequest { private String shopInteriorPhoto; public Boolean miniCheck(){ - if (StringUtils.isAnyBlank(this.ksAccount,this.verificationPhone,this.shopLocationScreenshots)){ + if (StringUtils.isAnyBlank(this.shopLocationScreenshots)){ return false; } return true; From b3cb8178ff61c741a482ea3e80638e836730f1e9 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 26 May 2025 10:58:36 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PlatformBuildMapper.xml | 3 ++- .../main/java/com/cool/store/entity/PlatformBuildDO.java | 6 ++++++ .../java/com/cool/store/request/PlatformBuildRequest.java | 1 + .../java/com/cool/store/response/PlatformBuildResponse.java | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml index 5e7584791..2db7e0125 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml @@ -30,6 +30,7 @@ + @@ -40,6 +41,6 @@ settler_bank_name, account,store_positioning_url,authorization_url, create_time,update_time,create_user, - update_user,poi,store_id + update_user,poi,store_id,dy_mobile diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java index 910726fe4..055779ecc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java @@ -158,4 +158,10 @@ public class PlatformBuildDO { @Column(name = "store_id") private String storeId; + /** + * 抖音核销手机号 + */ + @Column(name = "dy_mobile") + private String dyMobile; + } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java index 03fd8921a..f7378a959 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java @@ -103,6 +103,7 @@ public class PlatformBuildRequest { platformBuildDO.setStorePositioningUrl(this.storePositioningUrl); platformBuildDO.setAuthorizationUrl(this.authorizationUrl); platformBuildDO.setKsAccount(this.ksAccount); + platformBuildDO.setDyMobile(this.dyMobile); return platformBuildDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java index 8be6e03f4..bff0b319a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java @@ -100,6 +100,8 @@ public class PlatformBuildResponse { private String shopProvinceCityDistrict; @ApiModelProperty("门店详细地址") private String shopAddress; + @ApiModelProperty("抖音核销手机号") + private String dyMobile; } From 0d64beab84d4e1178861185e37cff0ac6f065be2 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 26 May 2025 13:41:05 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/request/ZxjpApiRequest.java | 2 +- .../service/impl/SyncDataServiceImpl.java | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index aa0c7961a..a509802f0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -126,7 +126,7 @@ public class ZxjpApiRequest { @ApiModelProperty(value = "门店详细地址") private String shopAddress; - @ApiModelProperty(value = "核销手机号") + @ApiModelProperty(value = "抖音核销手机号") private String verificationMobile; @ApiModelProperty(value = "快手号") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 95ef1183c..b7ae47254 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -9,6 +9,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.DownSystemTypeEnum; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.FranchiseBrandEnum; +import com.cool.store.enums.PlatformBuildEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.ApplyLicenseMapper; import com.cool.store.mapper.SignFranchiseMapper; @@ -64,6 +65,8 @@ public class SyncDataServiceImpl implements SyncDataService { private PointInfoDAO pointInfoDAO; @Resource private EnterpriseUserDAO enterpriseUserDAO; + @Resource + private PlatformBuildDAO platformBuildDAO; @Override public ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType) { @@ -99,6 +102,10 @@ public class SyncDataServiceImpl implements SyncDataService { String investmentManager = enterpriseUserDAO.getUserName(shopInfo.getInvestmentManager()); QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId); + //抖音 + PlatformBuildDO dyPlatformBuildDO = platformBuildDAO.selectOneByShopId(shopId, PlatformBuildEnum.DOU_YIN.getCode()); + //快手 + PlatformBuildDO ksPlatformBuildDO = platformBuildDAO.selectOneByShopId(shopId, PlatformBuildEnum.KUAI_SHOU.getCode()); request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo()); request.setShopAddress(shopInfo.getDetailAddress()); @@ -154,7 +161,8 @@ public class SyncDataServiceImpl implements SyncDataService { request.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); } request.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType()); - request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference>() {})); + request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference>() { + })); request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName()); request.setReceivingMSBankAccount(orderSysInfoDO.getReceivingMsBankAccount()); request.setReceivingMSBankBranch(orderSysInfoDO.getReceivingMsBankBranch()); @@ -167,8 +175,12 @@ public class SyncDataServiceImpl implements SyncDataService { request.setShopInteriorPhoto(getUrlList(acceptanceInfoDO.getShopInteriorPhoto())); request.setShopLocationScreenshots(getUrl(acceptanceInfoDO.getShopLocationScreenshots())); - request.setVerificationMobile(acceptanceInfoDO.getVerificationMobile()); - request.setKsAccount(acceptanceInfoDO.getKsAccount()); + } + if (dyPlatformBuildDO != null) { + request.setVerificationMobile(dyPlatformBuildDO.getDyMobile()); + } + if (ksPlatformBuildDO != null) { + request.setKsAccount(ksPlatformBuildDO.getKsAccount()); } if (buildInformationDO != null) { request.setBusinessHours(buildInformationDO.getBusinessHours()); @@ -219,7 +231,7 @@ public class SyncDataServiceImpl implements SyncDataService { request.setShopProvince(pointInfo.getProvince()); request.setShopCity(pointInfo.getCity()); } - log.info("/pushData 数据 ：{}",JSONObject.toJSONString(request)); + log.info("/pushData 数据 ：{}", JSONObject.toJSONString(request)); return request; } From e2a1076b449a4fbc3f4dae0b9474b8ba6d60e354 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 27 May 2025 10:05:43 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E8=AE=BE=E7=BD=AEai=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/RedisConstant.java | 2 ++ .../cool/store/utils/RedisConstantUtil.java | 3 +++ .../com/cool/store/service/LineService.java | 8 ++++++ .../store/service/impl/LineServiceImpl.java | 27 +++++++++++++++++++ .../controller/webb/LineInfoController.java | 11 ++++++++ .../store/controller/webc/LineController.java | 12 +++++++++ 6 files changed, 63 insertions(+) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index a6949233d..f4990713b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -279,4 +279,6 @@ public class RedisConstant { public static final String YUN_XUE_TANG_ACCESS_TOKEN = "yun_xue_tang_access_token_"; public static final String SUBMIT_BUILD_KEY = "submit_build_key_"; + + public static final String GET_AI_MODULE = "get_ai_module_"; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java index 3136ff26d..53d63a32f 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java @@ -109,5 +109,8 @@ public class RedisConstantUtil { public String submitBuildKey(Long shopId){ return active + "_" + RedisConstant.SUBMIT_BUILD_KEY + eid + ":" + shopId ; } + public String getAiModuleKey(){ + return active + "_" + RedisConstant.GET_AI_MODULE + eid; + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index fae328b1a..9c0a041b1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -112,4 +112,12 @@ public interface LineService { Integer updateRegionId(Long regionId,Long lineId); Boolean hasRegionId(Long lineId); + /** + * @Auther: wangshuo + * @Date: 2025/5/27 + * @description:小程序ai模块是否展示 + */ + Boolean getAiModule(); + + Boolean setAiModule(Boolean flag); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index a6b174b4d..2db3f5441 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -3,6 +3,7 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; +import com.cool.store.constants.RedisConstant; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.entity.*; @@ -13,6 +14,8 @@ import com.cool.store.mapper.IntentAgreementMapper; import com.cool.store.mapper.JoinIntentionMapper; import com.cool.store.request.*; import com.cool.store.service.*; +import com.cool.store.utils.RedisConstantUtil; +import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import com.cool.store.utils.UUIDUtils; import com.cool.store.utils.poi.DateUtils; @@ -22,9 +25,11 @@ import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.MessageFormat; import java.util.*; import java.util.stream.Collectors; @@ -37,6 +42,10 @@ import java.util.stream.Collectors; @Service public class LineServiceImpl implements LineService { + @Autowired + private RedisUtilPool redisUtilPool; + @Autowired + private RedisConstantUtil redisConstantUtil; @Resource ShopInfoDAO shopInfoDAO; @Resource @@ -666,6 +675,24 @@ public class LineServiceImpl implements LineService { return false; } + @Override + public Boolean getAiModule() { + String key =redisConstantUtil.getAiModuleKey(); + String value = redisUtilPool.getString(key); + if (StringUtils.isEmpty(value)){ + return true; + }else { + return Boolean.valueOf(value); + } + } + + @Override + public Boolean setAiModule(Boolean flag) { + String key =redisConstantUtil.getAiModuleKey(); + redisUtilPool.setString(key,flag.toString()); + return true; + } + /** * 计算预期时间 * @param startTime diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index 7d1be5d0a..1d481f408 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -190,5 +190,16 @@ public class LineInfoController { public ResponseResult hasLineRegion(@RequestParam("lineId")Long lineId) { return ResponseResult.success(lineService.hasRegionId(lineId)); } + @ApiOperation("获取ai模块是否展示，true展示false不展示") + @GetMapping("/getAiModule") + public ResponseResult getAiModule() { + return ResponseResult.success(lineService.getAiModule()); + } + + @ApiOperation("设置ai模块是否展示，true展示false不展示") + @GetMapping("/setAiModule") + public ResponseResult setAiModule(@RequestParam("flag") Boolean flag) { + return ResponseResult.success(lineService.setAiModule(flag)); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java index 9a111703b..699074385 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java @@ -80,6 +80,18 @@ public class LineController { public ResponseResult> getAllUser(@RequestBody GetUserDTO dto) { return ResponseResult.success(userAuthMappingService.getAllUser(dto.getKeyword(),dto.getPageNum(),dto.getPageSize())); } + @ApiOperation("获取ai模块是否展示，true展示false不展示") + @GetMapping("/getAiModule") + public ResponseResult getAiModule() { + return ResponseResult.success(lineService.getAiModule()); + } + + @ApiOperation("设置ai模块是否展示，true展示false不展示") + @GetMapping("/setAiModule") + public ResponseResult setAiModule(@RequestParam("flag") Boolean flag) { + return ResponseResult.success(lineService.setAiModule(flag)); + } + }