3 changed files with 10 additions and 10 deletions
Unified View
Diff Options
-
+6 -6app/svc/im/svc_send_message.go
-
+2 -2app/task/svc/svc_egg_energy_deal_fund_data.go
-
+2 -2app/task/svc/svc_egg_energy_deal_platform_revenue_data.go
+ 6
- 6
app/svc/im/svc_send_message.go
View File
| @@ -99,7 +99,7 @@ func DealGroupMessage(recordID int, req *md.BatchSendGroupMessageReq) { | |||||
| Content: req.Content, | Content: req.Content, | ||||
| } | } | ||||
| // 1.2 逐个推送到 mq | // 1.2 逐个推送到 mq | ||||
| ch.Publish(md2.IMEggEnergyExchange, data, md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| ch.Publish(md2.IMEggEnergyExchange, utils.SerializeStr(data), md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| // 1.3 记录推送的群ID | // 1.3 记录推送的群ID | ||||
| groupIDs = append(groupIDs, utils.Int64ToStr(groupWithOwner.GroupID)) | groupIDs = append(groupIDs, utils.Int64ToStr(groupWithOwner.GroupID)) | ||||
| } | } | ||||
| @@ -140,7 +140,7 @@ func DealGroupMessage(recordID int, req *md.BatchSendGroupMessageReq) { | |||||
| Content: req.Content, | Content: req.Content, | ||||
| } | } | ||||
| // 1.2 逐个推送到 mq | // 1.2 逐个推送到 mq | ||||
| ch.Publish(md2.IMEggEnergyExchange, data, md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| ch.Publish(md2.IMEggEnergyExchange, utils.SerializeStr(data), md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| groupIDs = sendCondition | groupIDs = sendCondition | ||||
| } | } | ||||
| } else if len(notCondition) != 0 && len(sendCondition) == 0 { | } else if len(notCondition) != 0 && len(sendCondition) == 0 { | ||||
| @@ -163,7 +163,7 @@ func DealGroupMessage(recordID int, req *md.BatchSendGroupMessageReq) { | |||||
| Content: req.Content, | Content: req.Content, | ||||
| } | } | ||||
| // 1.2 逐个推送到 mq | // 1.2 逐个推送到 mq | ||||
| ch.Publish(md2.IMEggEnergyExchange, data, md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| ch.Publish(md2.IMEggEnergyExchange, utils.SerializeStr(data), md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| // 1.3 记录推送的群ID | // 1.3 记录推送的群ID | ||||
| groupIDs = append(groupIDs, utils.Int64ToStr(groupUser.GroupId)) | groupIDs = append(groupIDs, utils.Int64ToStr(groupUser.GroupId)) | ||||
| } | } | ||||
| @@ -229,7 +229,7 @@ func DealUserMessage(recordID int, req *md.BatchSendUserMessageReq) { | |||||
| Content: req.Content, | Content: req.Content, | ||||
| } | } | ||||
| // 1.2 逐个推送到 mq | // 1.2 逐个推送到 mq | ||||
| ch.Publish(md2.IMEggEnergyExchange, data, md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| ch.Publish(md2.IMEggEnergyExchange, utils.SerializeStr(data), md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| // 1.3 记录推送的用户IM ID | // 1.3 记录推送的用户IM ID | ||||
| userIMIDs = append(userIMIDs, utils.Int64ToStr(customerServiceWithUser.UserIMID)) | userIMIDs = append(userIMIDs, utils.Int64ToStr(customerServiceWithUser.UserIMID)) | ||||
| } | } | ||||
| @@ -277,7 +277,7 @@ func DealUserMessage(recordID int, req *md.BatchSendUserMessageReq) { | |||||
| Content: req.Content, | Content: req.Content, | ||||
| } | } | ||||
| // 1.2 逐个推送到 mq | // 1.2 逐个推送到 mq | ||||
| ch.Publish(md2.IMEggEnergyExchange, data, md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| ch.Publish(md2.IMEggEnergyExchange, utils.SerializeStr(data), md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| // 1.3 记录推送的群ID | // 1.3 记录推送的群ID | ||||
| userIMIDs = append(userIMIDs, utils.Int64ToStr(customerServiceWithUser.UserIMID)) | userIMIDs = append(userIMIDs, utils.Int64ToStr(customerServiceWithUser.UserIMID)) | ||||
| } | } | ||||
| @@ -335,7 +335,7 @@ func DealUserMessage(recordID int, req *md.BatchSendUserMessageReq) { | |||||
| Content: req.Content, | Content: req.Content, | ||||
| } | } | ||||
| // 1.2 逐个推送到 mq | // 1.2 逐个推送到 mq | ||||
| ch.Publish(md2.IMEggEnergyExchange, data, md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| ch.Publish(md2.IMEggEnergyExchange, utils.SerializeStr(data), md2.IMEggEnergyRoutKeyForBatchSendMessageData) | |||||
| // 1.3 记录推送的用户IM ID | // 1.3 记录推送的用户IM ID | ||||
| userIMIDs = append(userIMIDs, utils.Int64ToStr(customerServiceWithUser.UserIMID)) | userIMIDs = append(userIMIDs, utils.Int64ToStr(customerServiceWithUser.UserIMID)) | ||||
| } | } | ||||
+ 2
- 2
app/task/svc/svc_egg_energy_deal_fund_data.go
View File
| @@ -79,9 +79,9 @@ func EggEnergyDealFundData(eg *xorm.Engine) { | |||||
| amount := totalAmount.Div(times) | amount := totalAmount.Div(times) | ||||
| // 4、推入rabbitmq 异步处理 | // 4、推入rabbitmq 异步处理 | ||||
| ch.Publish(md2.EggEnergyExchange, md2.EggEnergyStructForEggEnergyFundData{ | |||||
| ch.Publish(md2.EggEnergyExchange, utils.SerializeStr(md2.EggEnergyStructForEggEnergyFundData{ | |||||
| ID: data.Id, | ID: data.Id, | ||||
| Amount: amount.String(), | Amount: amount.String(), | ||||
| }, md2.EggEnergyRoutKeyForEggEnergyFundData) | |||||
| }), md2.EggEnergyRoutKeyForEggEnergyFundData) | |||||
| } | } | ||||
| } | } | ||||
+ 2
- 2
app/task/svc/svc_egg_energy_deal_platform_revenue_data.go
View File
| @@ -79,9 +79,9 @@ func EggEnergyDealPlatformRevenueData(eg *xorm.Engine) { | |||||
| amount := totalAmount.Div(times) | amount := totalAmount.Div(times) | ||||
| // 4、推入rabbitmq 异步处理 | // 4、推入rabbitmq 异步处理 | ||||
| ch.Publish(md2.EggEnergyExchange, md2.EggEnergyStructForPlatformRevenueData{ | |||||
| ch.Publish(md2.EggEnergyExchange, utils.SerializeStr(md2.EggEnergyStructForPlatformRevenueData{ | |||||
| ID: data.Id, | ID: data.Id, | ||||
| Amount: amount.String(), | Amount: amount.String(), | ||||
| }, md2.EggEnergyRoutKeyForPlatformRevenueData) | |||||
| }), md2.EggEnergyRoutKeyForPlatformRevenueData) | |||||
| } | } | ||||
| } | } | ||||