From d2357693d74ec048ed19e483ea29f87d823cde5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 16:26:23 +0800
Subject: [PATCH] 资金明细添加京东，拼多多兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 82140ba..37ed7c5 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
@@ -20,6 +20,7 @@
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.Constant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
import com.yeshi.fanli.vo.money.UserMonthMoneyVO;
@@ -49,6 +50,7 @@
} else {// 绛涢�変簡鏃堕棿
list = userMoneyDetailMapper.selectByMaxCreateTime(uid, maxTime, 20);
}
+
if (list != null && list.size() > 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(list.get(0).getCreateTime().getTime());
@@ -104,6 +106,10 @@
}
if (list != null) {
+ // 閲嶆柊璁剧疆鏍囬
+ for (UserMoneyDetail md : list)
+ resetTitle(md);
+
if (userMoneyDetailId != null && list.size() > 0) {
UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);
if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")
@@ -167,6 +173,23 @@
return finalList;
}
+ private UserMoneyDetail resetTitle(UserMoneyDetail detail) {
+ UserMoneyDetailTypeEnum[] enums = new UserMoneyDetailTypeEnum[] { UserMoneyDetailTypeEnum.fanli,
+ UserMoneyDetailTypeEnum.fanliWeiQuan, UserMoneyDetailTypeEnum.invite,
+ UserMoneyDetailTypeEnum.inviteAndShare, UserMoneyDetailTypeEnum.inviteWeiQuan,
+ UserMoneyDetailTypeEnum.orderReward, UserMoneyDetailTypeEnum.repeatStatistic,
+ UserMoneyDetailTypeEnum.share, UserMoneyDetailTypeEnum.shareWeiQuan, UserMoneyDetailTypeEnum.weiQuan };
+ boolean inType = false;
+ for (UserMoneyDetailTypeEnum e : enums)
+ if (detail.getType() == e) {
+ inType = true;
+ break;
+ }
+ if (inType)
+ detail.setTitle(detail.getTitle() + "銆�" + Constant.getSourceName(detail.getOrderType()) + "銆�");
+ return detail;
+ }
+
@Override
public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {
long monthCount = 0L;
--
Gitblit v1.8.0