From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
index 9d29dc7..1e8a31c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
@@ -17,7 +17,7 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.order.CommonOrder;
-import com.yeshi.fanli.exception.user.UserInfoExtraException;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -28,6 +28,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -76,6 +77,8 @@
@Resource
private UserLotteryRecordService userLotteryRecordService;
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
/**
* 鐢ㄦ埛鍒稿垪琛ㄦ煡璇�
@@ -101,7 +104,7 @@
JSONObject data = new JSONObject();
if (page == 1) {
// 绂忓埄涓績鍥剧墖
- List<SwiperPicture> listswiper = swiperPictureService.getByBannerCard("welfare_top_1.6.5");
+ List<SwiperPicture> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top_1.6.5",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (listswiper != null && listswiper.size() > 0) {
String topPicture = listswiper.get(0).getSrc();
data.put("topPicture", topPicture);
@@ -110,7 +113,7 @@
long count = UserSystemCouponService.countUserCouponList(uid);
- List<UserSystemCouponVO> resultList = UserSystemCouponService.getCouponList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+ List<UserSystemCouponVO> resultList = UserSystemCouponService.getCouponList(acceptData,(page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
if (resultList == null) {
resultList = new ArrayList<UserSystemCouponVO>();
}
@@ -127,14 +130,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);
}
-
}
});
}
@@ -185,12 +185,15 @@
*/
@RequestMapping(value = "getOrderCouponList", method = RequestMethod.POST)
public void getOrderCouponList(AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {
-
if (uid == null || StringUtil.isNullOrEmpty(orderNo)) {
out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁颁俊鎭笉瀹屾暣"));
return;
}
+ if (userVIPInfoService.isVIP(uid)) {
+ out.print(JsonUtil.loadFalseResult("瓒呯骇浼氬憳涓嶅彲浣跨敤濂栧姳鍒�"));
+ return;
+ }
List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);
if (listOrder == null || listOrder.size() == 0) {
@@ -227,7 +230,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));
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0