From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponGiveRecordServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponGiveRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponGiveRecordServiceImpl.java
index 2f0867e..3920f07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponGiveRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponGiveRecordServiceImpl.java
@@ -7,7 +7,9 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponGiveRecordMapper;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
@Service
@@ -16,6 +18,8 @@
@Resource
private UserSystemCouponGiveRecordMapper userSystemCouponGiveRecordMapper;
+ @Resource
+ private UserInfoService userInfoService;
@Override
public void insertSelective(UserSystemCouponGiveRecord record) {
@@ -51,4 +55,37 @@
public UserSystemCouponGiveRecord getByReceiveId(Long receiveId) {
return userSystemCouponGiveRecordMapper.getByReceiveId(receiveId);
}
+
+ @Override
+ public List<UserSystemCouponGiveRecord> listGiveRecord(long start, int count, String type, Integer state) {
+ List<UserSystemCouponGiveRecord> list = userSystemCouponGiveRecordMapper.listGiveRecord(start, count, type, state);
+ if (list == null || list.size() == 0)
+ return list;
+
+ for (UserSystemCouponGiveRecord giveRecord: list) {
+ UserInfo giveUser = userInfoService.selectByPKey(giveRecord.getGiveUid());
+ if (giveUser != null)
+ giveRecord.setGiveName(giveUser.getNickName());
+
+ Long receiveUid = giveRecord.getReceiveUid();
+ if (receiveUid == null)
+ continue;
+
+ UserInfo receiveUser = userInfoService.selectByPKey(receiveUid);
+ if (receiveUser != null)
+ giveRecord.setReceiveName(receiveUser.getNickName());
+ }
+ return list;
+ }
+
+
+ @Override
+ public long countGiveRecord(String type, Integer state) {
+ return userSystemCouponGiveRecordMapper.countGiveRecord(type, state);
+ }
+
+ @Override
+ public UserSystemCouponGiveRecord getByCouponId(Long couponId) {
+ return userSystemCouponGiveRecordMapper.getByCouponId(couponId);
+ }
}
--
Gitblit v1.8.0