diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java index 2c7c82e..4c63ad6 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/mq/constant/LeMqConstant.java @@ -103,7 +103,9 @@ public interface LeMqConstant { ROOM_ORDER_PRINT("order:room-order-print", "包间餐桌订单打印"), ACC_STATUS_CHANGE("acc:acc-status-change-queue", "账户状态变动记录"), ACC_TRADE_REPORT("acc:acc-trade-report-queue", "账户交易记录"), - ACC_DATA_CHANGE_ACC_STATUS("acc:data-change-acc-status", "账户交易记录"), + ACC_DATA_CHANGE_ACC_STATUS("acc:data-change-acc-status", "账户启用停用"), + ACC_DATA_CHANGE_ACC_BALANCE("acc:data-change-acc-balance", "账户钱包余额变动"), + ACC_DATA_TRAD_ACC_BALANCE("acc:data-trade-acc-balance", "H5下单账户钱包余额变动"), MENUAI_REGIST("menuai:menuai-regist", "菜品注册"), NOTICE_SUMMARY_COLLECT("notice:notice-summary-collect", "消息统计收集"), NOTICE_USER_BUSINESS_SEND("notice:notice-user-business-send", "通知发布"), diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java index d258862..4c41733 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mq/AccMqSender.java @@ -93,7 +93,7 @@ public class AccMqSender { log.info("账户状态变动发送mq内容：{}", jsonString); try { - MqUtil.send(jsonString, LeMqConstant.Topic.ACC_STATUS_CHANGE); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_STATUS); } catch (Exception e) { log.error("发送MQ消息失败：{}", jsonString, e); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index de5da3e..3cb4295 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -40,6 +40,7 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.constant.LeCodeUseSceneEnum; import com.bonus.common.houqin.constant.SourceTypeEnum; import com.bonus.common.houqin.mq.constant.LeMqConstant; +import com.bonus.common.houqin.utils.JacksonUtil; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.system.api.domain.SysUser; import com.bonus.common.houqin.utils.SM4EncryptUtils; @@ -396,6 +397,14 @@ public class AccInfoServiceImpl implements IAccInfoService { walletUpdateDTO.setPayChannelEnum(PayChannelEnum.GC_SYSTEM); walletUpdateDTO.setPayTypeEnum(PayTypeEnum.CASH); accWalletInfoService.addAccWalletBalance(walletUpdateDTO); + String jsonString = ""; + try { + jsonString = JacksonUtil.writeValueAsString(walletUpdateDTO); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } @Transactional( rollbackFor = {Exception.class} @@ -419,6 +428,14 @@ public class AccInfoServiceImpl implements IAccInfoService { walletUpdateDTO.setPayChannelEnum(PayChannelEnum.GC_SYSTEM); walletUpdateDTO.setPayTypeEnum(PayTypeEnum.MEAL_CARD); accWalletInfoService.clearAccWalletBalance(walletUpdateDTO); + String jsonString = ""; + try { + jsonString = JacksonUtil.writeValueAsString(walletUpdateDTO); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java index d21063c..33be572 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java @@ -17,9 +17,12 @@ import com.bonus.canteen.core.account.service.IAccInfoService; import com.bonus.canteen.core.account.service.IAccTradeService; import com.bonus.canteen.core.account.service.IAccWalletInfoService; import com.bonus.canteen.core.account.utils.AccRedisUtils; +import com.bonus.canteen.core.common.utils.MqUtil; import com.bonus.canteen.core.pay.constants.PayChannelEnum; import com.bonus.canteen.core.pay.constants.PayTypeEnum; import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.houqin.mq.constant.LeMqConstant; +import com.bonus.common.houqin.utils.JacksonUtil; import com.bonus.common.houqin.utils.SM4EncryptUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +75,14 @@ public class AccSubServiceImpl implements AccSubService { walletUpdateDTO.setPayChannelEnum(PayChannelEnum.GC_SYSTEM); walletUpdateDTO.setPayTypeEnum(PayTypeEnum.SUB_GRANT); accWalletInfoService.addAccWalletBalance(walletUpdateDTO); + String jsonString = ""; + try { + jsonString = JacksonUtil.writeValueAsString(walletUpdateDTO); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } @Transactional( rollbackFor = {Exception.class} @@ -83,6 +94,14 @@ public class AccSubServiceImpl implements AccSubService { } accInfoService.checkAccStatus(accInfoVO); clearAllAccSubsidyHandler(accInfoVO, param); + String jsonString = ""; + try { + jsonString = JacksonUtil.writeValueAsString(param); + log.info("账户清空补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } // private void clearAccSubsidyHandler(AccInfoDetailsVO accInfoVO, AccSubsidyClearParam param) { @@ -179,6 +198,14 @@ public class AccSubServiceImpl implements AccSubService { walletUpdateDTO.setPayChannelEnum(PayChannelEnum.GC_SYSTEM); walletUpdateDTO.setPayTypeEnum(PayTypeEnum.SUB_GRANT); accWalletInfoService.addAccWalletBalance(walletUpdateDTO); + String jsonString = ""; + try { + jsonString = JacksonUtil.writeValueAsString(walletUpdateDTO); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } catch (Exception ex) { log.error("批量补贴充值异常, 用户id: {}, 补贴金额：{}", accInfo.getUserId(), amount, ex); } @@ -208,6 +235,14 @@ public class AccSubServiceImpl implements AccSubService { param.setUserId(accInfo.getUserId()); param.setClearType(clearType); clearAllAccSubsidyHandler(accInfoVO, param); + String jsonString = ""; + try { + jsonString = JacksonUtil.writeValueAsString(param); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_CHANGE_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } catch (Exception var10) { log.error("批量清空补贴充值异常", var10); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index bbc4468..1c107a0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; import com.bonus.canteen.core.account.service.IAccInfoService; import com.bonus.canteen.core.account.service.IAccTradeService; import com.bonus.canteen.core.account.service.IAccWalletInfoService; +import com.bonus.canteen.core.common.utils.MqUtil; import com.bonus.canteen.core.common.utils.RedisUtil; import com.bonus.canteen.core.order.constants.OrderDetailStateEnum; import com.bonus.canteen.core.order.constants.OrderRefundStateEnum; @@ -29,6 +30,7 @@ import com.bonus.canteen.core.pay.constants.PayStateEnum; import com.bonus.canteen.core.pay.constants.PayTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.houqin.mq.constant.LeMqConstant; import com.bonus.common.houqin.utils.JacksonUtil; import com.bonus.common.security.utils.SecurityUtils; import org.slf4j.Logger; @@ -143,7 +145,16 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderPayResultDTO.setPayState(PayStateEnum.PAY_SUCC.getKey()); orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername()); orderInfoMapper.updateOrderPayResult(orderPayResultDTO); - + String jsonString = ""; + try { + OrderInfo mqOrderInfo = new OrderInfo(); + mqOrderInfo.setUserId(orderAddParam.getUserId()); + jsonString = JacksonUtil.writeValueAsString(mqOrderInfo); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_TRAD_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } return 1; } @@ -284,6 +295,16 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderDetail.setDetailState(OrderDetailStateEnum.REFUNDED.getKey()); orderDetailService.updateOrderDetail(orderDetail); } + String jsonString = ""; + try { + OrderInfo mqOrderInfo = new OrderInfo(); + mqOrderInfo.setUserId(orderInfo.getUserId()); + jsonString = JacksonUtil.writeValueAsString(mqOrderInfo); + log.info("账户新增补贴发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(jsonString, LeMqConstant.Topic.ACC_DATA_TRAD_ACC_BALANCE); + } catch (Exception e) { + log.error("发送MQ消息失败：{}", jsonString, e); + } } } }