From fd43c2c4b2169a7f90c33f608e4be66a7c7f9efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Mon, 11 May 2026 04:15:31 +0000 Subject: [PATCH] Merge #121 into master from cc_20260511_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat:ADVERTISEMENT_FEE VIDEO_DEVICE_FEE * cc_20260511_fix: (3 commits squashed) - feat:待采购确认 审批流程 - feat:问题修复 - feat:ADVERTISEMENT_FEE VIDEO_DEVICE_FEE Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/121 --- .../cool/store/enums/fees/WalletFeeItemEnum.java | 4 ++-- .../com/cool/store/dao/ShopStageInfoDAO.java | 4 ++-- .../cool/store/mapper/ShopStageInfoMapper.java | 2 +- .../resources/mapper/ShopStageInfoMapper.xml | 3 +++ .../point/RentContractToDoPagerRequest.java | 16 ++++++++++++++++ .../com/cool/store/service/PointService.java | 2 +- .../store/service/impl/PointServiceImpl.java | 4 ++-- .../service/impl/SignFranchiseServiceImpl.java | 13 ++++++++++--- .../order/impl/MiniStoreOrderServiceImpl.java | 2 +- .../store/controller/webb/ToDoController.java | 6 +++--- 10 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/point/RentContractToDoPagerRequest.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java index bcdc9c348..de3420b5b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/fees/WalletFeeItemEnum.java @@ -32,8 +32,8 @@ public enum WalletFeeItemEnum { EXPENSE_DECORATION_MONEY(316, "expense_decoration_money", "装修费"), EXPENSE_EQUIPMENT_MONEY(317, "expense_equipment_money", "设备费"), FIRST_ORDER(321, "expense_first_order_money", "首批订货"), - ADVERTISEMENT_FEE(322, "expense_advertisement_fee", "监控设备类(立规)"), - VIDEO_DEVICE_FEE(323, "expense_video_device_fee", "灯箱广告类(立规)"), + ADVERTISEMENT_FEE(322, "expense_video_device_fee", "监控设备类(立规)"), + VIDEO_DEVICE_FEE(323, "expense_advertisement_fee", "灯箱广告类(立规)"), LI_GUI_SERVICE_FEE(324, "expense_li_gui_service_fee", "管理服务费(立规)"), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 357cddf82..06dbc9d04 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -270,11 +270,11 @@ public class ShopStageInfoDAO { return shopStageInfoMapper.updateShopStageAndAuditInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId); } - public Page getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List authRegionIds) { + public Page getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List authRegionIds,String keyword) { PageHelper.startPage(pageNum, pageSize); ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21; return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(), - shopSubStageStatus.getShopSubStageStatus(),authRegionIds); + shopSubStageStatus.getShopSubStageStatus(),authRegionIds,keyword); } public List getShopIdListByStageStatus(Integer shopSubStageStatus) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index 411a0c2f0..dd853a92d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -119,7 +119,7 @@ public interface ShopStageInfoMapper extends Mapper { Page getRentContractToDoPage(@Param("userId") String userId, @Param("shopSubStage")Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus, - @Param("authRegionIds") List authRegionIds); + @Param("authRegionIds") List authRegionIds, @Param("keyword") String keyword); List getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus); diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index c3bbff23e..a7dc9bdc7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -254,6 +254,9 @@ #{regionId} + + and (b.username like concat('%',#{keyword},'%') or b.mobile like concat('%',#{keyword},'%')) + order by a.id desc diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/point/RentContractToDoPagerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/point/RentContractToDoPagerRequest.java new file mode 100644 index 000000000..92838587d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/point/RentContractToDoPagerRequest.java @@ -0,0 +1,16 @@ +package com.cool.store.request.point; + +import com.cool.store.common.PageBasicInfo; +import lombok.Data; + +/** + * @Auther zx_szh + * @Date 2026/5/11 10:48 + * @Version 1.0 + */ +@Data +public class RentContractToDoPagerRequest extends PageBasicInfo +{ + private String keyword; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java index be6f67766..434aa05cf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java @@ -344,7 +344,7 @@ public interface PointService { * @param pageSize * @return */ - PageInfo getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize); + PageInfo getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize,String keyword); /** 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 b48826b15..5808f4445 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 @@ -1367,13 +1367,13 @@ public class PointServiceImpl implements PointService { } @Override - public PageInfo getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize) { + public PageInfo getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize,String keyword) { List authRegionIds = new ArrayList<>(); //如果是管理员 查询所有 如果是其他角色 根据管辖大区权限查询 菜单根据配置来 if (!sysRoleService.checkIsAdmin(userId)) { authRegionIds = userAuthMappingService.getAuthRegionIdByUserId(userId,Boolean.TRUE); } - Page todoPage = shopStageInfoDAO.getRentContractToDoPage(userId, pageNumber, pageSize,authRegionIds); + Page todoPage = shopStageInfoDAO.getRentContractToDoPage(userId, pageNumber, pageSize,authRegionIds,keyword); List resultList = null; if (Objects.nonNull(todoPage) && CollectionUtils.isNotEmpty(todoPage.getResult())) { List shopIds = todoPage.getResult().stream().map(RentInfoToDoVO::getShopId).collect(Collectors.toList()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index f3b2a39a2..c2cc2cc5c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -556,7 +556,14 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopAuditInfoDO.setPassReason(request.getCause()); //更新状态为加盟商 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); - shopStageInfoDAO.updateShopStageInfo(shopId, SHOP_SUB_STAGE_STATUS_83_2); + + ShopSubStageStatusEnum next = SHOP_SUB_STAGE_STATUS_83_5; + //普通店 需要招商副总裁审批 + if (shopInfoDO.getStoreType()!=null&&StoreTypeEnum.ORDINARY_STORE.equals(shopInfoDO.getStoreType())){ + next = SHOP_SUB_STAGE_STATUS_83_2; + } + + shopStageInfoDAO.updateShopStageInfo(shopId, next); //推送数据 contractCallbackDTO = pushContractRequest(shopInfoDO, request.getShopId()); Boolean sendNotice = Boolean.TRUE; @@ -570,9 +577,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.nonNull(userDOList)) { finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } - operationLogService.addOperationLog(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83_2, + operationLogService.addOperationLog(request.getShopId(), next, user.getUserId(), userDOList, - OperationTypeEnum.OPERATION_TYPE_1, "招商副总裁审批", OperationStatusEnum.NOT_PROCESSED, 2); + OperationTypeEnum.OPERATION_TYPE_1, next.getShopSubStageName(), OperationStatusEnum.NOT_PROCESSED, 2); commonService.sendQWMessage(finances, MessageEnum.MESSAGE_19_1, map); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java index 2b7e0aa58..f3c26ee33 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java @@ -601,7 +601,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { //下一级审批记录 SysRoleRequest sysRoleRequest = new SysRoleRequest(); - sysRoleRequest.setRoleName(AI_STORE_TYPE_APPROVE.getDesc()); + sysRoleRequest.setRoleName(DEVICE_SHIPMENT_CG.getDesc()); List userListByRole = userAuthMappingService.findUserListByRole(sysRoleRequest, false); operationLogService.addOperationLog(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_281_2, user.getUserId(), userListByRole, diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ToDoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ToDoController.java index ff4326448..b2cec3dfb 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ToDoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ToDoController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; +import com.cool.store.request.point.RentContractToDoPagerRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.PointService; import com.cool.store.vo.point.PointToDoVO; @@ -36,9 +37,8 @@ public class ToDoController { @ApiOperation("上传租赁合同待办") @PostMapping("/getRentContractToDoPage") - public ResponseResult> getRentContractToDoPage(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize){ + public ResponseResult> getRentContractToDoPage(@RequestBody RentContractToDoPagerRequest request){ String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(pointService.getRentContractToDoPage(userId, pageNumber, pageSize)); + return ResponseResult.success(pointService.getRentContractToDoPage(userId, request.getPageNum(), request.getPageSize(),request.getKeyword())); } }