fanli-server.git

			@@ -27,7 +27,7 @@
			import com.google.gson.TypeAdapter;
			import com.google.gson.stream.JsonReader;
			import com.google.gson.stream.JsonWriter;
			import com.yeshi.fanli.dto.ConfigParamsDTO;
			import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
			import com.yeshi.fanli.entity.accept.AcceptData;
			import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum;
			import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinNewbies;
			@@ -491,7 +491,7 @@
			}
			}

			ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
			GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
			acceptData.getVersion(),acceptData.getSystem());

			for (ShareHotGoods hotGoods : listHot) {
			@@ -650,7 +650,7 @@
			.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

			BigDecimal proportion = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
			ConfigParamsDTO paramsDTO = new ConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE,
			GoodsMoneyConfigParamsDTO paramsDTO = new GoodsMoneyConfigParamsDTO(proportion, proportion, Constant.MAX_REWARD_RATE,
			hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP,acceptData.getSystem()));
			for (TLJBuyGoods hotGoods : listHot) {
			TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();
			@@ -791,7 +791,7 @@
			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
			.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

			ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
			GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
			acceptData.getVersion(),acceptData.getSystem());

			for (TLJFreeBuyGoods freeGoods : listFree) {
			@@ -800,7 +800,7 @@
			continue;

			// 计算券后价 1<= n <= 2
			BigDecimal couplePrice = TaoBaoUtil.getAfterUseCouplePrice(goods);
			BigDecimal couplePrice = TaoBaoUtil.getCouponPrice(goods);
			if (couplePrice.compareTo(new BigDecimal(1.0)) < 0 && couplePrice.compareTo(new BigDecimal(2.0)) > 0)
			continue;