From 7e677e41ca9936169a1c7ad7c89318f04401be5f Mon Sep 17 00:00:00 2001
From: cdle <798731886@qq.com>
Date: Wed, 18 Aug 2021 12:12:37 +0800
Subject: [PATCH] x

---
 models/asset.go | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/models/asset.go b/models/asset.go
index 0785bb2..7f03940 100644
--- a/models/asset.go
+++ b/models/asset.go
@@ -72,11 +72,13 @@ func DailyAssetsPush() {
 
 func (ck *JdCookie) Query() string {
 	msgs := []string{
-		fmt.Sprintf("账号：%s", ck.Nickname),
+		fmt.Sprintf("账号昵称：%s", ck.Nickname),
 	}
 	asset := Asset{}
 	if CookieOK(ck) {
 		cookie := fmt.Sprintf("pt_key=%s;pt_pin=%s;", ck.PtKey, ck.PtPin)
+		var rpc = make(chan []RedList)
+		go redPacket(cookie, rpc)
 		today := time.Now().Local().Format("2006-01-02")
 		yestoday := time.Now().Local().Add(-time.Hour * 24).Format("2006-01-02")
 		page := 1
@@ -119,9 +121,8 @@ func (ck *JdCookie) Query() string {
 			fmt.Sprintf("今日支出：%d京豆", asset.Bean.TodayOut),
 		}...)
 		msgs = append(msgs, fmt.Sprintf("当前京豆：%v京豆", ck.BeanNum))
-		rps := redPacket(cookie)
 		ysd := int(time.Now().Add(24 * time.Hour).Unix())
-		if rps != nil {
+		if rps := <-rpc; len(rps) != 0 {
 			for _, rp := range rps {
 				b := Float64(rp.Balance)
 				asset.RedPacket.Total += b
@@ -153,14 +154,14 @@ func (ck *JdCookie) Query() string {
 				}
 			}
 			msgs = append(msgs, []string{
-				fmt.Sprintf("当前总红包：%.2f(今日总过期%.2f)元🧧", asset.RedPacket.Total, asset.RedPacket.ToExpire),
+				fmt.Sprintf("所有红包：%.2f(今日总过期%.2f)元🧧", asset.RedPacket.Total, asset.RedPacket.ToExpire),
 				fmt.Sprintf("京喜红包：%.2f(今日总过期%.2f)元🧧", asset.RedPacket.Jx, asset.RedPacket.ToExpireJx),
 				fmt.Sprintf("极速红包：%.2f(今日总过期%.2f)元🧧", asset.RedPacket.Js, asset.RedPacket.ToExpireJs),
 				fmt.Sprintf("健康红包：%.2f(今日总过期%.2f)元🧧", asset.RedPacket.Jk, asset.RedPacket.ToExpireJk),
 				fmt.Sprintf("京东红包：%.2f(今日总过期%.2f)元🧧", asset.RedPacket.Jd, asset.RedPacket.ToExpireJd),
 			}...)
 		} else {
-			msgs = append(msgs, "红包数据异常")
+			msgs = append(msgs, "暂无红包数据🧧")
 		}
 	} else {
 		msgs = append(msgs, []string{
@@ -210,7 +211,7 @@ type RedList struct {
 	OrgLimitStr  string `json:"orgLimitStr"`
 }
 
-func redPacket(cookie string) []RedList {
+func redPacket(cookie string, rpc chan []RedList) {
 	type UseRedInfo struct {
 		Count   int       `json:"count"`
 		RedList []RedList `json:"redList"`
@@ -228,7 +229,6 @@ func redPacket(cookie string) []RedList {
 		Errcode int    `json:"errcode"`
 		Msg     string `json:"msg"`
 	}
-
 	a := AutoGenerated{}
 	req := httplib.Get(`https://m.jingxi.com/user/info/QueryUserRedEnvelopesV2?type=1&orgFlag=JD_PinGou_New&page=1&cashRedType=1&redBalanceFlag=1&channel=1&_=` + fmt.Sprint(time.Now().Unix()) + `&sceneval=2&g_login_type=1&g_ty=ls`)
 	req.Header("User-Agent", ua)
@@ -239,11 +239,7 @@ func redPacket(cookie string) []RedList {
 	req.Header("Accept-Encoding", "gzip, deflate, br")
 	req.Header("Referer", "https://st.jingxi.com/my/redpacket.shtml?newPg=App&jxsid=16156262265849285961")
 	req.Header("Cookie", cookie)
-	data, err := req.Bytes()
-	fmt.Println(data, err)
-	if err != nil {
-		return nil
-	}
+	data, _ := req.Bytes()
 	json.Unmarshal(data, &a)
-	return a.Data.UseRedInfo.RedList
+	rpc <- a.Data.UseRedInfo.RedList
 }