From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 058ca7d..eedaf76 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
@@ -16,6 +16,7 @@
import com.yeshi.fanli.service.inter.msg.MsgExtraService;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class MsgMoneyDetailServiceImpl implements MsgMoneyDetailService {
@@ -31,10 +32,10 @@
@Override
public void addMsgMoneyDetail(MsgMoneyDetail detail) throws MsgMoneyDetailException {
- if (detail == null)
- throw new MsgMoneyDetailException(1, "娑堟伅涓虹┖");
+ if (detail == null || detail.getUser() == null || StringUtil.isNullOrEmpty(detail.getExtraInfo()))
+ throw new MsgMoneyDetailException(1, "娑堟伅淇℃伅涓嶅叏");
if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extract) {
- if (detail.getExtract() == null || detail.getUser() == null)
+ if (detail.getExtract() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getExtract().getId(),
MsgTypeMoneyTypeEnum.extract);
@@ -51,10 +52,10 @@
update.setRead(false);
update.setStateDesc(detail.getStateDesc());
msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
- msgExtraService.updateMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
+ msgExtraService.addMsgExtra(update.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
}
} else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractValid) {
- if (detail.getAlipayAccountValid() == null || detail.getUser() == null)
+ if (detail.getAlipayAccountValid() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getAlipayAccountValid().getId(),
MsgTypeMoneyTypeEnum.extractValid);
@@ -71,15 +72,14 @@
update.setRead(false);
update.setStateDesc(detail.getStateDesc());
msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
- msgExtraService.updateMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
+ msgExtraService.addMsgExtra(update.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
}
} else {
- if(detail.getUser() == null)
- throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
detail.setCreateTime(new Date());
detail.setUpdateTime(new Date());
detail.setRead(false);
msgMoneyDetailMapper.insertSelective(detail);
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);
}
userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);
}
@@ -99,4 +99,15 @@
msgMoneyDetailMapper.setMsgReadByUid(uid);
}
+
+ @Override
+ public MsgMoneyDetail selectByPrimaryKey(Long id) {
+ return msgMoneyDetailMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void deleteByPrimaryKey(Long id) {
+ msgMoneyDetailMapper.deleteByPrimaryKey(id);
+ msgExtraService.deleteByPidAndType(id, MsgExtra.MSG_TYPE_MONEY);
+ }
}
--
Gitblit v1.8.0