bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-04-18 10:04:57 +08:00
parent c4210a8db9 d09254f0bb
commit c845f5f0ca
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
View File

@ -324,7 +324,14 @@ public class AccInfoServiceImpl implements IAccInfoService {
.eq(AccInfo::getUserId, accountEnableDisableParam.getUserId())); .eq(AccInfo::getUserId, accountEnableDisableParam.getUserId()));
if (flag > 0) { if (flag > 0) {
this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccStatus().intValue()); this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccStatus().intValue());
this.accMqSender.accChangeMQ(Collections.singletonList(accountEnableDisableParam.getUserId()), accountEnableDisableParam.getAccStatus().intValue()); try {
DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(accountEnableDisableParam.getUserId()),"update");
String jsonString = JacksonUtil.writeValueAsString(bean);
log.info("账户变动发送mq内容：{}", jsonString);
MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4);
} catch (Exception e) {
log.error("发送MQ消息失败", e);
}
} }
} }

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java
View File

@ -176,8 +176,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService
} }
String payOrderKey = String.format("sc:order_pay_orderId_%s", orderId); String payOrderKey = String.format("sc:order_pay_orderId_%s", orderId);
if (!RedisUtil.setNx(payOrderKey, 1, 2)) { if (!RedisUtil.setNx(payOrderKey, 1, 2)) {
log.info("退单处理中：{}", payOrderKey); log.info("支付处理中：{}", payOrderKey);
throw new ServiceException("退单处理中"); throw new ServiceException("支付处理中");
} }
if(orderInfo.getOrderState().equals(OrderRefundStateEnum.FINISH.getKey())) { if(orderInfo.getOrderState().equals(OrderRefundStateEnum.FINISH.getKey())) {
throw new ServiceException("订单已退"); throw new ServiceException("订单已退");