From 50361d9b29962f66b05df0732820840c6531f84f Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 29 十月 2019 14:23:27 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java index 6dac116..2b3b737 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java @@ -110,7 +110,7 @@ } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractAutoWX) { if (detail.getMoney() == null || detail.getUser() == null) throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏"); - + MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getExtract().getId(), MsgTypeMoneyTypeEnum.extractAutoWX); if (msg == null) { @@ -135,6 +135,13 @@ detail.setUpdateTime(new Date()); detail.setRead(false); msgMoneyDetailMapper.insertSelective(detail); + } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.subSidy) { + if (detail.getMoney() == null || detail.getUser() == null) + throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏"); + detail.setCreateTime(new Date()); + detail.setUpdateTime(new Date()); + detail.setRead(false); + msgMoneyDetailMapper.insertSelective(detail); } userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1); -- Gitblit v1.8.0