From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 5bae6ea..28bc515 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
@@ -33,9 +33,11 @@
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.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.vo.brand.BrandInfoVO;
@@ -50,6 +52,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private QualityGoodsService qualityGoodsService;
@@ -201,20 +206,42 @@
* @throws Exception
*/
public String uploadPicture(MultipartFile file) throws Exception {
-
// 鏂囦欢瑙ｆ瀽
InputStream inputStream = file.getInputStream();
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath = "/img/brand/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath = FilePathEnum.brand.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
- String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
-
- return fileLink;
+ return COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
}
+
+ @Override
+ public void switchState(Long id) throws BrandInfoException {
+ if (id == null) {
+ throw new BrandInfoException(1, "璇蜂紶閫掓纭弬鏁�");
+ }
+ BrandInfo resultObj = brandInfoMapper.selectByPrimaryKey(id);
+ if (resultObj == null) {
+ throw new BrandInfoException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�");
+ }
+
+ Integer state = resultObj.getState();
+ if (state == null || state == 0) {
+ state = 1;
+ } else {
+ state = 0;
+ }
+
+ BrandInfo updateObj = new BrandInfo();
+ updateObj.setId(id);
+ updateObj.setState(state);
+ brandInfoMapper.updateByPrimaryKeySelective(updateObj);
+ }
+
+
@Override
public int deleteBatchByPrimaryKey(List<Long> list) {
executor.execute(new Runnable() {
@@ -427,7 +454,7 @@
if (list == null || list.size() == 0)
return null;
- ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(platform, version);
+ ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
List<BrandInfoVO> listInfo = new ArrayList<BrandInfoVO>();
for (int i = 0; i < list.size(); i++) {
@@ -478,7 +505,7 @@
if (list == null || list.size() == 0)
return null;
- ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(platform, version);
+ ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);
BrandInfoVO brand = list.get(0);
List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId(1, 3, brand.getId());
--
Gitblit v1.8.0