From df300df7832cc3d24f1b09297998e8bee8cfd126 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 20 八月 2019 18:06:43 +0800
Subject: [PATCH] 签到弹框bug
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
index 6e87300..5f6f6a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
@@ -13,6 +13,7 @@
import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;
import com.yeshi.fanli.entity.integral.IntegralExchangeRecord;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.integral.CodePublishRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
@@ -29,6 +30,11 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private CodePublishRecordService codePublishRecordService;
+
+
@Override
public List<IntegralExchange> listExchange(long start, int count, Long uid){
@@ -76,10 +82,17 @@
}
// 閭�璇风爜鍙戝竷鍗★紝鍏戞崲椤癸紝濡傛灉褰撳墠鐢ㄦ埛鏈縺娲婚個璇峰姛鑳斤紝鍒欎笉闇�瑕佹樉绀鸿鍏戞崲椤广��
- if (type == ExchangeTypeEnum.inviteCodePublish && !hasCode) {
- listValid.remove(i);
- i --;
- continue;
+ if (type == ExchangeTypeEnum.inviteCodePublish) {
+ if (!hasCode) {
+ listValid.remove(i);
+ i --;
+ continue;
+ }
+
+ if(codePublishRecordService.countValidRecord(uid) > 0) {
+ exchange.setBtnName("鍘绘煡鐪�");
+ exchange.setNeedJump(true);
+ }
}
String progress = exchange.getProgress();
--
Gitblit v1.8.0