fanli-server.git

			@@ -56,6 +56,7 @@
			import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;
			import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
			import com.yeshi.fanli.service.inter.monitor.MonitorService;
			import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
			import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
			import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
			import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
			@@ -105,6 +106,9 @@

			@Resource
			private HongBaoManageService hongBaoManageService;

			@Resource
			private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;

			@Resource
			private MonitorService monitorService;
			@@ -255,6 +259,13 @@
			commentText = commentText.replace("[券后价]", TaoBaoUtil.getAfterUseCouplePrice(goods) + "");
			}

			commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
			return commentText;
			}

			// 淘宝分享活动
			public static String getTaoBaoActiivtyERCodeContentNew(String template, String token) {
			String commentText = template.replace("[淘口令]", token);
			commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
			return commentText;
			}
			@@ -493,7 +504,7 @@
			TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, goodsId, relationId);

			if (taoBaoLink != null && taoBaoLink.getGoods() != null && needGoods) {
			ConfigParamsDTO dto = hongBaoManageService.getShowComputeRate(platform, version);
			ConfigParamsDTO dto = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
			GoodsDetailVO goodsInfo = GoodsDetailVOFactory.convertTaoBao(taoBaoLink.getGoods(), dto);
			shareInfo.setGoodsInfo(goodsInfo);
			}
			@@ -650,8 +661,9 @@
			shareInfo.setRecommendText(deleteBlankLine(recommendText));

			// 设置评论文本选项
			shareInfo.setCommentTextChoiceList(getCommentChoiceList(shareInfo.getCommentText(), null, inviteCode,
			TaoBaoUtil.getGoodsHongBaoMoney(taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));
			shareInfo.setCommentTextChoiceList(
			getCommentChoiceList(shareInfo.getCommentText(), null, inviteCode, TaoBaoUtil.getGoodsHongBaoMoney(
			taoBaoLink.getGoods(), hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP))));

			out.print(JsonUtil.loadTrueResult(
			JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create().toJson(shareInfo)));
			@@ -730,8 +742,8 @@
			shareInfo.setCommentTexts(new ArrayList<>());

			if (needGoods)
			shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods,
			hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion())));
			shareInfo.setGoodsInfo(GoodsDetailVOFactory.convertJDGoods(jdGoods, orderHongBaoMoneyComputeService
			.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion())));

			boolean hasCoupon = false;
			if (couponInfo != null) {
			@@ -1428,7 +1440,7 @@
			}
			}

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

			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
			@@ -1500,7 +1512,7 @@
			}

			GoodsDetailVO goodsDetail = null;
			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
			ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
			acceptData.getVersion());
			paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());