fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1723,7 +1723,6 @@ TaoBaoGoodsBrief tb = null; if (goodsList.size() > 0) { tb = goodsList.get(0); } if (tb == null) { fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -154,19 +154,26 @@ String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价"; if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { String text = configService.get("goods_share_text_nocoupon"); shareText = text.replace("[标题]", taoBaoLink.getGoods().getTitle()).replace("[在售价]", "¥" + taoBaoLink.getGoods().getZkPrice()); String text = shareGoodsTextTemplateService.getCommonTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configService.get("goods_share_text_nocoupon"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()).replace("{商品原价}", taoBaoLink.getGoods().getZkPrice() + ""); } else// 有券 { String text = configService.get("goods_share_text_coupon"); shareText = text.replace("[标题]", taoBaoLink.getGoods().getTitle()) .replace("[在售价]", "¥" + taoBaoLink.getGoods().getZkPrice()) .replace("[优惠券金额]", "¥" + BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("[券后价]", "¥" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods())); String text = shareGoodsTextTemplateService.geteCouponTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configService.get("goods_share_text_coupon"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()) .replace("{商品原价}", taoBaoLink.getGoods().getZkPrice() + "") .replace("{优惠券面额}", BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + ""); } shareText = shareText.replace("[价格类型]", shopType); shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken()); data.put("shareText", shareText); String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim(); if (descText.startsWith("\\r\\n")) fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
@@ -65,6 +65,21 @@ @Override public void saveCouponTemplate(Long uid, String template) throws ShareGoodsTextTemplateException { isCouponTemplateRight(template); ShareGoodsTextTemplate old = shareGoodsTextTemplateMapper.selectByUid(uid); if (old != null) { ShareGoodsTextTemplate update = new ShareGoodsTextTemplate(); update.setId(old.getId()); update.setShareCouponTextTemplate(template); update.setUpdateTime(new Date()); shareGoodsTextTemplateMapper.updateByPrimaryKeySelective(update); } else { ShareGoodsTextTemplate textTemplate = new ShareGoodsTextTemplate(); textTemplate.setCreateTime(new Date()); textTemplate.setShareCouponTextTemplate(template); textTemplate.setUid(uid); shareGoodsTextTemplateMapper.insertSelective(textTemplate); } } @Override fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java
@@ -196,22 +196,22 @@ return qualityFactoryMapper.listQueryByAuctionId(list); } @Override @Transactional public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin) throws Exception { public void addBatchTaoBaoGoods(List<TaoBaoGoodsBrief> listTaoBaoGoods, String lableNames, AdminUser admin) throws Exception { if (listTaoBaoGoods == null || listTaoBaoGoods.size() == 0) { throw new Exception("未找到匹配的商品"); } // 创建标签 List<Label> listLabel = labelService.addBatchByNames(lableNames, admin); List<QualityFactory> listQuality = new ArrayList<QualityFactory>(); List<LabelGoods> listLabelGoods = new ArrayList<LabelGoods>(); for (TaoBaoGoodsBrief goodsBrief: listTaoBaoGoods) { for (TaoBaoGoodsBrief goodsBrief : listTaoBaoGoods) { // 本地是否已存在此商品 List<TaoBaoGoodsBrief> hasList = taoBaoGoodsBriefService.queryByAuctionId(goodsBrief.getAuctionId()); @@ -219,7 +219,7 @@ if (hasList != null && hasList.size() > 0) { TaoBaoGoodsBrief currentGoodsBrief = hasList.get(0); goodsBrief.setId(currentGoodsBrief.getId()); // 更新商品最新信息 taoBaoGoodsUpdateService.updateTaoBaoGoods(goodsBrief); } else { @@ -275,7 +275,7 @@ } } } } if (listQuality.size() > 0) { @@ -288,7 +288,6 @@ } @Override @Transactional public void setWeightBatch(List<Long> idList, AdminUser admin, Integer weight, Integer weightSmall, @@ -581,6 +580,7 @@ try { TaoBaoGoodsBrief taoBaoGoodsBrief = TaoKeApiUtil.searchGoodsDetail(goods.getAuctionId()); if (taoBaoGoodsBrief != null) { listGoodsBrief.add(taoBaoGoodsBrief); } @@ -598,6 +598,13 @@ } } for (int i = 0; i < goodsList.size(); i++) { if (goodsList.get(i).getMaterialLibType() != null && goodsList.get(i).getMaterialLibType() == 0) { goodsList.remove(i); i--; } } // 商品id集合 List<Long> listSystemTBid = new ArrayList<Long>();
@@ -249,7 +249,7 @@ totalSettlement = commonOrder.getTotalPayment(); } // 实付款 commonGoodsVO.setActualPay("实付款：¥" + totalSettlement); commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement); listOrderGoods.add(commonGoodsVO); @@ -888,7 +888,7 @@ totalSettlement = commonOrder.getTotalPayment(); } // 实付款 commonGoodsVO.setActualPay("实付款：¥" + totalSettlement); commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement); listOrderGoods.add(commonGoodsVO);
