From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java | 63 ++++++++++++-------------------
1 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index d685960..9c65dfd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -8,13 +8,13 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.tencentcloud.COSManager;
-import com.yeshi.fanli.dao.brand.BrandShopCaheDao;
import com.yeshi.fanli.dao.mybatis.brand.BrandInfoMapper;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
@@ -23,18 +23,15 @@
import com.yeshi.fanli.entity.brand.BrandInfo;
import com.yeshi.fanli.entity.brand.BrandShopCahe;
import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoShop;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.common.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.exception.brand.BrandInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.brand.BrandClassShopService;
import com.yeshi.fanli.service.inter.brand.BrandGoodsCaheService;
import com.yeshi.fanli.service.inter.brand.BrandInfoService;
import com.yeshi.fanli.service.inter.brand.BrandShopCaheService;
-import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
-import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
@@ -50,22 +47,10 @@
private BrandInfoMapper brandInfoMapper;
@Resource
- private HongBaoManageService hongBaoManageService;
-
- @Resource
- private QualityGoodsService qualityGoodsService;
-
- @Resource
- private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
- @Resource
- private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private BrandClassShopService brandClassShopService;
-
- @Resource
- private BrandShopCaheDao brandShopCaheDao;
@Resource
private BrandGoodsCaheService brandGoodsCaheService;
@@ -182,7 +167,7 @@
executor.execute(new Runnable() {
@Override
public void run() {
- BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(record);
+ BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(record, SystemEnum.blks);
BrandInfo update = new BrandInfo();
update.setId(record.getId());
@@ -295,10 +280,10 @@
@Override
@Cacheable(value = "brandCache", key = "'listValidBrandInfoCache-'+#cid")
- public List<BrandInfo> listValidBrandInfoCache(Long cid) {
+ public List<BrandInfo> listValidBrandInfoCache(Long cid,SystemEnum system) {
List<BrandInfo> listInfo = new ArrayList<BrandInfo>();
- List<TaoBaoShop> listShop = brandClassShopService.listEffectiveClassShop(cid);
+ List<TaoBaoShop> listShop = brandClassShopService.listEffectiveClassShop(cid,system);
if (listShop == null || listShop.size() == 0)
return listInfo;
for (TaoBaoShop taoBaoShop : listShop) {
@@ -312,11 +297,11 @@
}
@Override
- @Cacheable(value = "brandCache", key = "'listBrandInfoCache-'+#start+'-'+#start +'-'+#cid+'-'+#platform+'-'+#version")
- public List<BrandInfoVO> listBrandInfoCache(long start, int count, Long cid, String platform, String version) {
+ @Cacheable(value = "brandCache", key = "'listBrandInfoCache-'+#start+'-'+#start +'-'+#cid+'-'+#platform+'-'+#version+'-'+#system")
+ public List<BrandInfoVO> listBrandInfoCache(long start, int count, Long cid, String platform, String version,SystemEnum system) {
List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();
- List<TaoBaoShopVO> listShop = brandClassShopService.listEffectiveShop(start, count, cid, platform, version);
+ List<TaoBaoShopVO> listShop = brandClassShopService.listEffectiveShop(start, count, cid, platform, version,system);
if (listShop == null || listShop.size() == 0)
return listInfo;
@@ -409,7 +394,7 @@
if (StringUtil.isNullOrEmpty(name) && StringUtil.isNullOrEmpty(searchKey))
continue;
// 娣诲姞鍟嗗搧
- BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(brandInfo);
+ BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(brandInfo, SystemEnum.blks);
BrandInfo updateInfo = new BrandInfo();
updateInfo.setId(brandInfo.getId());
@@ -431,26 +416,26 @@
}
@Override
- public long countValidByCidToApp(Long cid) {
- return brandInfoMapper.countValidByCidToApp(cid);
+ public long countValidByCidToApp(Long cid, SystemEnum system) {
+ return brandInfoMapper.countValidByCidToApp(cid,system);
}
@Override
- @Cacheable(value = "brandCache", key = "'listValidByCidToApp-'+#cid")
- public List<BrandInfo> listValidByCidToApp(Long cid) {
+ @Cacheable(value = "brandCache", key = "'listValidByCidToApp-'+#cid+'-'+#system")
+ public List<BrandInfo> listValidByCidToApp(Long cid, SystemEnum system) {
if (cid == null)
return null;
- return brandInfoMapper.listValidByCidToApp(cid);
+ return brandInfoMapper.listValidByCidToApp(cid,system);
}
- @Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#cid")
+ @Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#cid+'-'+#system")
@Override
- public List<BrandInfoVO> listValidToApp(long start, int count, Long cid, String platform, String version) {
- List<BrandInfoVO> list = brandInfoMapper.listBrandInfoVO(start, count, cid);
+ public List<BrandInfoVO> listValidToApp(long start, int count, Long cid, String platform, String version,SystemEnum system) {
+ List<BrandInfoVO> list = brandInfoMapper.listBrandInfoVO(start, count, cid,system);
if (list == null || list.size() == 0)
return null;
- ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(platform, version);
+ ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();
for (int i = 0; i < list.size(); i++) {
@@ -492,8 +477,8 @@
}
@Override
- @Cacheable(value = "brandCache", key = "'listByAlikeName-'+#key+'-'+#platform+'-'+#version")
- public BrandInfoVO listByAlikeName(String key, String platform, String version) {
+ @Cacheable(value = "brandCache", key = "'listByAlikeName-'+#key+'-'+#platform+'-'+#version+'-'+#system")
+ public BrandInfoVO listByAlikeName(String key, String platform, String version,SystemEnum system) {
if (StringUtil.isNullOrEmpty(key))
return null;
@@ -501,7 +486,7 @@
if (list == null || list.size() == 0)
return null;
- ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(platform, version);
+ ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, system);
BrandInfoVO brand = list.get(0);
List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId(1, 3, brand.getId());
--
Gitblit v1.8.0