From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
index 6d991c4..0cce77d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
@@ -16,6 +16,7 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dao.mybatis.brand.BrandClassShopMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.BrandClassShop;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -76,7 +77,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public String saveShopInfo(Long cid, List<Long> list) throws BrandClassShopException {
if (list == null || list.size() == 0) {
throw new BrandClassShopException(1, "璇烽�夋嫨搴楅摵");
@@ -133,7 +134,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,
String key) throws BrandClassShopException {
@@ -368,8 +369,8 @@
}
@Override
- @Cacheable(value = "brandCache", key = "'listEffectiveCacheV2-'+#page+'-'+#cid")
- public JSONObject listEffectiveCacheV2(int page, Long cid) {
+ @Cacheable(value = "brandCache", key = "'listEffectiveCacheV2-'+#page+'-'+#cid+'-'+#platform+'-'+#version")
+ public JSONObject listEffectiveCacheV2(int page, Long cid,String platform,String version) {
long countShop = 0;
if (cid != null && cid <= 0) {
@@ -430,8 +431,7 @@
count = taoBaoShopService.countBrandShopinfo(cid);
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(platform, version);
// 娣樺疂鍟嗗搧淇℃伅杩囨护
Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
@@ -467,7 +467,7 @@
taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory
- .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), null, fanLiRate, shareRate);
+ .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()),paramsDTO);
listGoods.add(goodsDetailVO);
}
taoBaoShopVO.setListGoodsVO(listGoods);
@@ -526,7 +526,7 @@
@Override
- public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid) {
+ public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid,String platform,String version) {
if (cid != null && cid <= 0) {
cid = null;
}
@@ -536,9 +536,8 @@
return listInfo;
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+ ConfigParamsDTO paramsDTO =
+ hongBaoManageService.getShowComputeRate(platform, version);
// 娣樺疂鍟嗗搧淇℃伅杩囨护
Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);
@@ -559,7 +558,7 @@
taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory
- .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), null, fanLiRate, shareRate);
+ .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), paramsDTO);
listGoods.add(goodsDetailVO);
}
taoBaoShopVO.setListGoodsVO(listGoods);
--
Gitblit v1.8.0