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 | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 215 insertions(+), 22 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 7e8d4a8..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
@@ -1,17 +1,24 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeUtil;
-import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+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.admin.api.entity.SysDept;
import com.by4cloud.platformx.business.dto.ProductAddDTO;
import com.by4cloud.platformx.business.dto.ProductQueryDTO;
+import com.by4cloud.platformx.business.dto.SyncProductDTO;
+import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.entity.TaxCode;
import com.by4cloud.platformx.business.mapper.ProductMapper;
@@ -22,16 +29,21 @@
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
import com.by4cloud.platformx.common.excel.vo.ErrorMessage;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import jakarta.validation.constraints.NotNull;
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;
-
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+
+;
/**
* 浜у搧淇℃伅
@@ -39,13 +51,49 @@
* @author platformx
* @date 2026-05-07 10:17:52
*/
+@Slf4j
@Service
@RequiredArgsConstructor
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
private final TaxCodeMapper taxCodeMapper;
- @Override
+ private final StringRedisTemplate redisTemplate;
+
+ @Value("${erp.smj}")
+ private String smjErp;
+
+ @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()
@@ -112,6 +160,18 @@
// .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()+"","2101966257365045249")){
+ List<ProductSelectVo> selectVos = baseMapper.getProductSMJListByParentId(queryDTO, Arrays.asList(erpCodes));
+ if (selectVos.size()>2000){
+ return R.ok(selectVos.subList(0,1999));
+ }
+ return R.ok(selectVos);
+ }
List<ProductSelectVo> selectVos = baseMapper.getProductListByParentId(queryDTO, Arrays.asList(erpCodes),DataScope.of("comp_id"));
if (selectVos.size()>2000){
return R.ok(selectVos.subList(0,1999));
@@ -121,14 +181,17 @@
@Override
public R saveErpProduct(List<ProductAddDTO> addDTOS) {
- if (ArrayUtil.isNotEmpty(addDTOS.toArray())){
+ 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())
, DataScope.of("comp_id"));
- if (ArrayUtil.isEmpty(classPro.toArray())){
+ if (CollUtil.isEmpty(classPro)){
Product product = new Product();
product.setProductName(addDTO.getErpTypeName());
product.setProductType(addDTO.getSpecification());
@@ -137,33 +200,38 @@
product.setErpCode(addDTO.getErpTypeCode());
TaxCode taxCode = taxCodeMapper.selectOne(Wrappers.<TaxCode>lambdaQuery().eq(TaxCode::getBm,addDTO.getTaxCode()).last("limit 1"));
if (ObjUtil.isNotNull(taxCode)){
- product.setTaxClass(taxCode.getMc());
+ product.setTaxClass(taxCode.getSphwjc());
product.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
}
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.getMc());
- 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
public R importProduct(List<ProductExcelVO> excelVOList, BindingResult bindingResult) {
List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
- if (ArrayUtil.isNotEmpty(excelVOList.toArray())) {
+ if (CollUtil.isNotEmpty(excelVOList)) {
List<List<ProductExcelVO>> groups = splitList(excelVOList, 5000);
groups.stream().forEach(group->{
for (ProductExcelVO addDTO:group
@@ -174,7 +242,7 @@
errorMsg.add("浜у搧鍒嗙被淇℃伅娌℃湁");
}
List<Product> one = this.listByScope(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, addDTO.getErpCode()));
- if (ArrayUtil.isNotEmpty(one.toArray())){
+ if (CollUtil.isNotEmpty(one)){
errorMsg.add("浜у搧erp缂栫爜宸插瓨鍦�");
}
if (CollUtil.isEmpty(errorMsg)){
@@ -182,7 +250,7 @@
.eq(StrUtil.isNotEmpty(addDTO.getErpTypeCode()),Product::getErpCode,addDTO.getErpTypeCode())
.eq(StrUtil.isNotEmpty(addDTO.getErpTypeName()),Product::getProductName,addDTO.getErpTypeName())
, DataScope.of("comp_id"));
- if (ArrayUtil.isEmpty(classPro.toArray())){
+ if (CollUtil.isEmpty(classPro)){
Product product = new Product();
product.setProductName(addDTO.getErpTypeName());
product.setProductType(addDTO.getSpecification());
@@ -233,4 +301,129 @@
Math.min((i + 1) * batchSize, totalSize)))
.collect(Collectors.toList());
}
+
+ @Override
+ public R syncSMJByDate(SyncProductDTO dto) {
+ String startDate = "";
+ if (StrUtil.isBlank(dto.getStartDate())){
+ startDate = DateUtil.formatDate(DateUtil.offsetDay(new Date(), -1));
+ }else {
+ startDate = dto.getStartDate();
+ }
+ 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("鐭崇叅鏈衡�斺��"+tan+"浜у搧鑾峰彇鍥炲弬锛歿}", response.body());
+ JSONObject proResult = JSONObject.parseObject(response.body());
+ JSONArray items = proResult.getJSONArray("data");
+ if (CollUtil.isNotEmpty(items)){
+ log.info("鐭崇叅鏈轰骇鍝佽幏鍙栨暟閲忥細{}", items.size());
+ items.stream().forEach(item->{
+ 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")
+// )
+ .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)){
+ log.info("浜у搧鍒嗙被锛歿}涓嶅瓨鍦�",product.getString("itemClassName"));
+ productClass = new Product();
+ productClass.setProductName(product.getString("itemClassName"));
+ productClass.setErpCode(product.getString("itemClassName"));
+ productClass.setParentId(0L);
+ 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());
+ productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+ }
+ baseMapper.insert(productClass);
+ log.info("浜у搧鍒嗙被锛歿}鏂板鎴愬姛",product.getString("itemClassName"));
+ }
+ 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")
+// )
+ .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)){
+ log.info("浜у搧锛歿}涓嶅瓨鍦�",product.getString("itemNo"));
+ productNew = new Product();
+ productNew.setProductName(product.getString("note"));
+ productNew.setErpCode(product.getString("itemNo"));
+ productNew.setProductType(product.getString("grade"));
+ 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)){
+ productClass.setTaxClass(taxCode.getSphwjc());
+ productClass.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
+ }
+ baseMapper.insert(productNew);
+ log.info("浜у搧锛歿}鏂板鎴愬姛",product.getString("itemNo"));
+ return;
+ }
+ log.info("浜у搧锛歿}瀛樺湪",product.getString("itemNo"));
+ });
+ }
+ }
+
+ 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