From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java | 52 +++++++++++-----------------------------------------
1 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
index 85c3359..adc2f7f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -4,76 +4,46 @@
import javax.annotation.Resource;
+import net.sf.json.JSONObject;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
-import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
-import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
@Controller
@RequestMapping("api/apph5/v1/share")
public class AppH5ShareController {
-
@Resource
- private UserShareGoodsGroupService userShareGoodsGroupService;
+ private UserShareGoodsRecordService userShareGoodsRecordService;
/**
- * 鍒嗕韩鍟嗗搧
+ * 鍒嗕韩鍟嗗搧璇︽儏
* @param callback
* @param shareId 鍒嗕韩id
* @param source 鏉ユ簮
* @param out
*/
@RequestMapping(value = "getDetail")
- public void getDetail(String callback, Long shareId, String source, PrintWriter out) {
+ public void getDetail(String callback, Long shareId, String source, String fingerprint, PrintWriter out) {
try {
if (shareId == null) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘")));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
- userShareGoodsGroupService.updateBrowseRecord(shareId, 1);
+ // 鑾峰彇鍟嗗搧淇℃伅
+ JSONObject data = userShareGoodsRecordService.getGoodsGroupDetail(shareId);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鏇存柊鎴愬姛")));
- } catch (UserShareGoodsRecordException e) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));
} catch (Exception e) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏇存柊澶辫触")));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
}
}
-
- /**
- * 鍒嗕韩鍟嗗搧
- * @param callback
- * @param shareId 鍒嗕韩id
- * @param source 鏉ユ簮
- * @param out
- */
- @RequestMapping(value = "record")
- public void query(String callback, Long shareId, String source, PrintWriter out) {
-
- try {
-
- if (shareId == null) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘")));
- return;
- }
-
- userShareGoodsGroupService.updateBrowseRecord(shareId, 1);
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鏇存柊鎴愬姛")));
- } catch (UserShareGoodsRecordException e) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));
- } catch (Exception e) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏇存柊澶辫触")));
- e.printStackTrace();
- }
- }
-
}
--
Gitblit v1.8.0