Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
| | |
| | | return list;
|
| | |
|
| | | // 爆款商品库
|
| | | TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(14624, page, Constant.PAGE_SIZE);
|
| | | TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(3756, page, Constant.PAGE_SIZE);
|
| | | if (result != null) {
|
| | | list = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs());
|
| | | saveObjList(list, name, key);
|
| | |
| | | List<DaTaoKeDetailV2> dtList = listByGoodsIds(goodsIdList);
|
| | |
|
| | | Map<Long, DaTaoKeDetailV2> map = new HashMap<>();
|
| | | for (DaTaoKeDetailV2 goods : dtList)
|
| | | map.put(goods.getGoodsId(), goods);
|
| | | if (dtList != null)
|
| | | for (DaTaoKeDetailV2 goods : dtList)
|
| | | map.put(goods.getGoodsId(), goods);
|
| | | for (TaoBaoGoodsBrief goods : goodsList) {
|
| | | DaTaoKeDetailV2 detail = map.get(goods.getAuctionId());
|
| | | goods = DaTaoKeUtil.filterTaoBaoGoods(goods, detail);
|
| | |
| | | moneyInfoVO.setMoneyType(1); // 默认显示:返 ¥6.6
|
| | | BigDecimal commission = PinDuoDuoUtil.getGoodsFanLiMoney(goods, params.getFanLiRate());
|
| | | moneyInfoVO.setFanliMoney("¥" + commission);
|
| | | moneyInfoVO.setShareMoney("¥" + commission);
|
| | |
|
| | | Boolean hasCoupon = goods.getHasCoupon();
|
| | | if (hasCoupon != null && hasCoupon) {
|