From a70d35cd9a672deb0aed272c8209ddde096f917b Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 12 十二月 2018 10:25:08 +0800
Subject: [PATCH] 动态商品分享接口修改，添加新接口， 画图调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 128 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 124 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index 5bb5c89..7e9f714 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -9,29 +9,36 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.exception.ShareGoodsException;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
@Controller(value = "ShareController1")
@RequestMapping("api/v1/share")
@@ -48,6 +55,12 @@
@Resource
private MonitorService monitorService;
+
+ @Resource
+ private UserShareGoodsRecordService userShareGoodsRecordService;
+
+ @Resource
+ private UserShareGoodsGroupService userShareGoodsGroupService;
// 鑾峰彇鍟嗗搧鍒嗕韩閾炬帴
@RequestMapping(value = "getGoodsShareUrl")
@@ -127,7 +140,7 @@
data.put("notifyDesc", configService.get("goods_share_notify"));
// 娣诲姞鍒嗕韩璁板綍
- BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
UserShareGoodsHistory history = new UserShareGoodsHistory();
history.setTkCode(taoBaoLink.getTaoToken());
history.setLink(taoBaoLink.getClickUrl());
@@ -153,6 +166,11 @@
@Override
public void run() {
shareGoodsService.addShareGoodsHistory(history);
+ try {
+ userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, null,taoBaoLink.getGoods());
+ } catch (UserShareGoodsRecordException e) {
+ e.printStackTrace();
+ }
}
});
return;
@@ -166,4 +184,106 @@
}
+ /**
+ * 鍒嗕韩璁板綍缁熻鍒楄〃
+ *
+ * @param acceptData
+ * @param page
+ * 鍒濆1
+ * @param uid
+ * @param source
+ * @param out
+ */
+ @RequestMapping(value = "getlistrecord", method = RequestMethod.POST)
+ public void getListRecord(AcceptData acceptData, Integer page, Long uid, String source, PrintWriter out) {
+
+ if (page == null || page < 1) {
+ out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
+ }
+
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ }
+
+ if ("all".equals(source)) {
+ source = null;// 鏌ヨ鍏ㄩ儴
+ }
+
+ try {
+ int pageSize = Constant.PAGE_SIZE;
+
+ JSONObject data = new JSONObject();
+ List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();
+
+ long count = userShareGoodsRecordService.countQueryByUid(uid, source);
+
+ if (count > 0) {
+ list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);
+ }
+
+ data.put("count", count);
+ data.put("result_list", list);
+ out.print(JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鑾峰彇鍒嗕韩鍟嗗搧
+ *
+ * @param acceptData
+ * @param recordId
+ * @param out
+ */
+ @RequestMapping(value = "getrecordgoods", method = RequestMethod.POST)
+ public void getRecordGoods(AcceptData acceptData, Long recordId, PrintWriter out) {
+
+ if (recordId == null) {
+ out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�"));
+ }
+
+ try {
+ JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鑾峰彇鍒嗕韩鍟嗗搧鍗曚釜缁熻淇℃伅
+ *
+ * @param acceptData
+ * @param groupId
+ * @param out
+ */
+ @RequestMapping(value = "getgoodsdata", method = RequestMethod.POST)
+ public void getGoodsData(AcceptData acceptData, Long groupId, PrintWriter out) {
+
+ if (groupId == null) {
+ out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�"));
+ }
+
+ try {
+ UserShareGoodsGroup userShareGoodsGroup = userShareGoodsGroupService.selectByPrimaryKey(groupId);
+ if (userShareGoodsGroup != null) {
+ userShareGoodsGroup.setBrowseTime(null);
+ userShareGoodsGroup.setCreateTime(null);
+ userShareGoodsGroup.setUpdateTime(null);
+ userShareGoodsGroup.setRecordId(null);
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("goodsData", userShareGoodsGroup);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.8.0