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 | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 4f69a9a..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
@@ -23,9 +23,11 @@
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;
@@ -53,10 +55,10 @@
@Resource
private MonitorService monitorService;
-
+
@Resource
private UserShareGoodsRecordService userShareGoodsRecordService;
-
+
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
@@ -138,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());
@@ -164,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;
@@ -176,11 +183,13 @@
}
}
-
+
/**
* 鍒嗕韩璁板綍缁熻鍒楄〃
+ *
* @param acceptData
- * @param page 鍒濆1
+ * @param page
+ * 鍒濆1
* @param uid
* @param source
* @param out
@@ -195,6 +204,10 @@
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
}
+
+ if ("all".equals(source)) {
+ source = null;// 鏌ヨ鍏ㄩ儴
+ }
try {
int pageSize = Constant.PAGE_SIZE;
@@ -203,7 +216,7 @@
List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>();
long count = userShareGoodsRecordService.countQueryByUid(uid, source);
-
+
if (count > 0) {
list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source);
}
@@ -218,9 +231,9 @@
}
}
-
/**
* 鑾峰彇鍒嗕韩鍟嗗搧
+ *
* @param acceptData
* @param recordId
* @param out
@@ -233,16 +246,17 @@
}
try {
- JSONObject data = userShareGoodsGroupService.getGoodsGroup(recordId);
+ 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
@@ -262,7 +276,7 @@
userShareGoodsGroup.setUpdateTime(null);
userShareGoodsGroup.setRecordId(null);
}
-
+
JSONObject data = new JSONObject();
data.put("goodsData", userShareGoodsGroup);
out.print(JsonUtil.loadTrueResult(data));
@@ -271,6 +285,5 @@
e.printStackTrace();
}
}
-
}
--
Gitblit v1.8.0