From 0bd09a6935dd3abaf6b02b0b58b63b5d307a5dee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 十月 2019 10:19:35 +0800
Subject: [PATCH] 饿了么修改，微信支付统一下单修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index 0bab96c..4d57580 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -1,10 +1,13 @@
package com.yeshi.fanli.service.impl.dynamic;
+import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import javax.annotation.Resource;
@@ -40,7 +43,7 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
@@ -145,7 +148,7 @@
buffer.append(" ");
buffer.append("鏃╁畨锝瀄n");
buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
- buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
+ buffer.append("璐墿鐪侀挶鏉挎牀蹇渷App锛氥�愰個璇烽摼鎺ャ��");
content = content.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�").replaceAll("\\;", "\\锛�")
.replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
@@ -269,6 +272,9 @@
if (StringUtil.isNullOrEmpty(shopLink)) {
taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));
}
+
+ if(StringUtil.isNullOrEmpty(taoBaoShop.getShopIcon()))
+ taoBaoShop.setShopIcon(dynamicShopInfo.getShopIcon());
DynamicInfo dynamicVO = new DynamicInfo();
dynamicVO.setId(brandId);
@@ -916,6 +922,37 @@
return list;
}
+ private Map<Long, TaoBaoGoodsBrief> getFilterGoodsMap(List<DynamicInfo> list) {
+ // 鎻愬彇杩囨护鍟嗗搧
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ for (DynamicInfo dynamicInfo : list) {
+ List<GoodsPicture> gpList = dynamicInfo.getImgs();
+ if (gpList != null)
+ for (GoodsPicture gp : gpList) {
+ if (gp != null && gp.getGoods() != null) {
+ TaoBaoGoodsBriefExtra newGoods = new TaoBaoGoodsBriefExtra();
+ try {
+ PropertyUtils.copyProperties(newGoods, gp.getGoods());
+ goodsList.add(newGoods);
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+ }
+ goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
+ Map<Long, TaoBaoGoodsBrief> map = new HashMap<>();
+ if (goodsList != null)
+ for (TaoBaoGoodsBrief goods : goodsList)
+ map.put(goods.getAuctionId(), goods);
+ return map;
+ }
+
@Override
@Cacheable(value = "dynamicCache", key = "'queryV2-'+#platform+'-'+#version+'-'+#start+'-'+#count+'-'+#cid+'-'+#subId")
public List<DynamicInfo> queryV2(int platform, int version, int start, int count, Long cid, Long subId) {
@@ -924,6 +961,9 @@
// 闇�瑕佹洿鏂扮殑鍟嗗搧
List<TaoBaoGoodsBrief> taoBaoGoodsUpdateList = new ArrayList<>();
if (list != null && list.size() > 0) {
+ // 鎻愬彇鍟嗗搧
+ Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterGoodsMap(list);
+
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
for (DynamicInfo dynamicInfo : list) {
@@ -974,8 +1014,15 @@
continue;
}
+ // 杩囨护鍒镐俊鎭笌璧勯噾淇℃伅
+ goods.setCouponAmount(goodsMap.get(goods.getAuctionId()).getCouponAmount());
+ goods.setZkPrice(goodsMap.get(goods.getAuctionId()).getZkPrice());
+ goods.setCouponStartFee(goodsMap.get(goods.getAuctionId()).getCouponStartFee());
+ goods.setTkRate(goodsMap.get(goods.getAuctionId()).getTkRate());
+
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate,
shareRate);
+
goodsNew.setGoodsVO(detailVO);
goodsNew.setGoods(null);
--
Gitblit v1.8.0