fanli-server.git

			@@ -29,6 +29,7 @@
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
			import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
			import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
			import com.yeshi.fanli.service.manger.ClipboardAnalysisManager;
			@@ -440,6 +441,7 @@
			} catch (Exception e) {
			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("保存失败"));
			e.printStackTrace();
			LogHelper.errorDetailInfo(e);
			}
			}

			@@ -24,6 +24,7 @@
			import com.google.gson.GsonBuilder;
			import com.yeshi.fanli.dto.ConfigParamsDTO;
			import com.yeshi.fanli.dto.jd.JDCouponInfo;
			import com.yeshi.fanli.dto.jd.JDPingouInfo;
			import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
			import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
			import com.yeshi.fanli.entity.accept.AcceptData;
			@@ -782,15 +783,31 @@
			if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
			String template2 = configService.get(ConfigKeyEnum.quickShareGoodsText.getKey());
			recommendText = template2.replace("[商品标题]", jdGoods.getSkuName());
			// 无推荐语
			recommendText = recommendText.replace("推荐理由:[推荐语]", "");

			String sales = JDUtil.getSaleCount(jdGoods.getInOrderCount30Days());
			if (sales.equals("0")) {
			recommendText = recommendText.replace("销量:[销量]", "");
			} else {
			recommendText = recommendText.replace("[销量]", sales.replace("万", "w"));
			}

			BigDecimal price = jdGoods.getPrice();
			JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();
			if (pinGouInfo != null) {
			price = pinGouInfo.getPingouPrice();
			}

			String template3 = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey());
			commentText = template3.replace("[原价]", BigDecimalUtil.getWithNoZera(price).toString());
			if (!hasCoupon) {
			recommendText = recommendText.replace("优惠券:[券面额]元", "");
			commentText = commentText.replace("【券后价】[券后价]元", "");
			commentText = commentText.replace("领券抢购", "抢购");
			} else {
			recommendText = recommendText.replace("[券面额]", BigDecimalUtil.getWithNoZera(couponInfo.getDiscount()).toString());
			commentText = commentText.replace("[券后价]", BigDecimalUtil.getWithNoZera(JDUtil.getQuanPrice(jdGoods)).toString());
			}
			commentText = commentText.replace("[链接]", jumpLink);
			} else {
			commentText = shareInfo.getShareText();
			recommendText = shareInfo.getDescText();

			@@ -143,6 +143,7 @@

			if (record.getStartTime() == null)
			record.setStartTime(new Date());

			record.setPublishTime(record.getStartTime());

			String id = record.getId();
			@@ -1300,7 +1301,7 @@
			}

			@Override
			@Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
			// @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
			public List<GoodsEvaluate> queryMaterialsCache(int start, int count, int type) throws Exception {
			List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, type);

	fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史