bugfix: #2340修改入驻发送通知标题文字不对问题

alien-store-platform/src/main/java/shop/alien/storeplatform/controller/LifeGroupBuyPlatformController.java

@@ -111,7 +111,7 @@ public class LifeGroupBuyPlatformController {
         log.info("LifeGroupBuyController.getThaliList?page={},size={},storeId={},status={},groupName={},groupType={},reviewType={},groupNo={}", pageNum, pageSize, storeId, status, groupName, groupType, reviewType, groupNo);
 
         if (StringUtils.isBlank(storeId)) {
-            return R.data(null ,"当前用户未入住");
+            return R.data(null ,"当前用户未入驻");
         }
 
         return R.data(lifeGroupBuyService.getThaliList(pageNum, pageSize, storeId, status, groupName, groupType, reviewType, groupNo));

alien-store-platform/src/main/java/shop/alien/storeplatform/controller/StoreManageController.java

@@ -29,7 +29,7 @@ public class StoreManageController {
 
     private final StoreManageService storeManageService;
 
-    @ApiOperation("新增店铺入住申请")
+    @ApiOperation("新增店铺入驻申请")
     @ApiOperationSupport(order = 1)
     @PostMapping("/applyStore")
     public R<StoreInfoVo> applyStore(@RequestBody StoreInfoDto storeInfoDto) {
@@ -37,7 +37,7 @@ public class StoreManageController {
         try {
             StoreInfoVo result = storeManageService.applyStore(storeInfoDto);
             if (result != null) {
-                return R.data(result, "店铺入住申请提交成功");
+                return R.data(result, "店铺入驻申请提交成功");
             }
             return R.fail("申请失败");
         } catch (Exception e) {
@@ -46,7 +46,7 @@ public class StoreManageController {
         }
     }
 
-    @ApiOperation("保存店铺入住申请草稿")
+    @ApiOperation("保存店铺入驻申请草稿")
     @ApiOperationSupport(order = 2)
     @PostMapping("/saveStoreDraft")
     public R<Boolean> saveStoreDraft(@RequestBody StoreInfoDraft storeInfoDraft) {
@@ -63,7 +63,7 @@ public class StoreManageController {
         }
     }
 
-    @ApiOperation("查询店铺入住申请草稿")
+    @ApiOperation("查询店铺入驻申请草稿")
     @ApiOperationSupport(order = 3)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "storeUserId", value = "商户用户ID", dataType = "int", paramType = "query", required = true)

alien-store-platform/src/main/java/shop/alien/storeplatform/service/StoreManageService.java

@@ -14,7 +14,7 @@ import shop.alien.entity.store.vo.StoreMainInfoVo;
 public interface StoreManageService {
 
     /**
-     * 新增店铺入住申请
+     * 新增店铺入驻申请
      *
      * @param storeInfoDto 店铺信息DTO
      * @return StoreInfoVo
@@ -23,7 +23,7 @@ public interface StoreManageService {
     StoreInfoVo applyStore(StoreInfoDto storeInfoDto) throws Exception;
 
     /**
-     * 保存店铺入住申请草稿
+     * 保存店铺入驻申请草稿
      *
      * @param storeInfoDraft 店铺草稿信息
      * @return 影响行数
@@ -31,7 +31,7 @@ public interface StoreManageService {
     int saveStoreDraft(StoreInfoDraft storeInfoDraft);
 
     /**
-     * 查询店铺入住申请草稿
+     * 查询店铺入驻申请草稿
      *
      * @param storeUserId 商户用户ID
      * @return 店铺草稿信息

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/MerchantAuthServiceImpl.java

@@ -51,7 +51,7 @@ public class MerchantAuthServiceImpl implements MerchantAuthService {
                        .eq(LifeUser::getLogoutFlag, 0);  // 只查询未注销的用户
             size = lifeUserMapper.selectCount(userWrapper);
         } else {
-            // 商家端：查询已入住或审核中的商家
+            // 商家端：查询已入驻或审核中的商家
             // 1. 先根据身份证和姓名查询商户用户
             LambdaQueryWrapper<StoreUser> storeUserWrapper = new LambdaQueryWrapper<>();
             storeUserWrapper.eq(StoreUser::getIdCard, idCard)

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/MerchantUserServiceImpl.java

@@ -366,14 +366,14 @@ public class MerchantUserServiceImpl implements MerchantUserService {
             int deletedStoreCount = storeInfoMapper.deleteById(storeId);
             log.info("MerchantUserServiceImpl.resetToInitialStatus - 删除店铺信息: success={}", deletedStoreCount > 0);
             
-            // 6. 清理用户关联的通知消息（入住申请相关）
+            // 6. 清理用户关联的通知消息（入驻申请相关）
             if (StringUtils.isNotEmpty(storeUser.getPhone())) {
                 String receiverId = "store_" + storeUser.getPhone();
                 LambdaQueryWrapper<LifeNotice> noticeWrapper = new LambdaQueryWrapper<>();
                 noticeWrapper.eq(LifeNotice::getReceiverId, receiverId)
-                        .eq(LifeNotice::getTitle, "入住店铺申请");
+                        .eq(LifeNotice::getTitle, "入驻店铺申请");
                 int deletedNoticeCount = lifeNoticeMapper.delete(noticeWrapper);
-                log.info("MerchantUserServiceImpl.resetToInitialStatus - 删除入住申请通知: count={}", deletedNoticeCount);
+                log.info("MerchantUserServiceImpl.resetToInitialStatus - 删除入驻申请通知: count={}", deletedNoticeCount);
             }
             
             // 7. 查询该店铺的所有订单ID（用于后续删除验券记录）
@@ -431,11 +431,11 @@ public class MerchantUserServiceImpl implements MerchantUserService {
             LambdaUpdateWrapper<StoreUser> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(StoreUser::getId, userId)
                     .set(StoreUser::getStoreId, null)       // 解绑店铺
-                    .set(StoreUser::getName, null)          // 清空姓名（入住时填写的联系人）
-                    .set(StoreUser::getIdCard, null)        // 清空身份证（入住时填写的）
+                    .set(StoreUser::getName, null)          // 清空姓名（入驻时填写的联系人）
+                    .set(StoreUser::getIdCard, null)        // 清空身份证（入驻时填写的）
                     .set(StoreUser::getPayPassword, null)   // 清空支付密码
                     .set(StoreUser::getMoney, 0)    // 重置用户余额为0
-                    .set(StoreUser::getAlipayAccount, null); // 清空支付宝账号（入住时填写的）
+                    .set(StoreUser::getAlipayAccount, null); // 清空支付宝账号（入驻时填写的）
             
             int updateResult = storeUserMapper.update(null, updateWrapper);
             

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StoreBusinessServiceImpl.java

@@ -678,7 +678,7 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
         LifeNotice lifeMessage = new LifeNotice();
         lifeMessage.setReceiverId("store_" + storeUser.getPhone());
         lifeMessage.setContext(jsonObject.toJSONString());
-        lifeMessage.setTitle("入住店铺申请");
+        lifeMessage.setTitle("入驻店铺申请");
         lifeMessage.setSenderId("system");
         lifeMessage.setIsRead(0);
         lifeMessage.setNoticeType(1);

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StoreManageServiceImpl.java

@@ -206,7 +206,7 @@ public class StoreManageServiceImpl implements StoreManageService {
         // 15. 初始化店铺标签
         initializeStoreTags(storeInfo.getId());
 
-        // 16. 发送入住申请通知
+        // 16. 发送入驻申请通知
         sendApplicationNotice(storeInfoDto.getUserAccount());
 
         // 17. 返回结果
@@ -370,7 +370,7 @@ public class StoreManageServiceImpl implements StoreManageService {
     }
 
     /**
-     * 发送入住申请通知
+     * 发送入驻申请通知
      */
     private void sendApplicationNotice(String userAccount) {
         try {
@@ -393,7 +393,7 @@ public class StoreManageServiceImpl implements StoreManageService {
             LifeNotice lifeNotice = new LifeNotice();
             lifeNotice.setReceiverId(receiverId);
             lifeNotice.setContext(jsonObject.toJSONString());
-            lifeNotice.setTitle("入住店铺申请");
+            lifeNotice.setTitle("入驻店铺申请");
             lifeNotice.setSenderId("system");
             lifeNotice.setIsRead(0);
             lifeNotice.setNoticeType(1);
@@ -415,7 +415,7 @@ public class StoreManageServiceImpl implements StoreManageService {
                 log.error("WebSocket消息推送失败: {}", e.getMessage(), e);
             }
         } catch (Exception e) {
-            log.error("发送入住申请通知失败: {}", e.getMessage(), e);
+            log.error("发送入驻申请通知失败: {}", e.getMessage(), e);
         }
     }
 

alien-store/src/main/java/shop/alien/store/controller/AliController.java

@@ -91,7 +91,7 @@ public class AliController {
                             .eq(LifeUser::getLogoutFlag, 0))
                     .size();
         } else {
-            //根据身份查询已入住或审核中的商家
+            //根据身份查询已入驻或审核中的商家
             List<StoreUser> storeUserList = storeUserService
                     .list(new LambdaQueryWrapper<StoreUser>()
                             .eq(StoreUser::getIdCard, idCard)

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -1333,7 +1333,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         LifeNotice lifeMessage = new LifeNotice();
         lifeMessage.setReceiverId("store_" + storeUser.getPhone());
         lifeMessage.setContext(jsonObject.toJSONString());
-        lifeMessage.setTitle("入住店铺申请");
+        lifeMessage.setTitle("入驻店铺申请");
         lifeMessage.setSenderId("system");
         lifeMessage.setIsRead(0);
         lifeMessage.setNoticeType(1);

pom.xml

@@ -12,9 +12,9 @@
         <module>alien-api</module>
         <module>alien-config</module>
         <module>alien-entity</module>
+        <module>alien-util</module>
         <module>alien-store</module>
         <module>alien-gateway</module>
-        <module>alien-util</module>
         <module>alien-job</module>
         <module>alien-second</module>
         <module>alien-lawyer</module>