From 87a1f741ed6124f73789b0c105091c83cebf87b3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 13:55:55 +0800
Subject: [PATCH] 用户会员信息修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java | 272 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 179 insertions(+), 93 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
index 16fdff5..d15f34d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
@@ -19,19 +19,23 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.dynamic.CommentInfo;
import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.ImgInfo;
import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
+import com.yeshi.fanli.entity.dynamic.ListComment;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.manger.ClipboardAnalysisManager;
+import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -40,9 +44,9 @@
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
-import com.yeshi.fanli.util.jd.JDApiUtil;
-import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.msg.TokenVO;
+import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;
import net.sf.json.JSONObject;
@@ -74,6 +78,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+ private CommonGoods commonGoods;
+
+
/**
* 淇濆瓨淇℃伅
*
@@ -104,8 +111,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSingleGoods")
@@ -116,8 +122,11 @@
if (request instanceof MultipartHttpServletRequest) {
fileRequest = (MultipartHttpServletRequest) request;
}
- goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum, picUrls, fileRequest);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ String commentText = goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum,
+ picUrls, fileRequest);
+ JSONObject object = new JSONObject();
+ object.put("comment", commentText);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
@@ -126,54 +135,12 @@
}
}
- /**
- * 淇濆瓨淇℃伅
- *
- * @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
- * @param out
- */
- @RequestMapping(value = "saveGoodsCoupon")
- public void saveGoodsCoupon(String callback, String pid, String content, PrintWriter out) {
- try {
- goodsEvaluateService.saveGoodsCoupon(pid, content);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (GoodsEvaluateException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 淇濆瓨淇℃伅
- *
- * @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
- * @param out
- */
- @RequestMapping(value = "saveSingleGoodsCoupon")
- public void saveSingleGoodsCoupon(String callback, String pid, CommentInfo commentInfo, PrintWriter out) {
- try {
- goodsEvaluateService.saveSingleGoodsCoupon(pid, commentInfo);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (GoodsEvaluateException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
- }
- }
-
+
/**
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSingleGoodsinfo")
@@ -220,13 +187,98 @@
e.printStackTrace();
}
}
+
+ /**
+ *
+ * @param callback
+ * @param comments
+ * @param out
+ */
+ @RequestMapping(value = "saveGoodsComment")
+ public void saveGoodsComment(String callback, String id, int kind, ListComment comments, PrintWriter out) {
+ try {
+ if (StringUtil.isNullOrEmpty(id)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰厛淇濆瓨鎺ㄨ崘璇俊鎭�"));
+ return;
+ }
+ if (comments == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏂囨湰鍐呭涓虹┖"));
+ return;
+ }
+ goodsEvaluateService.saveGoodsComment(id, kind, comments.getComment());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛"));
+ } catch (GoodsEvaluateException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ *
+ * @param callback
+ * @param comments
+ * @param out
+ */
+ @RequestMapping(value = "getGoodsComment")
+ public void getGoodsComment(String callback, String id, PrintWriter out) {
+ try {
+ if (StringUtil.isNullOrEmpty(id)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰厛淇濆瓨鎺ㄨ崘璇俊鎭�"));
+ return;
+ }
+
+ List<CommentInfo> newList = new ArrayList<>();
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
+ if (goodsEvaluate != null) {
+ List<CommentInfo> comments = goodsEvaluate.getComments();
+ if (comments != null && comments.size() > 0) {
+ for (CommentInfo commentInfo : comments) {
+ CommentInfoEnum typeEnum = commentInfo.getTypeEnum();
+ if (typeEnum == CommentInfoEnum.goodsCoupon) {
+ newList.add(commentInfo);
+ }
+ }
+ }
+ }
+ JSONObject data = new JSONObject();
+ data.put("list", newList);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 淇濆瓨淇℃伅
+ *
+ * @param callback
+ * @param pid
+ * @param kind : 1鍗曞搧 2澶氬搧 3娲诲姩
+ * @param out
+ */
+ @RequestMapping(value = "saveCurrencyCoupon")
+ public void saveCurrencyCoupon(String callback, String pid, int kind, CommentInfo commentInfo, PrintWriter out) {
+ try {
+ goodsEvaluateService.saveCurrencyCoupon(pid, kind, commentInfo);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (GoodsEvaluateException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
/**
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getCurrencyCoupon")
@@ -251,37 +303,12 @@
e.printStackTrace();
}
}
+
- /**
- * 鑾峰彇淇℃伅
- *
- * @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
- * @param out
- */
- @RequestMapping(value = "getSingleGoodsCoupon")
- public void getSingleGoodsCoupon(String callback, String pid, PrintWriter out) {
- try {
- CommentInfo commentInfo = new CommentInfo();
- if (!StringUtil.isNullOrEmpty(pid)) {
- GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
- if (goodsEvaluate != null && goodsEvaluate.getComments() != null
- && goodsEvaluate.getComments().size() > 0) {
- for (CommentInfo info : goodsEvaluate.getComments()) {
- if (info != null)
- if (CommentInfoEnum.goodsCoupon == info.getTypeEnum()) {
- commentInfo = info;
- }
- }
- }
- }
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(commentInfo));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
- e.printStackTrace();
- }
- }
+
+
+
+
/**
* 淇濆瓨澶氫釜鍟嗗搧
@@ -303,8 +330,12 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ LogHelper.test(e);
}
}
+
+
/**
* 鑾峰彇澶氫釜鍟嗗搧淇℃伅
@@ -353,8 +384,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveActivityPic")
@@ -379,8 +409,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getActivityPic")
@@ -421,8 +450,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSuCai")
@@ -440,6 +468,8 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ LogHelper.test(e);
}
}
@@ -447,8 +477,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSuCaiPic")
@@ -489,7 +518,6 @@
}
}
-
/**
* 淇濆瓨淇℃伅
*
@@ -675,7 +703,11 @@
@RequestMapping(value = "getGoodsByUrl")
public void getGoodsByUrl(String callback, String link, PrintWriter out) {
try {
- CommonGoods commonGoods = clipboardAnalysisManager.parseLink(link);
+ //CommonGoods commonGoods = clipboardAnalysisManager.parseLink(link);
+ // 鏍规嵁鍙ｄ护閾炬帴鑾峰彇鍟嗗搧
+ getGoods(link);
+
+ CommonGoods commonGoods = getCommonGoods();
if (commonGoods == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈壘鍒拌鍟嗗搧"));
return;
@@ -683,12 +715,26 @@
GoodsDetailVO goodsDetail = null;
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
- BigDecimal vipFanLiRate = hongBaoManageService.getVIPFanLiRate();
+ BigDecimal vipFanLiRate = hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP);
ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, vipFanLiRate);
if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
try {
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
+ String pictUrlWhite = goodsBrief.getPictUrlWhite();
+ if (!StringUtil.isNullOrEmpty(pictUrlWhite)) {
+ goodsBrief.setPictUrl(pictUrlWhite);
+
+ List<String> picList = new ArrayList<>();
+ picList.add(pictUrlWhite);
+
+ List<String> imgList = goodsBrief.getImgList();
+ if (imgList != null) {
+ picList.addAll(imgList);
+ }
+ goodsBrief.setImgList(picList);
+ }
+
goodsDetail = GoodsDetailVOFactory.convertTaoBao(goodsBrief, params);
} catch (TaobaoGoodsDownException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
@@ -716,7 +762,37 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
+ } finally {
+ setCommonGoods(null);
}
+
+ }
+
+ private void getGoods(String text) {
+ Long uid = Constant.LINK_TOKEN_VERIFY_UID;
+ clipboardAnalysisManager.parse("android", "55", text, uid, new IClipboardAnalysisResult() {
+ @Override
+ public void onResult(GoodsDocParseResultVO result) {}
+
+ @Override
+ public void onResult(String result) {}
+
+ @Override
+ public void onResult(CommonGoods goods) {
+ setCommonGoods(goods);
+ }
+
+ @Override
+ public void onResult(TokenVO tokenVO) {
+ }
+ @Override
+ public void none() {
+ }
+
+ @Override
+ public void needLogin(String msg) {
+ }
+ });
}
/**
@@ -835,4 +911,14 @@
}
}
+ public CommonGoods getCommonGoods() {
+ return commonGoods;
+ }
+
+ public void setCommonGoods(CommonGoods commonGoods) {
+ this.commonGoods = commonGoods;
+ }
+
+
+
}
--
Gitblit v1.8.0