From 1180be99c94b80d5fe9fea2877558fb29aa97427 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:21:02 +0800
Subject: [PATCH] 兼容拼多多、京东提交
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index a6a8faa..89fe5c6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -65,10 +65,18 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
+<<<<<<< HEAD
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.goods.MoneyInfoVO;
+import com.yeshi.fanli.vo.goods.OtherInfo;
+=======
import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
+>>>>>>> refs/remotes/origin/master
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.tlj.SpreadHongBao;
import com.yeshi.fanli.vo.tlj.TaoLiJinDetailVO;
import com.yeshi.fanli.vo.user.UserTaoLiJinRecordVO;
@@ -567,7 +575,100 @@
data.put("list", array);
out.print(JsonUtil.loadTrueResult(data));
}
+
+
+ /**
+ * 鍒嗕韩鐖嗘鍟嗗搧-闄愪簬娣樼ぜ閲�
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getShareGoodsV2", method = RequestMethod.POST)
+ public void getShareGoodsV2(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis());
+ List<ShareHotGoods> listHot = shareHotGoodsService.listByDay(day);
+ if (listHot == null) {
+ listHot = new ArrayList<ShareHotGoods>();
+ }
+
+
+ JSONArray array = new JSONArray();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
+ boolean isNewUser = userInfoExtraService.isNewUser(uid);
+ if (isNewUser) {
+ // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+ long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
+ if (countRecord > 0) {
+ isNewUser = false;
+ }
+ }
+
+
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ for (ShareHotGoods hotGoods : listHot) {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();
+ if (taoBaoGoodsBrief == null) {
+ continue;
+ }
+
+ // 璁＄畻鎺ㄥ箍绾㈠寘
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, taoBaoGoodsBrief);
+
+ // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
+ if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
+ continue;
+ }
+
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+ // 鍘绘帀鏍囩
+ detailVO.setLabels(null);
+
+ MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();
+ OtherInfo otherInfo = new OtherInfo();
+ SpreadHongBao spreadHongBao = new SpreadHongBao();
+
+ // 鏄剧ず绫诲瀷
+ if (isNewUser) {
+ moneyInfo.setMoneyType(1);
+ spreadHongBao.setName("鎺ㄥ箍绾㈠寘");
+ spreadHongBao.setMoney(" 楼1");
+ } else {
+ moneyInfo.setMoneyType(2);
+ spreadHongBao.setName("鎺ㄥ箍绾㈠寘");
+ spreadHongBao.setMoney(" 楼" + spreadMoney);
+ }
+ detailVO.setMoneyInfo(moneyInfo);
+ otherInfo.setSpreadHongBao(spreadHongBao);
+ detailVO.setOtherInfo(otherInfo);
+
+ array.add(gson.toJson(detailVO));
+ }
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ // 杩囨湡
+ userTaoLiJinOriginService.overdueHongBao(uid);
+ }
+ });
+
+ JSONObject data = new JSONObject();
+ data.put("count", array.size());
+ data.put("list", array);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
/**
* 鍒嗕韩鐖嗘鍟嗗搧-闄愪簬娣樼ぜ閲�
*
--
Gitblit v1.8.0