From d085ca89e39b4cda025a9a53d3797fbe8b242ae7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 21 十月 2019 17:11:30 +0800
Subject: [PATCH] 订单补偿 +  奖励券使用倒计时

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
index f2218ca..1e7555d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
@@ -26,7 +26,7 @@
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.user.UserGoodsStorageException;
 import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
@@ -67,13 +67,8 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "accordtorage", method = RequestMethod.POST)
-	public void accordtorage(AcceptData acceptData, Long uid, Long id, Integer goodsType, PrintWriter out) {
+	public void accordtorage(AcceptData acceptData, Long uid, long id, Integer goodsType, PrintWriter out) {
 
-		if (id == null) {
-			out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
-			return;
-		}
-		
 		if (uid == null) {
 			out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
 			return;
@@ -100,7 +95,6 @@
 			JSONObject data = new JSONObject();
 			data.put("storageState", storageState);
 			out.print(JsonUtil.loadTrueResult(data));
-
 		} catch (Exception e) {
 			out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
 			e.printStackTrace();

--
Gitblit v1.8.0