From 65b5d0874727350a390462222ab55be2314869da Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 21 Apr 2025 10:58:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=BB=BA=E5=BA=97=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=EF=BC=8C=E6=88=BF=E4=B8=9C=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E9=9D=9E=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=AB=AF=E9=87=87=E9=9B=86=E9=93=BA=E4=BD=8D=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AE=A2=E6=88=B7name=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/AddPointDetailRequest.java | 2 +- .../store/service/impl/DeskServiceImpl.java | 32 ++++++++++++------- .../store/service/impl/PointServiceImpl.java | 22 +++++++++++-- 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java index 1d09a90ba..a2b843593 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java @@ -85,7 +85,7 @@ public class AddPointDetailRequest { private String landlordUsername; @ApiModelProperty("房东电话") - @NotBlank(message = "房东电话不能为空") + // @NotBlank(message = "房东电话不能为空") private String landlordMobile; @Min(1) 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 351040212..34362e259 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 @@ -414,9 +414,9 @@ public class DeskServiceImpl implements DeskService { if (CollectionUtils.isEmpty(list)) { return pageInfo; } - List shopIds = list.stream().filter(o-> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); + List shopIds = list.stream().filter(o -> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List shopIds1 = list.stream().filter(o-> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); + List shopIds1 = list.stream().filter(o -> Objects.equals(o.getSubStageStatus(), SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus())).map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); List subStageList = shopStageInfoDAO.getSubStages(shopIds1, ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); doThing(deskStageMap, subStageList); @@ -428,10 +428,11 @@ public class DeskServiceImpl implements DeskService { } for (PreparationCommonPendingVO vo : list) { if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()) && deskStageMap.get(vo.getShopId()) != null) { - if (deskStageMap.get(vo.getShopId()) != null){ - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());} + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { - vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()),SPECIAL_DATE_START)); + vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()), SPECIAL_DATE_START)); } } @@ -497,16 +498,23 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); - List subStageStatusList = new ArrayList<>(); - if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())){ + List subStageStatusList = new ArrayList<>(); + if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())); } - if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())){ - return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())); - + if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); + } + if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus()); } - return null; + if (userRoleIds.contains(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE.getCode()) ) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); + } + if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) { + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); + } + return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 632e35444..99aa6eab9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -121,7 +121,16 @@ public class PointServiceImpl implements PointService { request1.setCode(shopPointDetailRequest.getOpportunityPointCode()); request1.setUserId(userId); request1.setMobile(user.getMobile()); - request1.setUserName(user.getName()); + if (StringUtils.isBlank(user.getName())) { + if (StringUtils.isNotBlank(user.getMobile()) && user.getMobile().length() >= 4) { + // 获取后4位 + request1.setUserName("游客" + user.getMobile().substring(user.getMobile().length() - 4)); + } else { + request1.setUserName("游客"); + } + } else { + request1.setUserName(user.getName()); + } request1.setBerthId(Math.toIntExact(pointId)); request1.setName(pointInfo.getPointName()); request1.setAddress(pointInfo.getAddress()); @@ -964,7 +973,16 @@ public class PointServiceImpl implements PointService { request1.setCode(request.getOpportunityPointCode()); request1.setUserId(lineInfo.getPartnerId()); request1.setMobile(lineInfo.getMobile()); - request1.setUserName(lineInfo.getUsername()); + if (StringUtils.isBlank(lineInfo.getUsername())) { + if (StringUtils.isNotBlank(lineInfo.getMobile()) && lineInfo.getMobile().length() >= 4) { + // 获取后4位 + request1.setUserName("游客" + lineInfo.getMobile().substring(lineInfo.getMobile().length() - 4)); + } else { + request1.setUserName("游客"); + } + } else { + request1.setUserName(lineInfo.getUsername()); + } request1.setBerthId(Math.toIntExact(pointId)); request1.setName(pointInfo.getPointName()); request1.setAddress(pointInfo.getAddress()); From 4cf5471c61ae5abee3991162a3fa5b7735db1c55 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 21 Apr 2025 11:35:08 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=BB=BA=E5=BA=97=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=89=AF=E6=80=BB=E8=A3=81=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildInformationServiceImpl.java | 10 ++++++++-- .../com/cool/store/service/impl/DeskServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index ea66eab9b..66e2e1cb4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -35,6 +35,8 @@ import java.util.stream.Collectors; @Service public class BuildInformationServiceImpl implements BuildInformationService { + @Resource + private UserAuthMappingService userAuthMappingService; @Resource private BuildInformationDAO buildInformationDAO; @Autowired @@ -52,8 +54,6 @@ public class BuildInformationServiceImpl implements BuildInformationService { @Resource private CommonService commonService; @Autowired - private UserAuthMappingService userAuthMappingService; - @Autowired private OrderSysInfoDAO orderSysInfoDAO; @Resource private WarehouseInfoMapper warehouseInfoMapper; @@ -106,6 +106,12 @@ public class BuildInformationServiceImpl implements BuildInformationService { response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); } response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType()); + } + if (StringUtils.isBlank(response.getXgjVicePresident())){ + EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId()); + if (Objects.nonNull(user)){ + response.setXgjVicePresident(user.getName()); + } } if (Objects.nonNull(pointInfo)) { if (StringUtils.isBlank(response.getAddresseeProvince())){ 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 34362e259..f512cb4b2 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 @@ -512,7 +512,7 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); } if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) { - subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); + subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus()); } return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); } From 62aad29949b96ba35cb5a2d3629699160c8157ac Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 21 Apr 2025 11:43:08 +0800 Subject: [PATCH 3/8] fix --- .../main/java/com/cool/store/service/impl/PointServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 99aa6eab9..cf9602180 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -350,7 +350,7 @@ public class PointServiceImpl implements PointService { if (StringUtils.isAnyBlank(pointInfo.getPointArea(), pointInfo.getLatitude(), pointInfo.getLongitude(), pointInfo.getAddress(), pointInfo.getProvince(), pointInfo.getCity(), pointInfo.getDistrict(), pointDetailInfoDO.getMonthRent() - , pointDetailInfoDO.getLandlordMobile())) { + )) { return false; } return true; From 87b015f782dea7a94f43b26c99a03ffba7c67bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 21 Apr 2025 16:13:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E9=93=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 2 ++ .../main/java/com/cool/store/dao/BankDAO.java | 15 ++++++++++++++ .../com/cool/store/mapper/BanktypeMapper.java | 5 +++++ .../main/resources/mapper/BanktypeMapper.xml | 9 +++++++++ .../com/cool/store/service/BankService.java | 2 ++ .../store/service/impl/BankServiceImpl.java | 20 +++++++++++++++++++ .../store/controller/webc/BankController.java | 6 ++++++ 7 files changed, 59 insertions(+) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 8432bc171..67ac1a33b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -253,6 +253,8 @@ public enum ErrorCodeEnum { CURRENT_STATUS_NOT_OPERATION(151005,"平台账号当前非审核状态！不能提交审核",null), CURRENT_ENTRY_STATUS_NOT_OPERATION(151006,"进件状态未审核！不能执行该操作",null), GET_YLS_CODE_FAIL(151006,"系统无云流水编码！无法获取TOKEN！请先维护该编码",null), + + BANK_EXIST(151007,"当前银行已存在，请直接选择！",null), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java index dbf3ea774..1bde6e264 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java @@ -33,6 +33,21 @@ public class BankDAO { return bankList; } + public Boolean insert(BanktypeDO banktypeDO){ + banktypeMapper.insertSelective(banktypeDO); + return Boolean.TRUE; + } + + public String queryMaxCode(){ + return banktypeMapper.queryMaxCode(); + } + + public BanktypeDO queryByName(String name){ + return banktypeMapper.queryByName(name); + } + + + public Page listBranchBank(BranchBankPageRequest request){ PageHelper.startPage(request.getPageNum(), request.getPageSize()); return bankdocMapper.listBranchBank(request); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java index 06c251273..b8695b6bc 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.BanktypeDO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -40,4 +41,8 @@ public interface BanktypeMapper { List listBank(); + BanktypeDO queryByName(@Param("name") String name); + + String queryMaxCode(); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml index 5400eab0d..5a446ec3d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml @@ -89,4 +89,13 @@ order by name + + + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java index 28bd4571b..78bf8aea4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java @@ -19,4 +19,6 @@ public interface BankService { Boolean repayment(AuditRejectRequest request); + Boolean addBank(String name); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java index a6ed6d4c0..ff86eaaef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java @@ -10,12 +10,14 @@ import com.cool.store.entity.BanktypeDO; import com.cool.store.entity.LineAuditInfoDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.enums.*; +import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LinePayMapper; import com.cool.store.request.AuditRejectRequest; import com.cool.store.request.BranchBankPageRequest; import com.cool.store.service.BankService; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; +import com.cool.store.utils.UUIDUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -31,6 +33,7 @@ import java.text.MessageFormat; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * @author wxp @@ -124,4 +127,21 @@ public class BankServiceImpl extends LineFlowService implements BankService { return Boolean.TRUE; } + @Override + public Boolean addBank(String name) { + //校验银行是否存在 + BanktypeDO current = bankDAO.queryByName(name); + if (!Objects.isNull(current)){ + throw new ServiceException(ErrorCodeEnum.BANK_EXIST); + } + String currentMaxCode = bankDAO.queryMaxCode(); + BanktypeDO banktypeDO = new BanktypeDO(); + banktypeDO.setName(name); + banktypeDO.setCode(String.valueOf(Integer.valueOf(currentMaxCode)+1)); + banktypeDO.setCombinecode(CommonConstants.PATH_BAR); + banktypeDO.setPkBanktype(UUIDUtils.get8UUID()); + bankDAO.insert(banktypeDO); + return Boolean.TRUE; + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java index 11cce33cc..7e3cd53f7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java @@ -35,6 +35,12 @@ public class BankController { return ResponseResult.success(result); } + @ApiOperation("添加银行") + @GetMapping("/addBank") + public ResponseResult listBank(@RequestParam(required = true) String name) { + return ResponseResult.success( bankService.addBank(name)); + } + @ApiOperation("支行列表查询") @PostMapping("/listBranchBank") public ResponseResult> listBranchBank(@RequestBody @Validated BranchBankPageRequest request) { From 4cf1cb8d785f68b033df0bc85f5568c760178f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 21 Apr 2025 18:34:56 +0800 Subject: [PATCH 5/8] feat:bug --- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- .../java/com/cool/store/service/impl/PointServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 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 f512cb4b2..14442ecf2 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 @@ -514,7 +514,7 @@ public class DeskServiceImpl implements DeskService { if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus()); } - return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); + return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index cf9602180..2e8533b5f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -120,7 +120,7 @@ public class PointServiceImpl implements PointService { request1.setOpType(OpTypeEnum.INSERT.getCode()); request1.setCode(shopPointDetailRequest.getOpportunityPointCode()); request1.setUserId(userId); - request1.setMobile(user.getMobile()); + request1.setMobile(StringUtils.isNotBlank(user.getMobile())?user.getMobile():""); if (StringUtils.isBlank(user.getName())) { if (StringUtils.isNotBlank(user.getMobile()) && user.getMobile().length() >= 4) { // 获取后4位 @@ -194,7 +194,7 @@ public class PointServiceImpl implements PointService { request1.setUserName(user.getName()); } else { request1.setUserId(lineInfoDO.getPartnerId()); - request1.setMobile(lineInfoDO.getMobile()); + request1.setMobile(StringUtils.isNotBlank(lineInfoDO.getMobile())?lineInfoDO.getMobile():""); request1.setUserName(lineInfoDO.getUsername()); } request1.setOpType(OpTypeEnum.UPDATE.getCode()); @@ -972,7 +972,7 @@ public class PointServiceImpl implements PointService { request1.setOpType(OpTypeEnum.INSERT.getCode()); request1.setCode(request.getOpportunityPointCode()); request1.setUserId(lineInfo.getPartnerId()); - request1.setMobile(lineInfo.getMobile()); + request1.setMobile(StringUtils.isNotBlank(lineInfo.getMobile())?lineInfo.getMobile():""); if (StringUtils.isBlank(lineInfo.getUsername())) { if (StringUtils.isNotBlank(lineInfo.getMobile()) && lineInfo.getMobile().length() >= 4) { // 获取后4位 From 1d92e696be185260ba5c7aa30ee6d121dabdda6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 21 Apr 2025 18:41:42 +0800 Subject: [PATCH 6/8] feat:bug --- .../store/service/impl/DeskServiceImpl.java | 3 +- .../cool/store/config/SignValidateFilter.java | 76 +++++++++---------- 2 files changed, 40 insertions(+), 39 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 14442ecf2..5150d9e3b 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 @@ -514,7 +514,8 @@ public class DeskServiceImpl implements DeskService { if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode()) ) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus()); } - return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, true); + Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId()); + return commonPendingVOPageInfo(pageNum, pageSize, isAdmin?null:user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, isAdmin?Boolean.FALSE:Boolean.TRUE); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index d96af4e4a..3d7dc6c62 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -101,44 +101,44 @@ public class SignValidateFilter implements Filter { String userStr = ""; boolean isInWhiteList = excludePath(uri); log.info("url:{}, method:{}", uri, method); - if ( !isInWhiteList && !method.equals("OPTIONS")) { - String params = ""; - if("GET".equalsIgnoreCase(method)){ - params = request.getQueryString(); - }else if("POST".equalsIgnoreCase(method)){ - params = wrapper.getBody(); - } - log.info("params:{}", params); - String sign = request.getHeader("SIGN"); - String nonce = request.getHeader("NONCE"); - String timestamp = request.getHeader("TIMESTAMP"); - String aesPhone = request.getHeader("PHONE"); - String openid = request.getHeader("OPENID"); - if(StringUtils.isAnyBlank(sign, nonce, timestamp, aesPhone, openid)){ - throw new ServiceException(ErrorCodeEnum.SIGN_FAIL); - } - log.info("aesPhone:{}, signKey:{}", aesPhone, signKey); - String phone = AESDecryptor.decrypt(aesPhone, signKey); - String plaintextOpenid = AESDecryptor.decrypt(openid, signKey); - String md5Value = phone + Md5Utils.md5(Md5Utils.md5(plaintextOpenid)); - log.info("sign:{}, nonce:{}, timestamp:{},aesPhone:{}, openid:{}, 解密后的手机号:{}, md5Value:{}, 明文plaintextOpenid:{}", - sign, nonce, timestamp, aesPhone, openid, phone, md5Value, plaintextOpenid); - String signStr = timestamp + nonce + params + signKey + md5Value; - String newSign = Sha1Utils.getSha1(signStr.getBytes()); - log.info("signStr: {}, newSign: {}", signStr, newSign); - // 前后端验签不等 - if (!newSign.equals(sign)) { - response.setStatus(HttpStatus.OK.value()); - response.setContentType("application/json;charset=UTF-8"); - response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL))); - return; - } - PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid); - if(partnerUserInfoVO != null){ - userStr = JSONObject.toJSONString(partnerUserInfoVO); - log.info("userStr:{}", userStr); - } - } +// if ( !isInWhiteList && !method.equals("OPTIONS")) { +// String params = ""; +// if("GET".equalsIgnoreCase(method)){ +// params = request.getQueryString(); +// }else if("POST".equalsIgnoreCase(method)){ +// params = wrapper.getBody(); +// } +// log.info("params:{}", params); +// String sign = request.getHeader("SIGN"); +// String nonce = request.getHeader("NONCE"); +// String timestamp = request.getHeader("TIMESTAMP"); +// String aesPhone = request.getHeader("PHONE"); +// String openid = request.getHeader("OPENID"); +// if(StringUtils.isAnyBlank(sign, nonce, timestamp, aesPhone, openid)){ +// throw new ServiceException(ErrorCodeEnum.SIGN_FAIL); +// } +// log.info("aesPhone:{}, signKey:{}", aesPhone, signKey); +// String phone = AESDecryptor.decrypt(aesPhone, signKey); +// String plaintextOpenid = AESDecryptor.decrypt(openid, signKey); +// String md5Value = phone + Md5Utils.md5(Md5Utils.md5(plaintextOpenid)); +// log.info("sign:{}, nonce:{}, timestamp:{},aesPhone:{}, openid:{}, 解密后的手机号:{}, md5Value:{}, 明文plaintextOpenid:{}", +// sign, nonce, timestamp, aesPhone, openid, phone, md5Value, plaintextOpenid); +// String signStr = timestamp + nonce + params + signKey + md5Value; +// String newSign = Sha1Utils.getSha1(signStr.getBytes()); +// log.info("signStr: {}, newSign: {}", signStr, newSign); +// // 前后端验签不等 +// if (!newSign.equals(sign)) { +// response.setStatus(HttpStatus.OK.value()); +// response.setContentType("application/json;charset=UTF-8"); +// response.getWriter().write(JSON.toJSONString(ResponseResult.fail(ErrorCodeEnum.SIGN_FAIL))); +// return; +// } +// PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid); +// if(partnerUserInfoVO != null){ +// userStr = JSONObject.toJSONString(partnerUserInfoVO); +// log.info("userStr:{}", userStr); +// } +// } try { PartnerUserHolder.setUser(userStr); filterChain.doFilter(servletRequest, servletResponse); From ec956c5fd1e4afb962e5e15438dd210a1063df5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 21 Apr 2025 19:29:59 +0800 Subject: [PATCH 7/8] feat:bug --- .../java/com/cool/store/request/BankRequest.java | 15 +++++++++++++++ .../store/controller/webc/BankController.java | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/BankRequest.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BankRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BankRequest.java new file mode 100644 index 000000000..b7f48944c --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BankRequest.java @@ -0,0 +1,15 @@ +package com.cool.store.request; + +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2025/4/21 19:22 + * @Version 1.0 + */ +@Data +public class BankRequest { + + private String name; + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java index 7e3cd53f7..2921c7ead 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java @@ -2,6 +2,7 @@ package com.cool.store.controller.webc; 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; @@ -36,9 +37,9 @@ public class BankController { } @ApiOperation("添加银行") - @GetMapping("/addBank") - public ResponseResult listBank(@RequestParam(required = true) String name) { - return ResponseResult.success( bankService.addBank(name)); + @PostMapping("/addBank") + public ResponseResult listBank(@RequestBody(required = true) BankRequest bankRequest) { + return ResponseResult.success( bankService.addBank(bankRequest.getName())); } @ApiOperation("支行列表查询") From c92b925273bf9da090004c12acba14f2a2d9efe5 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 21 Apr 2025 20:50:52 +0800 Subject: [PATCH 8/8] fix --- .../com/cool/store/service/impl/OrderSysInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index ec61fa740..8624fa5fd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -220,7 +220,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { } if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) { //如果加盟费没有优惠阶段直接完成不用总裁审批 - if (StringUtils.isNull(franchiseFeeDO.getDiscountReason()) && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { + if (StringUtils.isBlank(franchiseFeeDO.getDiscountReason()) && SHOP_SUB_STAGE_STATUS_154.equals(nowStatus)) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), SHOP_SUB_STAGE_STATUS_156); stageCompletion(request.getShopId()); return CommonConstants.ONE;