运营平台调试

haha-mapper/src/main/java/com/haha/mapper/InviteActivityMapper.java

@@ -44,7 +44,7 @@ public interface InviteActivityMapper extends BaseMapper<InviteActivity> {
             "SUM(CASE WHEN status >= 1 THEN 1 ELSE 0 END) as validInvite, " +
             "SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) as rewardedCount, " +
             "SUM(CASE WHEN invite_time >= #{startDate} AND invite_time <= #{endDate} THEN 1 ELSE 0 END) as todayInvite " +
-            "FROM t_invite_record WHERE activity_id = #{activityId} AND deleted = 0")
+            "FROM t_invite_record WHERE activity_id = #{activityId}")
     Map<String, Object> selectStatisticsByActivityId(@Param("activityId") Long activityId,
                                                       @Param("startDate") LocalDateTime startDate,
                                                       @Param("endDate") LocalDateTime endDate);

haha-mapper/src/main/java/com/haha/mapper/InviteRewardMapper.java

@@ -15,11 +15,11 @@ import java.util.Map;
 public interface InviteRewardMapper extends BaseMapper<InviteReward> {
 
     // 根据邀请记录ID查询奖励记录
-    @Select("SELECT * FROM t_invite_reward WHERE record_id = #{recordId} AND deleted = 0 LIMIT 1")
+    @Select("SELECT * FROM t_invite_reward WHERE record_id = #{recordId} LIMIT 1")
     InviteReward selectByRecordId(@Param("recordId") Long recordId);
 
     // 根据邀请记录ID和奖励类型查询奖励记录（用于检查是否已发放过被邀请人奖励）
-    @Select("SELECT * FROM t_invite_reward WHERE record_id = #{recordId} AND reward_type = #{rewardType} AND deleted = 0 LIMIT 1")
+    @Select("SELECT * FROM t_invite_reward WHERE record_id = #{recordId} AND reward_type = #{rewardType} LIMIT 1")
     InviteReward selectByRecordIdAndRewardType(@Param("recordId") Long recordId, @Param("rewardType") Integer rewardType);
 
     // 更新奖励状态为已发放
@@ -39,13 +39,13 @@ public interface InviteRewardMapper extends BaseMapper<InviteReward> {
                         @Param("operatorName") String operatorName);
 
     // 查询待重试的失败奖励记录
-    @Select("SELECT * FROM t_invite_reward WHERE status = 2 AND retry_count < #{maxRetry} AND deleted = 0 ORDER BY create_time ASC LIMIT #{limit}")
+    @Select("SELECT * FROM t_invite_reward WHERE status = 2 AND retry_count < #{maxRetry} ORDER BY create_time ASC LIMIT #{limit}")
     List<InviteReward> selectFailedRewardsForRetry(@Param("maxRetry") Integer maxRetry, @Param("limit") Integer limit);
 
     // 统计某活动的奖励发放情况
     @Select("SELECT COUNT(*) as totalCount, " +
             "SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) as distributedCount, " +
             "SUM(CASE WHEN status = 2 THEN 1 ELSE 0 END) as failedCount " +
-            "FROM t_invite_reward WHERE activity_id = #{activityId} AND deleted = 0")
+            "FROM t_invite_reward WHERE activity_id = #{activityId}")
     Map<String, Object> selectRewardStatistics(@Param("activityId") Long activityId);
 }

haha-service/src/main/java/com/haha/service/config/RestTemplateConfig.java

@@ -0,0 +1,18 @@
+package com.haha.service.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * RestTemplate配置类
+ * 用于HTTP请求，如调用微信API
+ */
+@Configuration
+public class RestTemplateConfig {
+    
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}

haha-service/src/main/java/com/haha/service/impl/LoginServiceImpl.java

@@ -30,10 +30,10 @@ public class LoginServiceImpl implements LoginService {
     @Autowired
     private RestTemplate restTemplate;
     
-    @Value("${wechat.miniapp.app-id}")
+    @Value("${wechat.miniapp.app-id:}")
     private String miniappAppId;
     
-    @Value("${wechat.miniapp.secret}")
+    @Value("${wechat.miniapp.secret:}")
     private String miniappSecret;
     
     @Override