Merge branch 'master' of https://code.fnuoos.com/EggPlanet/system_rules

rule/egg_energy/md/mq_im.go

@@ -3,7 +3,8 @@ package md
 const IMEggEnergyExchange = "im.egg.energy"
 
 const (
-	IMEggEnergyRoutKeyForBatchSendMessageData = "batch_send_message_data" // 批量发送信息
+	IMEggEnergyRoutKeyForBatchSendMessageData       = "batch_send_message_data"        // 批量发送信息
+	IMEggEnergyRoutKeyForDelFriendCircleCommentData = "del_friend_circle_comment_data" // 删除朋友圈评论
 )
 
 type IMEggEnergyStructForBatchSendMessageData struct {
@@ -13,3 +14,7 @@ type IMEggEnergyStructForBatchSendMessageData struct {
 	ReceiveIMId  int64  `json:"receive_id"`    // 接受者IM id
 	Content      string `json:"content"`       // 消息内容
 }
+
+type IMEggEnergyStructForDelFriendCircleCommentData struct {
+	CommentIndexId string `json:"comment_index_id"` // 文章索引
+}

rule/user_wallet.go

@@ -36,6 +36,7 @@ func DealUserWallet(session *xorm.Session, req md.DealUserWalletReq) (err error)
 		return err
 	}
 	amountValue := decimal.NewFromFloat(req.Amount).RoundFloor(4)
+	beforeAmountValue, _ := decimal.NewFromString(userAmount)
 
 	var userWalletFlow model.UserWalletFlow
 	userWalletFlow.Uid = req.Uid
@@ -47,10 +48,10 @@ func DealUserWallet(session *xorm.Session, req md.DealUserWalletReq) (err error)
 
 	if req.Direction == "add" {
 		userWalletFlow.Direction = 1
-		userWalletFlow.AfterAmount = amountValue.Add(amountValue).RoundFloor(8).String()
+		userWalletFlow.AfterAmount = beforeAmountValue.Add(amountValue).RoundFloor(8).String()
 	} else if req.Direction == "sub" {
 		userWalletFlow.Direction = 2
-		userWalletFlow.AfterAmount = amountValue.Sub(amountValue).RoundFloor(8).String()
+		userWalletFlow.AfterAmount = beforeAmountValue.Sub(amountValue).RoundFloor(8).String()
 		if zhios_order_relate_utils.StrToFloat64(userWalletFlow.AfterAmount) < 0 {
 			return errors.New("用户钱包余额不足")
 		}

svc/svc_es.go

@@ -14,8 +14,16 @@ func GetEggFriendCircleCommentEsIndexId(userId int64, circleId string) string {
 	return circleId + "_" + strconv.FormatInt(userId, 10) + "_" + egg_system_rules.Int64ToStr(time.Now().Unix())
 }
 
+func GetEggFriendCircleLikeEsIndex(userId int64) string {
+	return md.EggFriendCircleLikeEsIndex + GetUserIdSuffix(userId)
+}
+func GetEggFriendCircleLikeEsIndexId(userId int64, circleId string) string {
+	return circleId + "_" + strconv.FormatInt(userId, 10)
+}
+
 func GetUserIdSuffix(userId int64) string {
 	numberStr := strconv.FormatInt(userId, 10) // 将数字转换为字符串
 	lastChar := numberStr[len(numberStr)-1]    // 获取最后一个字符
-	return strconv.Itoa(int(lastChar))
+	//return strconv.Itoa(int(lastChar))  // 将 byte 类型的值隐式转换为 int
+	return string(lastChar)
 }