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/BusinessCustomerServiceImpl.java | 77 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
index 0767e4d..fe543dc 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BusinessCustomerServiceImpl.java
@@ -1,10 +1,12 @@
package com.by4cloud.platformx.business.service.impl;
-import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.business.dto.BusinessCustomerAddDTO;
import com.by4cloud.platformx.business.entity.BusinessCustomer;
import com.by4cloud.platformx.business.mapper.BipBanklViewMapper;
import com.by4cloud.platformx.business.mapper.BipViewMapper;
@@ -43,30 +45,38 @@
.or().isNull(BusinessCustomer::getLegalPerson)
.or().isNull(BusinessCustomer::getBankName)
.or().isNull(BusinessCustomer::getBankAccount)
- .or().isNull(BusinessCustomer::getRegisterName))
+ .or().isNull(BusinessCustomer::getRegisterName)
+ .or().isNull(BusinessCustomer::getBipCode))
);
- if (ArrayUtil.isNotEmpty(bcList.toArray())){
+ if (CollUtil.isNotEmpty(bcList)){
for (BusinessCustomer bc:bcList
) {
log.info("寮�濮嬪悓姝}淇℃伅",bc.getCompanyName());
CustInfoVo custInfo = bipViewMapper.selectBaseInfoByCustName(bc.getCompanyName());
+ if (ObjUtil.isNull(custInfo)){
+ continue;
+ }
if (ObjUtil.isNotNull(custInfo)){
bc.setCreditCode(custInfo.getCertificateId());
bc.setRegisterName(custInfo.getCustName());
bc.setLegalPerson(custInfo.getLegalPerson());
bc.setAddress(custInfo.getRegistrationAddress());
+ bc.setBipCode(custInfo.getCustCode());
baseMapper.updateById(bc);
- log.info("{}鍚屾鍚嶇О銆佹硶浜恒�佸湴鍧�銆佷俊鐢ㄧ爜淇℃伅鎴愬姛",bc.getCompanyName());
+ log.info("{}鍚屾鍚嶇О銆佹硶浜恒�佸湴鍧�銆佷俊鐢ㄧ爜銆乥ipcode淇℃伅鎴愬姛",bc.getCompanyName());
}
List<CustBankVo> bankVoList = bipViewMapper.selectBankByCustName(bc.getCompanyName());
- if (ArrayUtil.isNotEmpty(bankVoList.toArray())){
+ if (CollUtil.isEmpty(bankVoList)){
+ continue;
+ }
+ if (CollUtil.isNotEmpty(bankVoList)){
if (StrUtil.isEmpty(bc.getBankAccount())){
bc.setBankAccount(bankVoList.get(0).getBankAccount());
baseMapper.updateById(bc);
log.info("{}鍚屾閾惰鍗″彿淇℃伅鎴愬姛",bc.getCompanyName());
}
List<BankNameVo> bankNameVoList = bipBanklViewMapper.selectBankByCode(bankVoList.get(0).getBankName());
- if (ArrayUtil.isNotEmpty(bankNameVoList.toArray())){
+ if (CollUtil.isNotEmpty(bankNameVoList)){
bc.setBankName(bankNameVoList.get(0).getBankNameName());
baseMapper.updateById(bc);
log.info("{}鍚屾閾惰鍚嶇О淇℃伅鎴愬姛",bc.getCompanyName());
@@ -92,17 +102,68 @@
log.info("{}涓绘暟鎹煡璇㈠悕绉般�佹硶浜恒�佸湴鍧�銆佷俊鐢ㄧ爜淇℃伅鎴愬姛",companyName);
}
List<CustBankVo> bankVoList = bipViewMapper.selectBankByCustName(bc.getCompanyName());
- if (ArrayUtil.isNotEmpty(bankVoList.toArray())){
+ if (CollUtil.isNotEmpty(bankVoList)){
if (StrUtil.isEmpty(bc.getBankAccount())){
bc.setBankAccount(bankVoList.get(0).getBankAccount());
log.info("{}涓绘暟鎹煡璇㈤摱琛屽崱鍙蜂俊鎭垚鍔�",companyName);
}
List<BankNameVo> bankNameVoList = bipBanklViewMapper.selectBankByCode(bankVoList.get(0).getBankName());
- if (ArrayUtil.isNotEmpty(bankNameVoList.toArray())){
+ if (CollUtil.isNotEmpty(bankNameVoList)){
bc.setBankName(bankNameVoList.get(0).getBankNameName());
log.info("{}涓绘暟鎹煡璇㈤摱琛屽悕绉颁俊鎭垚鍔�",companyName);
}
}
return bc;
}
+
+ @Override
+ public R saveCustomerSgb(BusinessCustomerAddDTO addDTO) {
+ if (StrUtil.isBlank(addDTO.getCompanyName())||StrUtil.isBlank(addDTO.getCreditCode())){
+ return R.failed("瀹㈠晢鍚嶇О鎴栫ぞ浼氫俊鐢ㄤ唬鐮佷笉鑳戒负绌�");
+ }
+ BusinessCustomer bc = baseMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getCompanyName,addDTO.getCompanyName())
+ .eq(BusinessCustomer::getCreditCode,addDTO.getCreditCode()).last("limit 1"));
+ if (ObjUtil.isNotNull(bc)){
+ return R.failed("瀹㈠晢宸插瓨鍦�");
+ }
+ BusinessCustomer customer = new BusinessCustomer();
+ log.info("涓绘暟鎹煡璇}淇℃伅",addDTO.getCompanyName());
+ CustInfoVo custInfo = bipViewMapper.selectBaseInfoByCustName(addDTO.getCompanyName());
+ if (ObjUtil.isNotNull(custInfo)){
+ if (!addDTO.getCreditCode().equals(custInfo.getCertificateId())){
+ return R.failed("涓绘暟鎹ぞ浼氫俊鐢ㄤ唬鐮佷笌鏂板鐨勪笉涓�鑷�");
+ }
+ customer.setCompanyName(addDTO.getCompanyName());
+ customer.setCreditCode(custInfo.getCertificateId());
+ customer.setRegisterName(custInfo.getCustName());
+ customer.setLegalPerson(custInfo.getLegalPerson());
+ customer.setAddress(custInfo.getRegistrationAddress());
+ customer.setProvince(customer.getCreditCode().substring(2,4));
+ if (StrUtil.isNotEmpty(addDTO.getSalesModel())&& addDTO.getSalesModel().matches("[0-9]+")){
+ customer.setSalesModel(Long.valueOf(addDTO.getSalesModel()));
+ }
+ if (StrUtil.isNotEmpty(addDTO.getExportServiceAttr())&& addDTO.getExportServiceAttr().matches("[0-9]+")){
+ customer.setExportServiceAttr(Long.valueOf(addDTO.getExportServiceAttr()));
+ }
+ if (StrUtil.isNotEmpty(addDTO.getClassId())&& addDTO.getClassId().matches("[0-9]+")){
+ customer.setClassId(Long.valueOf(addDTO.getClassId()));
+ }
+ customer.setInvoiceType("01");
+ log.info("{}涓绘暟鎹煡璇㈠悕绉般�佹硶浜恒�佸湴鍧�銆佷俊鐢ㄧ爜淇℃伅鎴愬姛",addDTO.getCompanyName());
+ List<CustBankVo> bankVoList = bipViewMapper.selectBankByCustName(addDTO.getCompanyName());
+ if (CollUtil.isNotEmpty(bankVoList)){
+ customer.setBankAccount(bankVoList.get(0).getBankAccount());
+ log.info("{}涓绘暟鎹煡璇㈤摱琛屽崱鍙蜂俊鎭垚鍔�",addDTO.getCompanyName());
+ List<BankNameVo> bankNameVoList = bipBanklViewMapper.selectBankByCode(bankVoList.get(0).getBankName());
+ if (CollUtil.isNotEmpty(bankNameVoList)){
+ customer.setBankName(bankNameVoList.get(0).getBankNameName());
+ log.info("{}涓绘暟鎹煡璇㈤摱琛屽悕绉颁俊鎭垚鍔�",addDTO.getCompanyName());
+ }
+ }
+ customer.setRegisterName(custInfo.getCustName());
+ baseMapper.insert(customer);
+ return R.ok();
+ }
+ return R.failed("涓绘暟鎹鍟嗕俊鎭笉瀛樺湪");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1