产品

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -3,7 +3,6 @@ package com.fjhx.sale.service.contract.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -17,7 +16,6 @@ import com.fjhx.area.utils.AreaUtil;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
 import com.fjhx.common.enums.FlowStatusEnum;
-import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
@@ -553,6 +551,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             productIndo.setProductQuantity(item.getQuantity());
             productIndo.setProductPrice(item.getPrice());
             productIndo.setAmount(item.getAmount());
+            productIndo.setProductName(item.getProductName());
             return productIndo;
         }).collect(Collectors.toList());
 
@@ -560,13 +559,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         // 产品属性
         productInfoService.attributeAssign(productInfoList, ContractPdfInfoVo.ProductInfo::getProductId, (item, product) -> {
-            String standardJson = product.getStandardJson();
-            if (StrUtil.isBlank(standardJson)) {
-                throw new ServiceException("标准产品库信息为空");
-            }
-            JSONObject standard = JSONObject.parseObject(standardJson);
-
-            item.setProductName(standard.getString("englishName"));
             item.setProductUnit(product.getUnit());
         });