fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -69,7 +69,13 @@ } long count = 0; List<DynamicInfo> list = dynamicInfoService.queryV2((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid, int platform = 1; if ("ios".equalsIgnoreCase(acceptData.getPlatform())) { platform = 2; } int version = Integer.parseInt(acceptData.getVersion()); List<DynamicInfo> list = dynamicInfoService.queryV2(platform, version, (page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid, subId); if (list == null) { list = new ArrayList<DynamicInfo>(); fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -18,12 +18,14 @@ import com.yeshi.fanli.dao.dynamic.DynamicInfoDao; import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser; import com.yeshi.fanli.entity.bus.activity.ActivityUser; import com.yeshi.fanli.entity.bus.activity.RecommendActivity; import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo; import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods; import com.yeshi.fanli.entity.bus.clazz.GoodsClass; import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.dynamic.DynamicInfo; import com.yeshi.fanli.entity.dynamic.GoodsPicture; import com.yeshi.fanli.entity.dynamic.InviteMaterial; @@ -892,8 +894,8 @@ @Override @Cacheable(value = "dynamicCache", key = "'queryV2-'+#start+'-'+#count+'-'+#cid+'-'+#subId") public List<DynamicInfo> queryV2(int start, int count, Long cid, Long subId) { @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) { List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId); if (list != null && list.size() > 0) { @@ -924,6 +926,14 @@ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate, shareRate); goodsPicture.setGoodsVO(detailVO); goodsPicture.setGoods(null); JumpDetailV2 jumpDetail = goodsPicture.getJumpDetail(); if (jumpDetail != null) { JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache(jumpDetail.getType(), platform, version); if (jumpDetailV2 != null) { goodsPicture.setJumpDetail(jumpDetailV2); } } } } dynamicInfo.setImgs(imgs); fanli/src/main/java/com/yeshi/fanli/service/impl/goods/PDDCommonTemplateContentServiceImpl.java
@@ -28,6 +28,7 @@ pddfilter.setPage(page); pddfilter.setPageSize(pageSize); pddfilter.setSortType(22); pddfilter.setHasCoupon(false); if ("-1".equalsIgnoreCase(cid)) { pddfilter.setOptId(-1L); } else { fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java
@@ -3,6 +3,7 @@ import java.util.Date; import java.util.List; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.activity.RecommendActivity; import com.yeshi.fanli.entity.dynamic.DynamicInfo; @@ -91,6 +92,6 @@ * @param subId * @return */ public List<DynamicInfo> queryV2(int start, int count, Long cid, Long subId); public List<DynamicInfo> queryV2(int platform, int version, int start, int count, Long cid, Long subId); } fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
@@ -24,6 +24,10 @@ return d1.divide(d2,2, BigDecimal.ROUND_DOWN); } public static BigDecimal div3(BigDecimal d1, BigDecimal d2) {// 进行除法运算 return d1.divide(d2, 3, BigDecimal.ROUND_DOWN); } public static BigDecimal getWithNoZera(BigDecimal num) {// 进行除法运算 while (num.toString().endsWith("0") && num.toString().indexOf(".") > -1) { num = new BigDecimal(num.toString().substring(0, num.toString().length()-1)); fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java
@@ -1,7 +1,6 @@ package com.yeshi.fanli.util.pinduoduo; import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; import java.math.BigDecimal; import java.net.URLEncoder; import java.util.ArrayList; @@ -19,17 +18,9 @@ import org.yeshi.utils.BigDecimalUtil; import org.yeshi.utils.HttpUtil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.dto.jd.JDCommissionInfo; import com.yeshi.fanli.dto.jd.JDCouponInfo; import com.yeshi.fanli.dto.jd.JDPingouInfo; import com.yeshi.fanli.dto.jd.JDShopInfo; import com.yeshi.fanli.dto.pdd.PDDGoodsDetail; import com.yeshi.fanli.dto.pdd.PDDGoodsResult; import com.yeshi.fanli.dto.pdd.PDDSearchFilter; import com.yeshi.fanli.entity.jd.JDGoods; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; @@ -50,7 +41,7 @@ BigDecimal hundred = new BigDecimal(100); rate = MoneyBigDecimalUtil.div(rate, hundred); BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred).setScale(2); BigDecimal promotionRate = MoneyBigDecimalUtil.div(new BigDecimal(goods.getPromotionRate()), BigDecimal promotionRate = MoneyBigDecimalUtil.div3(new BigDecimal(goods.getPromotionRate()), new BigDecimal(1000)); Boolean hasCoupon = goods.getHasCoupon(); @@ -312,15 +303,11 @@ goods.setHasCoupon(json.optBoolean("hasCoupon")); if (json.optString("couponMinOrderAmount") != null) { goods.setCouponMinOrderAmount(json.getLong("couponMinOrderAmount")); goods.setCouponMinOrderAmount(json.getLong("couponMinOrderAmount")/10); } if (json.optString("couponDiscount") != null) { goods.setCouponDiscount(json.getLong("couponDiscount")); } if (json.optString("couponDiscount") != null) { goods.setMinNormalPrice(json.getLong("couponDiscount")); goods.setCouponDiscount(json.getLong("couponDiscount")/10); } if (json.optString("couponTotalQuantity") != null) {
