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/controller/client/v2/UserCouponControllerV2.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 9 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 917ecb9..5deb4c2 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
@@ -2,6 +2,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -13,7 +14,9 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
-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.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -22,9 +25,12 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
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;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.user.UserSystemCouponVO;
import net.sf.json.JSONObject;
@@ -66,10 +72,8 @@
@Resource
private UserInfoExtraService userInfoExtraService;
-
@Resource
- private UserLotteryRecordService userLotteryRecordService;
-
+ private UserVIPInfoService userVIPInfoService;
/**
* 鐢ㄦ埛鍒稿垪琛ㄦ煡璇�
@@ -95,7 +99,7 @@
JSONObject data = new JSONObject();
if (page == 1) {
// 绂忓埄涓績鍥剧墖
- List<SwiperPicture> listswiper = swiperPictureService.getByBannerCard("welfare_top_1.6.5");
+ List<BannerVO> 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);
@@ -104,7 +108,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>();
}
@@ -117,6 +121,26 @@
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
LogHelper.errorDetailInfo(e);
+ }
+
+ // 鏇存柊绂忓埄涓績鏈鏁伴噺
+ if (page == 1) {
+ try {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ // 鏈鍒告槸鍚﹀ぇ浜�0
+ if (userInfoExtra != null && userInfoExtra.getCouponNews() > 0) {
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
+ extra.setCouponNews(0);
+ userInfoExtraService.updateByPrimaryKeySelective(extra);
+ }
+ }
+ });
+ } catch (Exception e) {
+ }
}
}
@@ -139,11 +163,81 @@
return;
}
try {
- String tips = UserSystemCouponService.giveCoupon(uid, id);
- out.print(JsonUtil.loadTrueResult(tips));
+ UserSystemCouponVO vo = UserSystemCouponService.giveCoupon(uid, id);
+ JSONObject data = new JSONObject();
+ data.put("result", JsonUtil.getApiCommonGson().toJson(vo));
+ out.print(JsonUtil.loadTrueResult(data));
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
+
+
+ /**
+ * 鐢ㄦ埛濂栧姳鍒�
+ *
+ * @param acceptData
+ * @param page
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getOrderCouponList")
+ public void getOrderCouponList(String callback, AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {
+ if (uid == null || StringUtil.isNullOrEmpty(orderNo)) {
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("浼犻�掑弬鏁颁俊鎭笉瀹屾暣"));
+ return;
+ }
+
+ if (userVIPInfoService.isVIP(uid)) {
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("瓒呯骇浼氬憳涓嶅彲浣跨敤濂栧姳鍒�"));
+ return;
+ }
+
+ List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);
+ if (listOrder == null || listOrder.size() == 0) {
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("璁㈠崟鍙蜂笉瀛樺湪"));
+ return;
+ }
+
+ boolean valid = false;
+ long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
+ for (CommonOrder commonOrder: listOrder) {
+ Integer wholeOrder = commonOrder.getStateWholeOrder();
+ if (wholeOrder != null && CommonOrder.STATE_WHOLE_ORDER_SHIXIAO == wholeOrder) {
+ JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("鏁翠釜璁㈠崟宸插け鏁�"));
+ return;
+ }
+
+ Date thirdCreateTime = commonOrder.getThirdCreateTime();
+ if (thirdCreateTime != null && thirdCreateTime.getTime() > limitDate) {
+ valid = true; // 1.6.5涓婄嚎涔嬪悗涓嬪崟
+ }
+ }
+
+ try {
+
+ List<UserSystemCouponVO> resultList = null;
+ if (valid) {
+ resultList = UserSystemCouponService.getOrderCouponList(uid);
+ } else {
+ resultList = UserSystemCouponService.listIncludeNotExchange(uid);
+ }
+
+ if (resultList == null) {
+ resultList = new ArrayList<UserSystemCouponVO>();
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
+ data.put("count", resultList.size());
+ data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (UserSystemCouponException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
+ LogHelper.errorDetailInfo(e);
+ }
+ }
}
--
Gitblit v1.8.0