From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java
index 5a368cd..c8f84b5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java
@@ -12,12 +12,17 @@
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;
import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;
+import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
+import com.yeshi.fanli.util.Constant;
@Service
public class MsgMoneyDetailServiceImpl implements MsgMoneyDetailService {
@Resource
private MsgMoneyDetailMapper msgMoneyDetailMapper;
+
+ @Resource
+ private UserMsgReadStateService userMsgReadStateService;
@Override
public void addMsgMoneyDetail(MsgMoneyDetail detail) throws MsgMoneyDetailException {
@@ -43,9 +48,9 @@
}
} else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractValid) {
- if (detail.getExtract() == null || detail.getUser() == null)
+ if (detail.getAlipayAccountValid() == null || detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
- MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getExtract().getId(),
+ MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getAlipayAccountValid().getId(),
MsgTypeMoneyTypeEnum.extractValid);
if (msg == null) {
detail.setCreateTime(new Date());
@@ -62,8 +67,8 @@
}
} else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.fanli) {
- if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderCount() == null
- || detail.getOrderId() == null || detail.getBalance() == null)
+ if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderId() == null
+ || detail.getBalance() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
detail.setCreateTime(new Date());
@@ -79,17 +84,47 @@
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);
}
+
+ userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);
}
@Override
public List<MsgMoneyDetail> listMsgMoneyDetail(Long uid, int page) {
- return null;
+ return msgMoneyDetailMapper.listByUid(uid, (page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE);
}
@Override
public long countMsgMoneyDetail(Long uid) {
- return 0;
+ return msgMoneyDetailMapper.countByUid(uid);
+ }
+
+ @Override
+ public void readMsgByUid(Long uid) {
+ msgMoneyDetailMapper.setMsgReadByUid(uid);
}
}
--
Gitblit v1.8.0