From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 a227f4a..74d6dbd 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
@@ -31,6 +31,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.vo.user.UserSystemCouponRecordVO;
import com.yeshi.fanli.vo.user.UserSystemCouponVO;
@@ -78,7 +79,8 @@
@Resource
private UserLotteryRecordService userLotteryRecordService;
-
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
/**
* 鐢ㄦ埛鍒稿垪琛ㄦ煡璇�
@@ -119,13 +121,11 @@
changeJump = true;
}
- long count = 0;
+ long count = UserSystemCouponService.countCouponOld(uid);
List<UserSystemCouponVO> resultList = UserSystemCouponService
.getUserCouponVOList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, changeJump);
- if (resultList != null && resultList.size() > 0) {
- count = UserSystemCouponService.countUserCouponList(uid);
- } else if (resultList == null) {
+ if (resultList == null) {
resultList = new ArrayList<UserSystemCouponVO>();
}
@@ -291,13 +291,18 @@
return;
}
+ if (userVIPInfoService.isVIP(uid)) {
+ out.print(JsonUtil.loadFalseResult("瓒呯骇浼氬憳涓嶅彲浣跨敤濂栧姳鍒�"));
+ return;
+ }
+
if (goodsType == null || goodsType > 3 || goodsType < 1) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
try {
- UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType);
- JSONObject data = commonOrderService.getRewardJumpInfo(orderNo);
+ UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType, acceptData);
+ JSONObject data = commonOrderService.getRewardJumpInfo(orderNo, goodsType);
out.print(JsonUtil.loadTrueResult(data));
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -367,7 +372,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getLotteryCount")
+ // @RequestMapping(value = "getLotteryCount")
public void getLotteryCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
// 1銆佸凡鐧诲綍绯荤粺
@@ -422,7 +427,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getLotteryResult")
+ // @RequestMapping(value = "getLotteryResult")
public void getLotteryResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
@@ -548,7 +553,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getDailyCount")
+ // @RequestMapping(value = "getDailyCount")
public void getDailyCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(userLotteryRecordService.getLotteryCountDaily(uid)));
@@ -567,7 +572,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getDailyResult")
+ // @RequestMapping(value = "getDailyResult")
public void getDailyResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(userLotteryRecordService.executeLotteryDaily(uid)));
--
Gitblit v1.8.0