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/user/UserMoneyDetailServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
index 1032961..82140ba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
@@ -28,6 +29,13 @@
@Resource
private UserMoneyDetailMapper userMoneyDetailMapper;
+
+ @Override
+ public void addUserMoneyDetail(UserMoneyDetail detail) throws UserMoneyDetailException {
+ if (detail == null || detail.getMoney() == null || detail.getType() == null || detail.getUserInfo() == null)
+ throw new UserMoneyDetailException(1, "淇℃伅涓嶅畬鏁�");
+ userMoneyDetailMapper.insertSelective(detail);
+ }
@Override
public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {
@@ -96,7 +104,7 @@
}
if (list != null) {
- if (userMoneyDetailId != null&&list.size()>0) {
+ if (userMoneyDetailId != null && list.size() > 0) {
UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);
if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")
.equalsIgnoreCase(TimeUtil.getGernalTime(list.get(0).getCreateTime().getTime(), "yyyy-MM"))) {
@@ -199,4 +207,10 @@
return money == null ? new BigDecimal(0) : money;
}
+ @Override
+ public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,
+ Long sourceIdentifyId) {
+ return userMoneyDetailMapper.selectByTypeAndUidAndIdentifyCode(type, uid, sourceIdentifyId);
+ }
+
}
--
Gitblit v1.8.0