From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 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 7d91399..c3c7d61 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
@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.fasterxml.jackson.core.util.VersionUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
@@ -39,15 +40,17 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException;
+import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
@@ -55,11 +58,10 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -253,12 +255,13 @@
lastMonthUse = zero;
}
- // 闂彿閾炬帴
- String helpLink = configTaoLiJinService.getValueByKey("hongbao_help_link", null);
+ String giveMin = configTaoLiJinService.getValueByKey("give_min_amount");
JSONObject data = new JSONObject();
data.put("tlj", tlj.setScale(2).toString());
- data.put("helpLink", helpLink);
+ data.put("giveMin", giveMin);
+ data.put("giveTip", "娉�:璧犻�佹帹骞跨孩鍖呴噾棰濊嚦灏�" + giveMin + "鍏�");
+ data.put("helpLink", configTaoLiJinService.getValueByKey("hongbao_help_link"));
data.put("countShare", countShare);
data.put("todayWin", todayWin.setScale(2).toString());
data.put("yesterdayWin", yesterdayWin.setScale(2).toString());
@@ -601,11 +604,6 @@
*/
@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) {
@@ -644,6 +642,15 @@
}
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
+
+ // 澶т簬1.6.5鐨勬墠浼氭樉绀虹鍒╀环
+ if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (detailVO.getCouponPrice() != null && detailVO.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+ detailVO.setCouponPrice(detailVO.getCouponPrice().subtract(spreadMoney));
+ else
+ detailVO.setZkPrice(detailVO.getZkPrice().subtract(spreadMoney));
+ }
+
// 鍘绘帀鏍囩
detailVO.setLabels(null);
@@ -791,6 +798,15 @@
}
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, proportion, proportion);
+
+ // 澶т簬1.6.5鐨勬墠浼氭樉绀虹鍒╀环
+ if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (detailVO.getCouponPrice() != null && detailVO.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+ detailVO.setCouponPrice(detailVO.getCouponPrice().subtract(spreadMoney));
+ else
+ detailVO.setZkPrice(detailVO.getZkPrice().subtract(spreadMoney));
+ }
+
// 鍘绘帀鏍囩
detailVO.setLabels(null);
@@ -832,4 +848,27 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 璧犻�佹窐绀奸噾
+ *
+ * @param acceptData
+ * @param uid
+ * @param amount
+ * @param out
+ */
+ @RequestMapping(value = "giveTLJ", method = RequestMethod.POST)
+ public void giveTLJ(AcceptData acceptData, Long uid, BigDecimal amount, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ try {
+ String tips = userTaoLiJinRecordService.giveTaolijin(uid, amount);
+ out.print(JsonUtil.loadTrueResult(tips));
+ } catch (UserTaoLiJinRecordException e) {
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ }
+ }
+
}
--
Gitblit v1.8.0