From c083b87a2635d9b48dd95cb441d7a7c5c9258abe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 四月 2021 18:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
index 7cd2925..ce4f6ea 100644
--- a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
@@ -1,9 +1,10 @@
package com.java110.store.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.purchase.ResourceStorePo;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +38,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public List<ResourceStoreDto> queryResourceStores(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
@@ -48,8 +53,26 @@
}
List<ResourceStoreDto> resourceResourceStores = BeanConvertUtil.covertBeanList(resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto)), ResourceStoreDto.class);
-
- return resourceResourceStores;
+ //鑾峰彇鍥剧墖鍦板潃
+ List<ResourceStoreDto> resourceStoreDtos = new ArrayList<>();
+ for (ResourceStoreDto resourceStoreDto : resourceResourceStores) {
+ //鑾峰彇璧勬簮id
+ String resId = resourceStoreDto.getResId();
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(resId);
+ //鏌ヨ鏂囦欢琛�
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ List<String> fileUrls = new ArrayList<>();
+ for (FileRelDto fileRel : fileRelDtos) {
+ String url = "/callComponent/download/getFile/file?fileId=" + fileRel.getFileRealName() + "&communityId=-1";
+ fileUrls.add(url);
+ }
+ resourceStoreDto.setFileUrls(fileUrls);
+ }
+ resourceStoreDtos.add(resourceStoreDto);
+ }
+ return resourceStoreDtos;
}
@@ -74,14 +97,18 @@
Assert.listOnlyOne(stores, "涓嶅瓨鍦ㄨ鐗╁搧");
int stock = Integer.parseInt(stores.get(0).get("stock").toString());
int newStock = Integer.parseInt(resourceStorePo.getStock());
- resourceStorePo.setStock((stock + newStock) + "");
+ int totalStock = stock + newStock;
+
+ if (totalStock < 0) {
+ throw new IllegalArgumentException("搴撳瓨涓嶈冻锛屽弬鏁版湁璇�");
+ }
+ resourceStorePo.setStock(totalStock + "");
resourceStorePo.setStatusCd("0");
return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
} finally {
DistributedLock.releaseDistributedLock(requestId, key);
}
}
-
public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
return resourceResourceStoreServiceDaoImpl;
--
Gitblit v1.8.0