From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 30 九月 2026 16:12:49 +0800
Subject: [PATCH] feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java | 162 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 125 insertions(+), 37 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
index 4ab8e9a..84c2812 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java
@@ -13,6 +13,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.dto.ProductAddDTO;
import com.by4cloud.platformx.business.dto.ProductQueryDTO;
@@ -33,6 +34,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.validation.BindingResult;
@@ -56,10 +58,42 @@
private final TaxCodeMapper taxCodeMapper;
+ private final StringRedisTemplate redisTemplate;
+
@Value("${erp.smj}")
private String smjErp;
- @Override
+ @Value("${erp.smjsc}")
+ private String smjscErp;
+
+ @Value("${erp.smjzt}")
+ private String smjztErp;
+
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.smjsc}")
+ private String smjsc;
+
+ @Value("${dept.smjzt}")
+ private String smjzt;
+
+ @Value("${dept.smjhw}")
+ private String smjhw;
+
+
+ @Override
+ public Page pageScope(Page page, Product product) {
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjhw);
+ return baseMapper.page(page,product,smjList);
+ }
+ return baseMapper.pageScope(page,product,DataScope.of("comp_id"));
+ }
+
+ @Override
public List<Tree<Long>> treeList() {
List<TreeNode<Long>> collect = baseMapper
.selectListByScope(Wrappers.<Product>lambdaQuery()
@@ -126,9 +160,12 @@
// .eq(StrUtil.isNotEmpty(queryDTO.getParentId()),Product::getParentId,queryDTO.getParentId())
// .in(StrUtil.isNotEmpty(queryDTO.getContractCategory())&&StrUtil.equals(queryDTO.getContractCategory(), "water_house"),
// Product::getErpCode,erpCodes);
+ if (StrUtil.isNotBlank(queryDTO.getProductIds())){
+ String[] arr = queryDTO.getProductIds().split(",");
+ queryDTO.setProductId(Arrays.stream(arr).collect(Collectors.toList()));
+ }
if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"","2089995177814495234")||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"","2089996921978040321")||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"","2089997578009128962")){
+ StrUtil.equals(SecurityUtils.getUser().getCompId()+"","2101966257365045249")){
List<ProductSelectVo> selectVos = baseMapper.getProductSMJListByParentId(queryDTO, Arrays.asList(erpCodes));
if (selectVos.size()>2000){
return R.ok(selectVos.subList(0,1999));
@@ -147,6 +184,9 @@
if (CollUtil.isNotEmpty(addDTOS)){
for (ProductAddDTO addDTO:addDTOS
) {
+ if (StrUtil.isBlank(addDTO.getErpCode())){
+ return R.failed("erp缂栫爜涓嶈兘涓虹┖");
+ }
List<Product> classPro = baseMapper.selectListByScope(Wrappers.<Product>lambdaQuery()
.eq(StrUtil.isNotEmpty(addDTO.getErpTypeCode()),Product::getErpCode,addDTO.getErpTypeCode())
.eq(StrUtil.isNotEmpty(addDTO.getErpTypeName()),Product::getProductName,addDTO.getErpTypeName())
@@ -166,21 +206,26 @@
baseMapper.insert(product);
classPro.add(product);
}
- Product product = new Product();
- product.setProductName(addDTO.getErpName());
- product.setProductType(addDTO.getSpecification());
- product.setParentId(classPro.get(0).getId());
- product.setParentName(classPro.get(0).getProductName());
- product.setErpCode(addDTO.getErpCode());
- TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,addDTO.getTaxCode()).last("limit 1"));
- if (ObjUtil.isNotNull(taxCode)){
- product.setTaxClass(taxCode.getSphwjc());
- product.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+ List<Product> productList = baseMapper.selectListByScope(Wrappers.<Product>lambdaQuery()
+ .eq(StrUtil.isNotEmpty(addDTO.getErpCode()),Product::getErpCode,addDTO.getErpCode())
+ , DataScope.of("comp_id"));
+ if (CollUtil.isEmpty(productList)){
+ Product product = new Product();
+ product.setProductName(addDTO.getErpName());
+ product.setProductType(addDTO.getSpecification());
+ product.setParentId(classPro.get(0).getId());
+ product.setParentName(classPro.get(0).getProductName());
+ product.setErpCode(addDTO.getErpCode());
+ TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,addDTO.getTaxCode()).last("limit 1"));
+ if (ObjUtil.isNotNull(taxCode)){
+ product.setTaxClass(taxCode.getSphwjc());
+ product.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+ }
+ baseMapper.insert(product);
}
- baseMapper.insert(product);
}
}
- return R.ok();
+ return R.failed("鏁版嵁涓虹┖");
}
@Override
@@ -265,19 +310,22 @@
}else {
startDate = dto.getStartDate();
}
- JSONObject loginJson = new JSONObject();
- loginJson.put("username", "admin");
- loginJson.put("password", "Zimafold@2026");
- log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
- String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
- log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
- JSONObject respJson = JSONObject.parseObject(loginResp);
- if (respJson.getInteger("code") == 0) {
- JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
- HttpResponse response = HttpRequest.get(smjErp + "/api/item/v1/byDateCre?startDate=" + startDate)
- .header("token", dataJson.getString("token")) // 娣诲姞璁よ瘉澶�
+ String token = "";
+ if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+ token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+ } else {
+ token = getErpToken();
+ }
+ if (StrUtil.isEmpty(token)){
+ return R.failed("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+ }
+ List<String> list = Arrays.asList("tenant1","tenant2","tenant3");
+ for (int i = 0; i < list.size(); i++) {
+ String tan = list.get(i);
+ HttpResponse response = HttpRequest.get(smjErp + "/api/item/v1/byDateCre?startDate=" + startDate+"&tenantId="+tan)
+ .header("token", token) // 娣诲姞璁よ瘉澶�
.execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
- log.info("鐭崇叅鏈轰骇鍝佽幏鍙栧洖鍙傦細{}", response.body());
+ log.info("鐭崇叅鏈衡�斺��"+tan+"浜у搧鑾峰彇鍥炲弬锛歿}", response.body());
JSONObject proResult = JSONObject.parseObject(response.body());
JSONArray items = proResult.getJSONArray("data");
if (CollUtil.isNotEmpty(items)){
@@ -286,10 +334,13 @@
JSONObject product = (JSONObject) item;
Product productClass = baseMapper.selectOne(Wrappers.<Product>lambdaQuery()
.eq(Product::getProductName,product.getString("itemClassName"))
- .and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
- .or().eq(Product::getCompId,"2089996921978040321")
- .or().eq(Product::getCompId,"2089997578009128962")
- )
+// .and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
+// .or().eq(Product::getCompId,"2089996921978040321")
+// .or().eq(Product::getCompId,"2089997578009128962")
+// )
+ .eq(StrUtil.equals(tan,"tenant1"),Product::getCompId,"2089995177814495234")
+ .eq(StrUtil.equals(tan,"tenant2"),Product::getCompId,"2089996921978040321")
+ .eq(StrUtil.equals(tan,"tenant3"),Product::getCompId,"2089997578009128962")
.last("limit 1")
);
if(ObjUtil.isNull(productClass)){
@@ -298,7 +349,15 @@
productClass.setProductName(product.getString("itemClassName"));
productClass.setErpCode(product.getString("itemClassName"));
productClass.setParentId(0L);
- productClass.setCompId(2089995177814495234L);
+ if(StrUtil.equals(tan,"tenant1")){
+ productClass.setCompId(2089995177814495234L);
+ }
+ if(StrUtil.equals(tan,"tenant2")){
+ productClass.setCompId(2089996921978040321L);
+ }
+ if(StrUtil.equals(tan,"tenant3")){
+ productClass.setCompId(2089997578009128962L);
+ }
TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
if (ObjUtil.isNotNull(taxCode)){
productClass.setTaxClass(taxCode.getSphwjc());
@@ -309,10 +368,13 @@
}
Product productNew = baseMapper.selectOne(Wrappers.<Product>lambdaQuery()
.eq(Product::getErpCode,product.getString("itemNo"))
- .and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
- .or().eq(Product::getCompId,"2089996921978040321")
- .or().eq(Product::getCompId,"2089997578009128962")
- )
+// .and(wrapper -> wrapper.eq(Product::getCompId,"2089995177814495234")
+// .or().eq(Product::getCompId,"2089996921978040321")
+// .or().eq(Product::getCompId,"2089997578009128962")
+// )
+ .eq(StrUtil.equals(tan,"tenant1"),Product::getCompId,"2089995177814495234")
+ .eq(StrUtil.equals(tan,"tenant2"),Product::getCompId,"2089996921978040321")
+ .eq(StrUtil.equals(tan,"tenant3"),Product::getCompId,"2089997578009128962")
.last("limit 1")
);
if(ObjUtil.isNull(productNew)){
@@ -321,7 +383,15 @@
productNew.setProductName(product.getString("note"));
productNew.setErpCode(product.getString("itemNo"));
productNew.setProductType(product.getString("grade"));
- productNew.setCompId(2089995177814495234L);
+ if(StrUtil.equals(tan,"tenant1")){
+ productNew.setCompId(2089995177814495234L);
+ }
+ if(StrUtil.equals(tan,"tenant2")){
+ productNew.setCompId(2089996921978040321L);
+ }
+ if(StrUtil.equals(tan,"tenant3")){
+ productNew.setCompId(2089997578009128962L);
+ }
productNew.setParentId(productClass.getId());
TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,product.getString("tfTaxClass")).last("limit 1"));
if (ObjUtil.isNotNull(taxCode)){
@@ -336,6 +406,24 @@
});
}
}
+
return R.ok();
}
+
+ private String getErpToken() {
+ JSONObject loginJson = new JSONObject();
+ loginJson.put("username", "admin");
+ loginJson.put("password", "Zimafold@2026");
+ log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+ String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
+ log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+ JSONObject respJson = JSONObject.parseObject(loginResp);
+ if (respJson.getInteger("code") == 0) {
+ JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+ redisTemplate.opsForValue().set("SMJ_ERP_TOEKN",dataJson.getString("token"));
+ log.info("鐭崇叅鏈篹rp token涓猴細{}",dataJson.getString("token"));
+ return dataJson.getString("token");
+ }
+ return "";
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1