feat:标的物变更 合同审核流程改为推送合同中心通过后上传盖章签字件 履约进度新增合同补录按钮

shiyunteng

2026-09-17 ca019747743a76f9348fcac99385c91736a36638

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ProductServiceImpl.java

@@ -1,15 +1,23 @@
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.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.service.impl.ServiceImpl;
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;
@@ -20,8 +28,11 @@
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.stereotype.Service;
import org.springframework.validation.BindingResult;

@@ -38,11 +49,15 @@
 * @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;

   @Value("${erp.smj}")
   private String smjErp;

    @Override
    public List<Tree<Long>> treeList() {
@@ -111,6 +126,15 @@
//              .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.equals(SecurityUtils.getUser().getCompId()+"","2089995177814495234")||
            StrUtil.equals(SecurityUtils.getUser().getCompId()+"","2089996921978040321")||
            StrUtil.equals(SecurityUtils.getUser().getCompId()+"","2089997578009128962")){
         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));
@@ -136,7 +160,7 @@
               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);
@@ -150,7 +174,7 @@
            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.setTaxClass(taxCode.getSphwjc());
               product.setTaxRate(Double.valueOf(taxCode.getSl().replace("%","")));
            }
            baseMapper.insert(product);
@@ -232,4 +256,86 @@
                  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();
      }
      JSONObject loginJson = new JSONObject();
      loginJson.put("username", "admin");
      loginJson.put("password", "Zimafold@2026");
      log.info("石煤机产品获取token入参：{}", loginJson.toJSONString());
      String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
      log.info("石煤机产品获取token回参：{}", 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"))       // 添加认证头
               .execute();                                         // 执行请求.post(ymjErp,request.toJSONString());
         log.info("石煤机产品获取回参：{}", 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")
                           )
                     .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);
                  productClass.setCompId(2089995177814495234L);
                  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")
                     )
                     .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"));
                  productNew.setCompId(2089995177814495234L);
                  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();
   }
}