Merge branch 'feature/non_friends' into debug

* feature/non_friends:
  debug
  fixbug

# Conflicts:
#	crontask/contact_form.go

crontask/contact_form.go

@@ -124,17 +124,20 @@ func (l *CronTask) analyze() {
 	}
 
 	var predicates []predicate.UsageDetail
-	predicates = append(predicates, usagedetail.TypeIn(1, 3))
+	predicates = append(predicates, usagedetail.TypeIn(1, 3, 4, 6))
 	predicates = append(predicates, usagedetail.AppIn(1, 3, 4, 5))
 	//yesterdayStart := time.Now().AddDate(0, 0, -1).Truncate(24 * time.Hour)
 	//yesterdayEnd := yesterdayStart.Add(24 * time.Hour)
-	//predicates = append(predicates, usagedetail.CreatedAtGTE(yesterdayStart))
-	//predicates = append(predicates, usagedetail.CreatedAtLT(yesterdayEnd))
-
-	todayStart := time.Now().AddDate(0, 0, 0).Truncate(24 * time.Hour)
-	todayEnd := todayStart.Add(24 * time.Hour)
-	predicates = append(predicates, usagedetail.CreatedAtGTE(todayStart))
-	predicates = append(predicates, usagedetail.CreatedAtLT(todayEnd))
+	yesterdayEnd := time.Now().Truncate(24 * time.Hour)
+	yesterdayStart := yesterdayEnd.AddDate(0, 0, -1)
+	predicates = append(predicates, usagedetail.CreatedAtGTE(yesterdayStart))
+	predicates = append(predicates, usagedetail.CreatedAtLT(yesterdayEnd))
+	logx.Info("yesterdayEnd: ", yesterdayEnd)
+	logx.Info("yesterdayStart: ", yesterdayStart)
+	//todayStart := time.Now().AddDate(0, 0, 0).Truncate(24 * time.Hour)
+	//todayEnd := todayStart.Add(24 * time.Hour)
+	//predicates = append(predicates, usagedetail.CreatedAtGTE(todayStart))
+	//predicates = append(predicates, usagedetail.CreatedAtLT(todayEnd))
 
 	data, err := l.svcCtx.DB.UsageDetail.Query().Where(predicates...).All(l.ctx)
 	logx.Info("usageDetails: ", data)

crontask/init.go

@@ -50,7 +50,7 @@ func ScheduleRun(c *cron.Cron, serverCtx *svc.ServiceContext) {
 	//})
 
 	contactForm := NewCronTask(context.Background(), serverCtx)
-	c.AddFunc("0 0 * * *", func() {
+	c.AddFunc("1 0 * * *", func() {
 		contactForm.analyze()
 	})
 

internal/service/MessageHandlers/talk_to_friend_task_result_notice.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	"wechat-api/ent/contact"
 	"wechat-api/internal/pkg/wechat_ws"
 	"wechat-api/internal/svc"
@@ -27,6 +28,7 @@ func (f *TalkToFriendTaskResultNoticeHandler) Handler(msg *wechat_ws.MsgJsonObje
 		if err != nil {
 			return err
 		}
+		logx.Info("msg.Message 的内容是：%s", message)
 
 		friendId, _ := f.svcCtx.Rds.Get(context.TODO(), fmt.Sprintf("MsgId_FriendId:%d", message.MsgId)).Result()
 
@@ -40,7 +42,6 @@ func (f *TalkToFriendTaskResultNoticeHandler) Handler(msg *wechat_ws.MsgJsonObje
 				Where(contact.WxWxidEQ(message.WeChatId), contact.WxidEQ(friendId)).
 				SetStatus(2).
 				Exec(context.TODO())
-
 			if err != nil {
 				return err
 			}