feat: fixed bug for wechat bot to parse transactions. enable user to exchange reward with img_calls

api/core/types/config.go

@@ -159,6 +159,8 @@ type SystemConfig struct {
 	EnabledMsg       bool     `json:"enabled_msg"`         // 是否启用短信验证码服务
 	RewardImg        string   `json:"reward_img"`          // 众筹收款二维码地址
 	EnabledReward    bool     `json:"enabled_reward"`      // 启用众筹功能
+	ChatCallPrice    float64  `json:"chat_call_price"`     // 对话单次调用费用
+	ImgCallPrice     float64  `json:"img_call_price"`      // 绘图单次调用费用
 	EnabledAlipay    bool     `json:"enabled_alipay"`      // 是否启用支付宝支付通道
 	OrderPayTimeout  int      `json:"order_pay_timeout"`   //订单支付超时时间
 	DefaultModels    []string `json:"default_models"`      // 默认开通的 AI 模型
@@ -166,4 +168,5 @@ type SystemConfig struct {
 	InviteChatCalls  int      `json:"invite_chat_calls"`   // 邀请用户注册奖励对话次数
 	InviteImgCalls   int      `json:"invite_img_calls"`    // 邀请用户注册奖励绘图次数
 	ForceInvite      bool     `json:"force_invite"`        // 是否强制必须使用邀请码才能注册
+
 }

api/handler/admin/reward_handler.go

@@ -55,3 +55,16 @@ func (h *RewardHandler) List(c *gin.Context) {
 
 	resp.SUCCESS(c, rewards)
 }
+
+func (h *RewardHandler) Remove(c *gin.Context) {
+	id := h.GetInt(c, "id", 0)
+
+	if id > 0 {
+		res := h.db.Where("id = ?", id).Delete(&model.Reward{})
+		if res.Error != nil {
+			resp.ERROR(c, "更新数据库失败！")
+			return
+		}
+	}
+	resp.SUCCESS(c)
+}

api/handler/reward_handler.go

@@ -4,20 +4,24 @@ import (
 	"chatplus/core"
 	"chatplus/core/types"
 	"chatplus/store/model"
+	"chatplus/store/vo"
 	"chatplus/utils"
 	"chatplus/utils/resp"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
+	"math"
 	"strings"
+	"sync"
 )
 
 type RewardHandler struct {
 	BaseHandler
-	db *gorm.DB
+	db   *gorm.DB
+	lock sync.Mutex
 }
 
 func NewRewardHandler(server *core.AppServer, db *gorm.DB) *RewardHandler {
-	h := RewardHandler{db: db}
+	h := RewardHandler{db: db, lock: sync.Mutex{}}
 	h.App = server
 	return &h
 }
@@ -26,15 +30,25 @@ func NewRewardHandler(server *core.AppServer, db *gorm.DB) *RewardHandler {
 func (h *RewardHandler) Verify(c *gin.Context) {
 	var data struct {
 		TxId string `json:"tx_id"`
+		Type string `json:"type"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
 
+	user, err := utils.GetLoginUser(c, h.db)
+	if err != nil {
+		resp.HACKER(c)
+		return
+	}
+
 	// 移除转账单号中间的空格，防止有人复制的时候多复制了空格
 	data.TxId = strings.ReplaceAll(data.TxId, " ", "")
 
+	h.lock.Lock()
+	defer h.lock.Unlock()
+
 	var item model.Reward
 	res := h.db.Where("tx_id = ?", data.TxId).First(&item)
 	if res.Error != nil {
@@ -47,15 +61,17 @@ func (h *RewardHandler) Verify(c *gin.Context) {
 		return
 	}
 
-	user, err := utils.GetLoginUser(c, h.db)
-	if err != nil {
-		resp.HACKER(c)
-		return
-	}
-
 	tx := h.db.Begin()
-	calls := (item.Amount + 0.1) * 10
-	res = h.db.Model(&user).UpdateColumn("calls", gorm.Expr("calls + ?", calls))
+	exchange := vo.RewardExchange{}
+	if data.Type == "chat" {
+		calls := math.Ceil(item.Amount / h.App.SysConfig.ChatCallPrice)
+		exchange.Calls = int(calls)
+		res = h.db.Model(&user).UpdateColumn("calls", gorm.Expr("calls + ?", calls))
+	} else if data.Type == "img" {
+		calls := math.Ceil(item.Amount / h.App.SysConfig.ImgCallPrice)
+		exchange.ImgCalls = int(calls)
+		res = h.db.Model(&user).UpdateColumn("img_calls", gorm.Expr("img_calls + ?", calls))
+	}
 	if res.Error != nil {
 		resp.ERROR(c, "更新数据库失败！")
 		return
@@ -64,6 +80,7 @@ func (h *RewardHandler) Verify(c *gin.Context) {
 	// 更新核销状态
 	item.Status = true
 	item.UserId = user.Id
+	item.Exchange = utils.JsonEncode(exchange)
 	res = h.db.Updates(&item)
 	if res.Error != nil {
 		tx.Rollback()

api/main.go

@@ -57,13 +57,7 @@ func main() {
 	if configFile == "" {
 		configFile = "config.toml"
 	}
-	var debug bool
-	debugEnv := os.Getenv("DEBUG")
-	if debugEnv == "" {
-		debug = true
-	} else {
-		debug, _ = strconv.ParseBool(os.Getenv("DEBUG"))
-	}
+	debug, _ := strconv.ParseBool(os.Getenv("APP_DEBUG"))
 	logger.Info("Loading config file: ", configFile)
 	defer func() {
 		if err := recover(); err != nil {
@@ -282,6 +276,7 @@ func main() {
 		fx.Invoke(func(s *core.AppServer, h *admin.RewardHandler) {
 			group := s.Engine.Group("/api/admin/reward/")
 			group.GET("list", h.List)
+			group.GET("remove", h.Remove)
 		}),
 		fx.Invoke(func(s *core.AppServer, h *admin.DashboardHandler) {
 			group := s.Engine.Group("/api/admin/dashboard/")

api/service/wx/bot.go

@@ -6,6 +6,8 @@ import (
 	"github.com/eatmoreapple/openwechat"
 	"github.com/skip2/go-qrcode"
 	"gorm.io/gorm"
+	"os"
+	"strconv"
 )
 
 // 微信收款机器人
@@ -34,8 +36,13 @@ func (b *Bot) Run() error {
 	}
 	// scan code login callback
 	b.bot.UUIDCallback = b.qrCodeCallBack
-
-	err := b.bot.Login()
+	debug, err := strconv.ParseBool(os.Getenv("APP_DEBUG"))
+	if debug {
+		reloadStorage := openwechat.NewJsonFileHotReloadStorage("storage.json")
+		err = b.bot.HotLogin(reloadStorage, true)
+	} else {
+		err = b.bot.Login()
+	}
 	if err != nil {
 		return err
 	}
@@ -56,8 +63,8 @@ func (b *Bot) messageHandler(msg *openwechat.Message) {
 		msg.MsgType == openwechat.MsgTypeApp ||
 		msg.AppMsgType == openwechat.AppMsgTypeUrl {
 		// 解析支付金额
-		message, err := parseTransactionMessage(msg.Content)
-		if err == nil {
+		message := parseTransactionMessage(msg.Content)
+		if message.Url != "" {
 			transaction := extractTransaction(message)
 			logger.Infof("解析到收款信息：%+v", transaction)
 			var item model.Reward

api/service/wx/tranaction.go

@@ -2,17 +2,15 @@ package wx
 
 import (
 	"encoding/xml"
+	"net/url"
 	"strconv"
 	"strings"
 )
 
 // Message 转账消息
 type Message struct {
-	XMLName xml.Name `xml:"msg"`
-	AppMsg  struct {
-		Des string `xml:"des"`
-		Url string `xml:"url"`
-	} `xml:"appmsg"`
+	Des string
+	Url string
 }
 
 // Transaction 解析后的交易信息
@@ -23,20 +21,40 @@ type Transaction struct {
 }
 
 // 解析微信转账消息
-func parseTransactionMessage(xmlData string) (*Message, error) {
-	var msg Message
-	if err := xml.Unmarshal([]byte(xmlData), &msg); err != nil {
-		return nil, err
-	}
+func parseTransactionMessage(xmlData string) *Message {
+	decoder := xml.NewDecoder(strings.NewReader(xmlData))
+	message := Message{}
+	for {
+		token, err := decoder.Token()
+		if err != nil {
+			break
+		}
 
-	return &msg, nil
+		switch se := token.(type) {
+		case xml.StartElement:
+			var value string
+			if se.Name.Local == "des" && message.Des == "" {
+				if err := decoder.DecodeElement(&value, &se); err == nil {
+					message.Des = strings.TrimSpace(value)
+				}
+				break
+			}
+			if se.Name.Local == "weapp_path" && !strings.Contains(message.Url, "customerDetails.html") {
+				if err := decoder.DecodeElement(&value, &se); err == nil {
+					message.Url = strings.TrimSpace(value)
+				}
+				break
+			}
+		}
+	}
+	return &message
 }
 
 // 导出交易信息
 func extractTransaction(message *Message) Transaction {
 	var tx = Transaction{}
 	// 导出交易金额和备注
-	lines := strings.Split(message.AppMsg.Des, "\n")
+	lines := strings.Split(message.Des, "\n")
 	for _, line := range lines {
 		line = strings.TrimSpace(line)
 		if len(line) == 0 {
@@ -59,10 +77,9 @@ func extractTransaction(message *Message) Transaction {
 	}
 
 	// 解析交易 ID
-	index := strings.Index(message.AppMsg.Url, "trans_id=")
-	if index != -1 {
-		end := strings.LastIndex(message.AppMsg.Url, "&")
-		tx.TransId = strings.TrimSpace(message.AppMsg.Url[index+9 : end])
+	parse, err := url.Parse(message.Url)
+	if err == nil {
+		tx.TransId = parse.Query().Get("id")
 	}
 	return tx
 }

api/store/model/reward.go

@@ -4,9 +4,10 @@ package model
 
 type Reward struct {
 	BaseModel
-	UserId uint    // 用户 ID
-	TxId   string  // 交易ID
-	Amount float64 // 打赏金额
-	Remark string  // 打赏备注
-	Status bool    // 核销状态
+	UserId   uint    // 用户 ID
+	TxId     string  // 交易ID
+	Amount   float64 // 打赏金额
+	Remark   string  // 打赏备注
+	Status   bool    // 核销状态
+	Exchange string  // 众筹兑换详情，JSON
 }

api/store/vo/reward.go

@@ -2,10 +2,16 @@ package vo
 
 type Reward struct {
 	BaseVo
-	UserId   uint    `json:"user_id"` // 用户 ID
-	Username string  `json:"username"`
-	TxId     string  `json:"tx_id"`  // 交易ID
-	Amount   float64 `json:"amount"` // 打赏金额
-	Remark   string  `json:"remark"` // 打赏备注
-	Status   bool    `json:"status"` // 核销状态
+	UserId   uint           `json:"user_id"` // 用户 ID
+	Username string         `json:"username"`
+	TxId     string         `json:"tx_id"`  // 交易ID
+	Amount   float64        `json:"amount"` // 打赏金额
+	Remark   string         `json:"remark"` // 打赏备注
+	Status   bool           `json:"status"` // 核销状态
+	Exchange RewardExchange `json:"exchange"`
+}
+
+type RewardExchange struct {
+	Calls    int `json:"calls"`
+	ImgCalls int `json:"img_calls"`
 }

api/test/test.go

@@ -1,5 +1,5 @@
 package main
 
 func main() {
-
+	
 }