From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
index 241e5ab..f5cdcaf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
@@ -160,21 +160,23 @@
* @param acceptData
* @param page
* @param uid
+ * @param auctionId 鍟嗗搧id
* @param out
*/
@RequestMapping(value = "getGoodsCouponList", method = RequestMethod.POST)
- public void getGoodsCouponList(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getGoodsCouponList(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
try {
- List<UserSystemCouponVO> resultList = UserSystemCouponService.getGoodsCouponList(uid);
+ List<UserSystemCouponVO> resultList = UserSystemCouponService.getGoodsCouponList(uid, auctionId);
if (resultList == null ) {
resultList =new ArrayList<UserSystemCouponVO>();
}
+
JSONObject dataTip = new JSONObject();
dataTip.put("content", configService.get("free_coupon_tip"));
@@ -574,13 +576,6 @@
return prize;
}
-
-
- public static void main(String[] args) {
- long result = (1 + Math.round(Math.random() * (9)));
- System.out.println(result);
- }
-
/**
* 鑾峰彇鎶藉缁撴灉
@@ -631,7 +626,6 @@
}
userInfoExtra.setLotteryNewbies(count);
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-
} else {
count = lotteryNewbies; // 鍓╀綑娆℃暟
}
--
Gitblit v1.8.0