diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java index ab6fe54a..b8f89811 100644 --- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java @@ -1,6 +1,7 @@ package cn.lili.event.impl; import cn.lili.event.*; +import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum; import cn.lili.modules.member.entity.dto.MemberPointMessage; import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage; import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum; @@ -171,27 +172,58 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, @Override public void memberWithdrawal(MemberWithdrawalMessage memberWithdrawalMessage) { - - //如果提现到余额 - if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) { - - //组织参数 - NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO(); - noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId()); - Map params = new HashMap<>(2); - params.put("income", memberWithdrawalMessage.getPrice().toString()); - noticeMessageDTO.setParameter(params); - noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS); - //发送提现申请成功消息 - noticeMessageService.noticeMessage(noticeMessageDTO); - - params.put("income", memberWithdrawalMessage.getPrice().toString()); - params.put("expenditure", "0"); - noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE); - noticeMessageDTO.setParameter(params); - //发送余额变动消息 - noticeMessageService.noticeMessage(noticeMessageDTO); + //如果提现状态为申请则发送申请提现站内消息 + if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.APPLY.name())){ + //如果提现到余额 + if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) { + NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO(); + noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId()); + noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_CREATE); + Map params = new HashMap<>(2); + params.put("price", memberWithdrawalMessage.getPrice().toString()); + noticeMessageDTO.setParameter(params); + //发送提现申请成功消息 + noticeMessageService.noticeMessage(noticeMessageDTO); + } } + //如果提现状态为通过则发送审核通过站内消息 + if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.PASS.name())){ + //如果提现到余额 + if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) { + //组织参数 + NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO(); + noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId()); + Map params = new HashMap<>(2); + params.put("income", memberWithdrawalMessage.getPrice().toString()); + noticeMessageDTO.setParameter(params); + noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS); + //发送提现成功消息 + noticeMessageService.noticeMessage(noticeMessageDTO); + + params.put("income", memberWithdrawalMessage.getPrice().toString()); + params.put("expenditure", "0"); + noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE); + noticeMessageDTO.setParameter(params); + //发送余额变动消息 + noticeMessageService.noticeMessage(noticeMessageDTO); + } + } + //如果提现状态为拒绝则发送审核拒绝站内消息 + if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.REFUSE.name())){ + //如果提现到余额 + if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) { + NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO(); + noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId()); + noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_ERROR); + Map params = new HashMap<>(2); + params.put("price", memberWithdrawalMessage.getPrice().toString()); + noticeMessageDTO.setParameter(params); + //发送提现申请成功消息 + noticeMessageService.noticeMessage(noticeMessageDTO); + } + } + + } diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java index cd8f927d..4752032f 100644 --- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java @@ -184,6 +184,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent { skuKeys.add(GoodsSkuService.getStockCacheKey(orderItem.getSkuId())); GoodsSku goodsSku = new GoodsSku(); goodsSku.setId(orderItem.getSkuId()); + goodsSku.setGoodsId(orderItem.getGoodsId()); //如果有促销信息 if (null != orderItem.getPromotionType() && null != orderItem.getPromotionId()) { //如果促销有库存信息 diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index b174144f..dc46f394 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -84,6 +84,7 @@ public class DistributionCashServiceImpl extends ServiceImpl implements NoticeMessageService { @Autowired - private MemberNoticeService memberNoticeService; + private MemberMessageService memberMessageService; @Override public IPage getMessageTemplate(PageVO pageVO, String type) { @@ -53,18 +54,19 @@ public class NoticeMessageServiceImpl extends ServiceImpl().eq(NoticeMessage::getNoticeNode, noticeMessageDTO.getNoticeMessageNodeEnum().getDescription().trim())); //如果通知类站内信开启的情况下 if (noticeMessage != null && noticeMessage.getNoticeStatus().equals(SwitchEnum.OPEN.name())) { - MemberNotice memberNotice = new MemberNotice(); - memberNotice.setMemberId(noticeMessageDTO.getMemberId()); - memberNotice.setTitle(noticeMessage.getNoticeTitle()); - memberNotice.setContent(noticeMessage.getNoticeContent()); + MemberMessage memberMessage = new MemberMessage(); + memberMessage.setMemberId(noticeMessageDTO.getMemberId()); + memberMessage.setTitle(noticeMessage.getNoticeTitle()); + memberMessage.setContent(noticeMessage.getNoticeContent()); //参数不为空,替换内容 if (noticeMessageDTO.getParameter() != null) { - memberNotice.setContent(replaceNoticeContent(noticeMessage.getNoticeContent(), noticeMessageDTO.getParameter())); + memberMessage.setContent(replaceNoticeContent(noticeMessage.getNoticeContent(), noticeMessageDTO.getParameter())); } else { - memberNotice.setContent(noticeMessage.getNoticeContent()); + memberMessage.setContent(noticeMessage.getNoticeContent()); } + memberMessage.setStatus(MessageStatusEnum.UN_READY.name()); //添加站内信 - memberNoticeService.save(memberNotice); + memberMessageService.save(memberMessage); } } catch (Exception e) { log.error("站内信发送失败:", e); diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index 7203e4d3..2f3cc026 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -140,7 +140,7 @@ public class AfterSaleServiceImpl extends ServiceImpl