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/UserSystemCouponRecordServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
index 7ef530f..376059e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user;
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
@@ -8,15 +9,15 @@
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponRecordMapper;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
+import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
@Service
public class UserSystemCouponRecordServiceImpl implements UserSystemCouponRecordService {
-
+
@Resource
private UserSystemCouponRecordMapper userSystemCouponRecordMapper;
-
@Override
public int insertSelective(UserSystemCouponRecord record) {
return userSystemCouponRecordMapper.insertSelective(record);
@@ -38,13 +39,39 @@
}
@Override
- public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state) {
+ public List<UserSystemCouponRecord> getRecordByState(Long uid, Integer state) {
+ return userSystemCouponRecordMapper.getRecordByState(uid, state);
+ }
+
+ @Override
+ public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state) {
return userSystemCouponRecordMapper.getRecordByOrderNo(orderNo, state);
}
@Override
- public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list) {
- return userSystemCouponRecordMapper.getRecordByOrderNoList(list);
+ public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list) {
+ return userSystemCouponRecordMapper.getRecordByOrderNoList(source, list);
}
+ @Override
+ public boolean isSuccessMianDan(Integer source, String orderId) {
+ List<String> orderList = new ArrayList<>();
+ orderList.add(orderId);
+ List<UserSystemCouponRecord> list = getRecordByOrderNoList(source, orderList);
+ for (UserSystemCouponRecord record : list) {
+ if (record.getCouponType().equalsIgnoreCase(CouponTypeEnum.freeCoupon.name())
+ || record.getCouponType().equalsIgnoreCase(CouponTypeEnum.welfareFreeCoupon.name())
+ || record.getCouponType().equalsIgnoreCase(CouponTypeEnum.freeCouponBuy.name())) {
+ if (record.getState() == UserSystemCouponRecord.STATE_FREE_ON
+ || record.getState() == UserSystemCouponRecord.STATE_SUCCESS)
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) {
+ return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId);
+ }
}
--
Gitblit v1.8.0