From 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期六, 14 三月 2020 11:11:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
index 74d6dbd..f268907 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserLotteryRecord;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon;
-import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserLotteryRecordException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -105,7 +105,7 @@
// 绂忓埄涓績鍥剧墖
String topPicture = null;
if (page == 1) {
- List<SwiperPicture> listswiper = swiperPictureService.getByBannerCard("welfare_top");
+ List<SwiperPicture> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (listswiper != null && listswiper.size() > 0) {
topPicture = listswiper.get(0).getSrc();
}
@@ -144,14 +144,11 @@
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
// 鏈鍒告槸鍚﹀ぇ浜�0
if (userInfoExtra != null && userInfoExtra.getCouponNews() > 0) {
- userInfoExtra.setCouponNews(0);
- try {
- userInfoExtraService.saveUserInfoExtra(userInfoExtra);
- } catch (UserInfoExtraException e) {
- e.printStackTrace();
- }
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
+ extra.setCouponNews(0);
+ userInfoExtraService.updateByPrimaryKeySelective(extra);
}
-
}
});
}
@@ -188,11 +185,11 @@
}
JSONObject dataTip = new JSONObject();
- dataTip.put("content", configService.get("free_coupon_tip"));
+ dataTip.put("content", configService.get(ConfigKeyEnum.freeCouponTip.getKey()));
dataTip.put("fontColor", "#F14242");
JSONObject data = new JSONObject();
- data.put("helpLink", configService.get("free_coupon_help"));
+ data.put("helpLink", configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
data.put("tip", dataTip);
data.put("count", resultList.size());
data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
@@ -261,7 +258,7 @@
}
JSONObject data = new JSONObject();
- data.put("helpLink", configService.get("reward_coupon_help"));
+ data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
data.put("count", resultList.size());
data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
@@ -406,7 +403,7 @@
count = count - list.size();
}
// 鎶藉瑙勫垯
- String lotteryRule = configService.get("lottery_rule_newbies");
+ String lotteryRule = configService.get(ConfigKeyEnum.lotteryRuleNewbies.getKey());
JSONObject data = new JSONObject();
data.put("count", count);
--
Gitblit v1.8.0