bug修改

alien-job/src/main/java/shop/alien/job/store/StoreMembershipCardJob.java

@@ -185,7 +185,7 @@ public class StoreMembershipCardJob {
                     // 获取当前时间
                     Date date = new Date();
                     if (date.compareTo(sevenDay) >= 0) {
-                        log.info("开始删除已注销超过7天的店铺: storeId={}, storeName={}, logoutTime={}", 
+                        log.info("开始删除已注销超过7天的店铺: storeId={}, storeName={}, logoutTime={}",
                                 storeInfo.getId(), storeInfo.getStoreName(), logoutTime);
 
                         invalidateStoreCoupons(storeInfo.getId());
@@ -197,13 +197,13 @@ public class StoreMembershipCardJob {
                         storeInfoNew.setId(storeInfo.getId());
                         storeInfoMapper.updateById(storeInfo);
 
-                        
+
                         // 先清理关联的商户用户注销状态，确保可以重新入驻
                         List<StoreUser> relatedStoreUsers = storeUserMapper.selectList(
                                 new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId, storeInfo.getId()));
                         int deletedUsers = 0;
                         int deletedFans = 0;
-                        
+
                         for (StoreUser storeUser : relatedStoreUsers) {
                             try {
                                 // 清理注销标记和时间，允许重新入驻
@@ -214,49 +214,22 @@ public class StoreMembershipCardJob {
                                 deletedUsers++;
                                 log.info("清理商户用户注销状态: userId={}, phone={}", storeUser.getId(), storeUser.getPhone());
                             } catch (Exception e) {
-                                log.error("清理商户用户注销状态失败: userId={}, phone={}, error={}", 
-                                        storeUser.getId(), storeUser.getPhone(), e.getMessage(), e);
-                            }
-                        }
-                        
-                        // 清理粉丝关系
-                        for (StoreUser storeUser : relatedStoreUsers) {
-                            try {
-                                if (storeUser.getPhone() != null) {
-                                    LambdaQueryWrapper<LifeFans> queryWrapper = new LambdaQueryWrapper<LifeFans>()
-                                            .eq(LifeFans::getDeleteFlag, 0)
-                                            .and(w -> w
-                                                    .nested(n -> n.eq(LifeFans::getFollowedUserType, 2)
-                                                            .eq(LifeFans::getFollowedRefId, storeUser.getId()))
-                                                    .or()
-                                                    .nested(n -> n.eq(LifeFans::getFansUserType, 2)
-                                                            .eq(LifeFans::getFansRefId, storeUser.getId())));
-                                    int deleted = lifeFansMapper.delete(queryWrapper);
-                                    deletedFans += deleted;
-                                }
-                            } catch (Exception e) {
-                                log.error("清理粉丝关系失败: userId={}, phone={}, error={}", 
+                                log.error("清理商户用户注销状态失败: userId={}, phone={}, error={}",
                                         storeUser.getId(), storeUser.getPhone(), e.getMessage(), e);
                             }
                         }
-                        
-                        // 清理Redis地理位置（通过Feign调用）
-                        try {
-                            alienStoreFeign.delMer(Boolean.TRUE, storeInfo.getId().toString());
-                        } catch (Exception e) {
-                            log.warn("清理Redis地理位置失败: storeId={}, error={}", storeInfo.getId(), e.getMessage());
-                        }
-                        
+
+
+
                         // 最后删除店铺记录
-                        storeInfoMapper.deleteById(storeInfo.getId());
                         successCount++;
-                        log.info("店铺删除完成: storeId={}, deletedUsers={}, deletedFans={}", 
+                        log.info("店铺删除完成: storeId={}, deletedUsers={}, deletedFans={}",
                                 storeInfo.getId(), deletedUsers, deletedFans);
                     }
                 }
             } catch (Exception e) {
                 failCount++;
-                log.error("删除店铺失败: storeId={}, storeName={}, error={}", 
+                log.error("删除店铺失败: storeId={}, storeName={}, error={}",
                         storeInfo.getId(), storeInfo.getStoreName(), e.getMessage(), e);
             }
         }