From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 30209f2..ab1a5d2 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
@@ -294,8 +294,8 @@
 		}
 		
 		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()));
@@ -365,7 +365,7 @@
 	 * @param uid
 	 * @param out
 	 */
-	@RequestMapping(value = "getLotteryCount")
+	// @RequestMapping(value = "getLotteryCount")
 	public void getLotteryCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
 		try {
 			// 1銆佸凡鐧诲綍绯荤粺
@@ -420,7 +420,7 @@
 	 * @param uid
 	 * @param out
 	 */
-	@RequestMapping(value = "getLotteryResult")
+	// @RequestMapping(value = "getLotteryResult")
 	public void getLotteryResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
 
 		try {
@@ -546,7 +546,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)));
@@ -565,7 +565,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