From f54093a69938aca18ca6ba005e17afe5ee5bbfe6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 九月 2019 16:40:35 +0800
Subject: [PATCH] oppo推送绑定
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 6187852..acd520b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -42,13 +42,13 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.push.PushCouponRecordService;
@@ -56,10 +56,10 @@
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -666,6 +666,23 @@
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
+
+ @Override
+ public long countUsableRewardCoupon (Long uid) {
+ if (uid == null)
+ return 0;
+
+ List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
+ if (couponList == null || couponList.size() == 0)
+ return 0;
+
+ List<Long> listCouponId = new ArrayList<Long>();
+ for (SystemCoupon systemCoupon : couponList) {
+ listCouponId.add(systemCoupon.getId());
+ }
+
+ return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+ }
@Transactional
@@ -1752,6 +1769,7 @@
// 璁㈠崟鍒楄〃
jumpLink.put("state", "2"); // 宸叉敹璐�
+ jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
jumpLink.put("title", "杩斿埄璁㈠崟"); // 鏍囬鍚�
jumpLink.put("goodsType", "0"); // 璁㈠崟鏉ユ簮
@@ -1773,7 +1791,7 @@
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get("give_rebate_percent_coupon_tips");
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
@@ -2399,4 +2417,10 @@
return listCoupon;
}
+
+
+ @Override
+ public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+ return userSystemCouponMapper.getFreeCouponByType(uid, type);
+ }
}
--
Gitblit v1.8.0