Merge #121 into master from cc_20260511_fix

feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

* cc_20260511_fix: (3 commits squashed)

  - feat:待采购确认 审批流程

  - feat:问题修复

  - feat:ADVERTISEMENT_FEE  VIDEO_DEVICE_FEE

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/121

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", "监控设备类(立规)"),
+    ADVERTISEMENT_FEE(322, "expense_video_device_fee", "监控设备类(立规)"),
-    VIDEO_DEVICE_FEE(323, "expense_video_device_fee", "灯箱广告类(立规)"),
+    VIDEO_DEVICE_FEE(323, "expense_advertisement_fee", "灯箱广告类(立规)"),
     LI_GUI_SERVICE_FEE(324, "expense_li_gui_service_fee", "管理服务费(立规)"),
 
     ;

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<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List<String> authRegionIds) {
+    public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List<String> 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<ShopStageInfoDO> getShopIdListByStageStatus(Integer shopSubStageStatus) {

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

@@ -119,7 +119,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
     Page<RentInfoToDoVO> getRentContractToDoPage(@Param("userId") String userId,
                                                  @Param("shopSubStage")Integer shopSubStage,
                                                  @Param("shopSubStageStatus") Integer shopSubStageStatus,
-                                                 @Param("authRegionIds") List<String> authRegionIds);
+                                                 @Param("authRegionIds") List<String> authRegionIds, @Param("keyword") String keyword);
 
     List<ShopStageInfoDO> getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus);
 

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -254,6 +254,9 @@
                 #{regionId}
             </foreach>
         </if>
+        <if test="keyword !=null and keyword !=''">
+            and (b.username like concat('%',#{keyword},'%') or b.mobile like concat('%',#{keyword},'%'))
+        </if>
         order by a.id desc
     </select>
 

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;
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java

@@ -344,7 +344,7 @@ public interface PointService {
      * @param pageSize
      * @return
      */
-    PageInfo<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize);
+    PageInfo<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize,String keyword);
 
 
     /**

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<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize) {
+    public PageInfo<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize,String keyword) {
         List<String> authRegionIds = new ArrayList<>();
         //如果是管理员 查询所有 如果是其他角色 根据管辖大区权限查询 菜单根据配置来
         if (!sysRoleService.checkIsAdmin(userId)) {
             authRegionIds = userAuthMappingService.getAuthRegionIdByUserId(userId,Boolean.TRUE);
         }
-        Page<RentInfoToDoVO> todoPage = shopStageInfoDAO.getRentContractToDoPage(userId, pageNumber, pageSize,authRegionIds);
+        Page<RentInfoToDoVO> todoPage = shopStageInfoDAO.getRentContractToDoPage(userId, pageNumber, pageSize,authRegionIds,keyword);
         List<RentInfoToDoVO> resultList = null;
         if (Objects.nonNull(todoPage) && CollectionUtils.isNotEmpty(todoPage.getResult())) {
             List<Long> shopIds = todoPage.getResult().stream().map(RentInfoToDoVO::getShopId).collect(Collectors.toList());

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);

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<EnterpriseUserDO> userListByRole = userAuthMappingService.findUserListByRole(sysRoleRequest, false);
             operationLogService.addOperationLog(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_281_2,
                     user.getUserId(), userListByRole,

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<PageInfo<RentInfoToDoVO>> getRentContractToDoPage(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+    public ResponseResult<PageInfo<RentInfoToDoVO>> getRentContractToDoPage(@RequestBody RentContractToDoPagerRequest request){
-                                                            @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize){
         String userId = CurrentUserHolder.getUserId();
-        return ResponseResult.success(pointService.getRentContractToDoPage(userId, pageNumber, pageSize));
+        return ResponseResult.success(pointService.getRentContractToDoPage(userId, request.getPageNum(), request.getPageSize(),request.getKeyword()));
     }
 }