From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java | 69 +++++-----------------------------
1 files changed, 11 insertions(+), 58 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 cbb5482..058ca7d 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
@@ -8,10 +8,12 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.msg.MsgMoneyDetailMapper;
+import com.yeshi.fanli.entity.bus.msg.MsgExtra;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;
import com.yeshi.fanli.service.inter.money.msg.MsgMoneyDetailService;
+import com.yeshi.fanli.service.inter.msg.MsgExtraService;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.util.Constant;
@@ -23,6 +25,9 @@
@Resource
private UserMsgReadStateService userMsgReadStateService;
+
+ @Resource
+ private MsgExtraService msgExtraService;
@Override
public void addMsgMoneyDetail(MsgMoneyDetail detail) throws MsgMoneyDetailException {
@@ -38,6 +43,7 @@
detail.setUpdateTime(new Date());
detail.setRead(false);
msgMoneyDetailMapper.insertSelective(detail);
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} else {
MsgMoneyDetail update = new MsgMoneyDetail();
update.setId(msg.getId());
@@ -45,8 +51,8 @@
update.setRead(false);
update.setStateDesc(detail.getStateDesc());
msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
+ msgExtraService.updateMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
}
-
} else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractValid) {
if (detail.getAlipayAccountValid() == null || detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
@@ -57,6 +63,7 @@
detail.setUpdateTime(new Date());
detail.setRead(false);
msgMoneyDetailMapper.insertSelective(detail);
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
} else {
MsgMoneyDetail update = new MsgMoneyDetail();
update.setId(msg.getId());
@@ -64,70 +71,16 @@
update.setRead(false);
update.setStateDesc(detail.getStateDesc());
msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
+ msgExtraService.updateMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
}
-
- } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.fanli) {
- if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderId() == null
- || detail.getBalance() == null)
- throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
-
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setRead(false);
- msgMoneyDetailMapper.insertSelective(detail);
- } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.invite
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.share) {
- if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderCount() == null
- || detail.getBalance() == null)
+ } else {
+ if(detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
detail.setCreateTime(new Date());
detail.setUpdateTime(new Date());
detail.setRead(false);
msgMoneyDetailMapper.insertSelective(detail);
- } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.fanliWeiQuan
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.shareWeiQuan) {
- if (detail.getMoney() == null || detail.getOrderId() == null || detail.getBalance() == null)
- throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setRead(false);
- msgMoneyDetailMapper.insertSelective(detail);
- } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {
- if (detail.getMoney() == null || detail.getOrderId() == null || detail.getBalance() == null)
- throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setRead(false);
- msgMoneyDetailMapper.insertSelective(detail);
- } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {
- if (detail.getMoney() == null || detail.getOrderId() == null || detail.getBalance() == null)
- throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setRead(false);
- msgMoneyDetailMapper.insertSelective(detail);
- } 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) {
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setRead(false);
- msgMoneyDetailMapper.insertSelective(detail);
- } else {
- MsgMoneyDetail update = new MsgMoneyDetail();
- update.setId(msg.getId());
- update.setUpdateTime(new Date());
- update.setRead(false);
- update.setStateDesc(detail.getStateDesc());
- msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
- }
}
-
userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);
}
--
Gitblit v1.8.0