From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 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 9e8c2ac..77a822c 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;
@@ -15,6 +16,7 @@
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.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
@@ -27,6 +29,8 @@
import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.user.UserSystemCouponVO;
import net.sf.json.JSONObject;
@@ -106,7 +110,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>();
}
@@ -161,11 +165,78 @@
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", 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;
+ }
+
+
+ List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);
+ if (listOrder == null || listOrder.size() == 0) {
+ out.print(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) {
+ out.print(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("reward_coupon_help"));
+ data.put("count", resultList.size());
+ data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (UserSystemCouponException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
+ LogHelper.errorDetailInfo(e);
+ }
+ }
}
--
Gitblit v1.8.0