From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 56e6537..cdfa9df 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -30,7 +30,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SuperSpecial;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
@@ -126,6 +125,8 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -905,7 +906,7 @@
goods.put("zkPrice", tb.getZkPrice().toString());
BigDecimal proportion = manageService.getFanLiRate();
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);
goods.put("hongBao", hongBao);
// 30澶╅攢閲�
@@ -1206,10 +1207,10 @@
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20,
- Constant.SOURCE_TYPE_TAOBAO);
+ Constant.SOURCE_TYPE_TAOBAO, true);
long count = scanHistoryV2Service.getCountByDeviceOrUid(
StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
- Constant.SOURCE_TYPE_TAOBAO);
+ Constant.SOURCE_TYPE_TAOBAO, true);
JSONObject data = new JSONObject();
data.put("count", count);
@@ -1387,7 +1388,7 @@
TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods.getGoods(),
TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);
String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
- TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);
TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
vo.setLeft(goods.getLeftHongBaoCount());
vo.setMoney(hongBao);
@@ -1592,15 +1593,13 @@
return;
}
- List<SwiperPicture> listswiper = null;
+ List<BannerVO> listswiper = null;
if (!StringUtil.isNullOrEmpty(specialCard)) {
try {
-
listswiper = swiperPictureService.getByBannerCardAndVersion(swiperCard, acceptData.getPlatform(),
Integer.parseInt(acceptData.getVersion()));
-
if (listswiper == null) {
- listswiper = new ArrayList<SwiperPicture>();
+ listswiper = new ArrayList<BannerVO>();
}
} catch (Exception e) {
@@ -1609,16 +1608,14 @@
}
Special miaoShaSpecial = null;
- List<Special> honestList = new ArrayList<Special>();
- List<Special> specialList = new ArrayList<Special>();
+ List<SpecialVO> honestList = new ArrayList<SpecialVO>();
+ List<SpecialVO> specialList = new ArrayList<SpecialVO>();
if (!StringUtil.isNullOrEmpty(specialCard)) {
try {
- List<Special> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());
-
+ List<SpecialVO> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());
if (listSpecial != null && listSpecial.size() > 0) {
- for (Special special : listSpecial) {
-
+ for (SpecialVO special : listSpecial) {
if ("闄愭椂绉掓潃".equals(special.getName())) {
miaoShaSpecial = special;
continue;
@@ -1631,14 +1628,11 @@
// 鍏朵粬涓撻
specialList.add(special);
}
-
}
}
-
} catch (Exception e) {
e.printStackTrace();
}
-
}
/* 闄愭椂绉掓潃 - 鏃堕棿澶勭悊 */
@@ -1717,14 +1711,14 @@
JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
// 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> topPicList = getSwiperByCard("index_top", acceptData);
+ List<BannerVO> topPicList = getSwiperByCard("index_top", acceptData);
if (topPicList == null) {
- topPicList = new ArrayList<SwiperPicture>();
+ topPicList = new ArrayList<BannerVO>();
}
root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
// 3銆侀個璇锋湁濂�
- List<SwiperPicture> invitePicList = null;
+ List<BannerVO> invitePicList = null;
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
@@ -1733,7 +1727,7 @@
}
if (invitePicList == null) {
- invitePicList = new ArrayList<SwiperPicture>();
+ invitePicList = new ArrayList<BannerVO>();
}
root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));
@@ -1763,20 +1757,20 @@
* @param acceptData
* @return
*/
- public List<SwiperPicture> getInvitePicList(Long uid, AcceptData acceptData) {
+ public List<BannerVO> getInvitePicList(Long uid, AcceptData acceptData) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
return null;
}
- List<SwiperPicture> invitePicList = getSwiperByCard("index_invite", acceptData);
+ List<BannerVO> invitePicList = getSwiperByCard("index_invite", acceptData);
return invitePicList;
}
- public List<SwiperPicture> getSwiperByCard(String card, AcceptData acceptData) {
- List<SwiperPicture> swiperList = null;
+ public List<BannerVO> getSwiperByCard(String card, AcceptData acceptData) {
+ List<BannerVO> swiperList = null;
try {
swiperList = swiperPictureService.getByBannerCardAndVersion(card, acceptData.getPlatform(),
Integer.parseInt(acceptData.getVersion()));
@@ -2186,7 +2180,7 @@
BigDecimal proportion = manageService.getFanLiRate();
if ("taolijin".equalsIgnoreCase(from))
proportion = manageService.getTLJShareRate(System.currentTimeMillis());
- hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);
}
goodsJson.put("hongBao", hongBao);
@@ -2356,7 +2350,7 @@
fanliValid = true;
goodsJson.put("shareValid", false);
- String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
+ String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70),false).toString();
TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
vo.setLeft(buyGoods.getLeftHongBaoCount());
vo.setMoney(tljHongBao);
@@ -2555,23 +2549,21 @@
*/
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
- List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
+ List<SpecialVO> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
- List<Special> list = new ArrayList<Special>();
+ List<SpecialVO> list = new ArrayList<SpecialVO>();
if (listSpecial != null) {
list.addAll(listSpecial);
}
for (int i = 0; i < list.size(); i++) {
- Special special = list.get(i);
-
+ SpecialVO special = list.get(i);
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
jumpDetail.setNeedLogin(special.isJumpLogin());
special.setJumpDetail(jumpDetail);
}
-
String name = special.getName();
if (StringUtil.isNullOrEmpty(name)) {
continue;
--
Gitblit v1.8.0