From 96119ca3973d5ea643db6a87b6a23fe404ddb8cc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 29 六月 2026 15:35:40 +0800
Subject: [PATCH] feat:合同编号规则调整 出库编号规则调整
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 729 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 662 insertions(+), 67 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index a9cf047..568ae38 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -7,6 +7,11 @@
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;
@@ -14,14 +19,11 @@
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
-import com.by4cloud.platformx.business.dto.ContracQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractAddDTO;
-import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
-import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractService;
-import com.by4cloud.platformx.business.utils.ContractNumberGenerator;
+import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.datascope.DataScope;
@@ -33,7 +35,10 @@
import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -43,12 +48,14 @@
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* @author cd
* @description
* @date 2026/4/29 14:07
**/
+@Slf4j
@Service
@RequiredArgsConstructor
public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> implements ContractService {
@@ -65,26 +72,83 @@
private final ProductMapper productMapper;
private final RemoteDeptService remoteDeptService;
private final ContractDelayOutMapper contractDelayOutMapper;
+ private final ErpRequestRecordMapper erpRequestRecordMapper;
+ private final StringRedisTemplate redisTemplate;
+
+ @Value("${erp.ymj}")
+ private String ymjErp;
+
+ @Value("${erp.ymjToken}")
+ private String ymjToken;
+
+ @Value("${erp.smj}")
+ private String smjErp;
+
+ @Value("${erp.sgb}")
+ private String sgbErp;
+
+ @Value("${erp.jxc}")
+ private String jxcErp;
+
+ @Value("${erp.tfgs}")
+ private String tfgsErp;
+
+ @Value("${dept.smj}")
+ private String smj;
+
+ @Value("${dept.sgb}")
+ private String sgb;
+
+ @Value("${dept.jxc}")
+ private String jxc;
+
+ @Value("${dept.tfgs}")
+ private String tfgs;
+
+ @Value("${dept.ymj}")
+ private String ymj;
@Override
public R add(ContractAddDTO addDTO) {
Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setPartyB(SecurityUtils.getUser().getCompName());
- contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+
contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
- if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && (
- StrUtil.equals(addDTO.getContractCategory(), "ymjgkcpmm")||StrUtil.equals(addDTO.getContractCategory(), "ymjgypmm"))) {
- contract.setExpirationDate(DateUtil.offsetDay(contract.getSignDate(),contract.getDeliveryCycle()));
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
}
- List<Contract> contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
- while (ArrayUtil.isNotEmpty(contracts.toArray())) {
- contract.setContractNo(ContractNumberGenerator.generateContractNumber());
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+
+ if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")){
+ // 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+ Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+ .filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+ .max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+ if (maxDateObj.isPresent()) {
+ contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+ }
}
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
+ contract.setContractNo(generateSMJContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ contract.setContractNo(generateGYBContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ contract.setContractNo(generateYMJContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ contract.setContractNo(generateTFContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ contract.setContractNo(generateJXCContractNo());
+ }
+
baseMapper.insert(contract);
if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
@@ -166,16 +230,39 @@
return R.failed("褰撳墠鐘舵�佹棤娉曚慨鏀瑰悎鍚�");
}
Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
- contract.setContractNo(ContractNumberGenerator.generateContractNumber());
contract.setBillingStatus("0");
contract.setErpPushFlag("0");
contract.setPaidAmount(new BigDecimal("0"));
- List<Contract> contracts;
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
- while (ArrayUtil.isNotEmpty(contracts.toArray())) {
- contract.setContractNo(ContractNumberGenerator.generateContractNumber());
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, contract.getContractNo()));
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
+ contract.setContractNo(generateSMJContractNo());
}
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ contract.setContractNo(generateGYBContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ contract.setContractNo(generateYMJContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ contract.setContractNo(generateTFContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ contract.setContractNo(generateJXCContractNo());
+ }
+ if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
+ contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
+ }
+ if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
+ // 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+ Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
+ .filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+ .max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+ if (maxDateObj.isPresent()) {
+ contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+ }
+ }
+
baseMapper.updateById(contract);
if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
@@ -272,10 +359,10 @@
Contract contract = baseMapper.selectById(id);
contract.setContractStatus(2);
baseMapper.updateById(contract);
- if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
- List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId,id));
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId,id));
+ if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
for (ContractSubjectMatter contractSubjectMatter: subjectMatterList) {
if (StrUtil.equals(contract.getExecFrequency(), "1")) {
@@ -474,6 +561,89 @@
// contractPaymentScheduleMapper.updateById(fitstSchedule);
// }
}
+ //erp鎺ㄩ��
+ JSONObject request = new JSONObject();
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ request.put("contractNo",contract.getContractNo());
+ request.put("partyA",contract.getPartyA());
+ request.put("partyACode",customer.getErpCompanyCode());
+
+ if (StrUtil.equals(contract.getPartyBId()+"",ymj)&&StrUtil.isNotEmpty(ymjErp)){
+ request.put("customerCode",customer.getErpCompanyCode());
+ request.put("currencyId","RMB");
+ request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum",contract.getAmount());
+ request.put("signManner","闈㈢");
+ request.put("salesman",contract.getCreateBy());
+ if (ArrayUtil.isNotEmpty(subjectMatterList.toArray())){
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo",ItemGeneratorUtil.nextId());
+ subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
+ .eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)){
+ subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver",ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate())?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(),DatePattern.NORM_DATETIME_PATTERN):
+ DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details",subjectMatter);
+ }
+ log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}",request.toJSONString());
+ HttpResponse response = HttpRequest.post(ymjErp)
+ .header("token", ymjToken) // 娣诲姞璁よ瘉澶�
+ .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
+ .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
+ .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+ log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}",response.body());
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("ymj",request.toJSONString(),response.body());
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId()+"",smj)&&StrUtil.isNotEmpty(smjErp)){
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
+ String result = HttpUtil.post(ymjErp,request.toJSONString());
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}",result);
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("smj",request.toJSONString(),result);
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+
+ if (StrUtil.equals(contract.getPartyBId()+"",jxc)&&StrUtil.isNotEmpty(jxcErp)){
+ log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}",request.toJSONString());
+ String result = HttpUtil.post(ymjErp,request.toJSONString());
+ log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}",result);
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("jxc",request.toJSONString(),result);
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId()+"",tfgs)&&StrUtil.isNotEmpty(tfgsErp)){
+ //閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+ }
+ if (StrUtil.equals(contract.getPartyBId()+"",sgb)&&StrUtil.isNotEmpty(sgbErp)){
+ //鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
+ }
+ }
+
+ private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
+ ErpRequestRecord record = new ErpRequestRecord();
+ record.setErpName(ymj);
+ record.setRequestParams(toJSONString);
+ record.setResponseParams(result);
+ erpRequestRecordMapper.insert(record);
}
private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
@@ -574,41 +744,43 @@
overdueConfirm.setScheduleName(contractPaymentSchedule.getStageName());
PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
- contractPaymentSchedule.getPlannedAmount() :
- contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
- overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
- overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
- overdueConfirm.setTotalAmount(newLastConfirm.getTotalAmount());
- overdueConfirm.setCompId(contract.getCompId());
- //鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
- PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
- .eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
- if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
- paymentConfirmMapper.insert(overdueConfirm);
- }
- //褰撳墠閫炬湡
- CurrentOverdue currentOverdue = new CurrentOverdue();
- currentOverdue.setBusGuestId(contract.getPartyAId());
- currentOverdue.setBusGuestName(contract.getPartyA());
- currentOverdue.setContractId(contractPaymentSchedule.getContractId());
- currentOverdue.setContractName(contractPaymentSchedule.getContractName());
- currentOverdue.setScheduleId(contractPaymentSchedule.getId());
- currentOverdue.setScheduleName(contractPaymentSchedule.getStageName());
- currentOverdue.setCompId(contract.getCompId());
- currentOverdue.setContractExpirTime(contractPaymentSchedule.getEffectiveEndDate());
- currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
- contractPaymentSchedule.getPlannedAmount() : contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
- currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
- CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId, currentOverdue.getContractId())
- .eq(CurrentOverdue::getScheduleId, currentOverdue.getScheduleId()).last("limit 1"));
- if (ObjUtil.isNull(overdue)) {
- if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
- currentOverdueMapper.insert(currentOverdue);
+ if(ObjUtil.isNotNull(newLastConfirm)){
+ overdueConfirm.setTransationAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+ contractPaymentSchedule.getPlannedAmount() :
+ contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
+ overdueConfirm.setReceivableAmount(newLastConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ overdueConfirm.setOverdueAmount(overdueConfirm.getTransationAmount());
+ overdueConfirm.setTotalAmount(newLastConfirm.getTotalAmount());
+ overdueConfirm.setCompId(contract.getCompId());
+ //鍒ゆ柇褰撳墠闃舵鏄惁宸茬敓鎴愪笂闃舵搴旀敹瓒呮湡
+ PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
+ .eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
+ if (ObjUtil.isNull(oiverdueConfirm) && overdueConfirm.getTransationAmount().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(overdueConfirm);
}
- } else {
- overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
- currentOverdueMapper.updateById(overdue);
+ //褰撳墠閫炬湡
+ CurrentOverdue currentOverdue = new CurrentOverdue();
+ currentOverdue.setBusGuestId(contract.getPartyAId());
+ currentOverdue.setBusGuestName(contract.getPartyA());
+ currentOverdue.setContractId(contractPaymentSchedule.getContractId());
+ currentOverdue.setContractName(contractPaymentSchedule.getContractName());
+ currentOverdue.setScheduleId(contractPaymentSchedule.getId());
+ currentOverdue.setScheduleName(contractPaymentSchedule.getStageName());
+ currentOverdue.setCompId(contract.getCompId());
+ currentOverdue.setContractExpirTime(contractPaymentSchedule.getEffectiveEndDate());
+ currentOverdue.setReceivableAmount(StrUtil.equals(contractPaymentSchedule.getPaymentStatus() + "", "0") ?
+ contractPaymentSchedule.getPlannedAmount() : contractPaymentSchedule.getPlannedAmount().subtract(contractPaymentSchedule.getActualAmount()));
+ currentOverdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
+ CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId, currentOverdue.getContractId())
+ .eq(CurrentOverdue::getScheduleId, currentOverdue.getScheduleId()).last("limit 1"));
+ if (ObjUtil.isNull(overdue)) {
+ if (currentOverdue.getReceivableAmount().compareTo(new BigDecimal("0")) > 0) {
+ currentOverdueMapper.insert(currentOverdue);
+ }
+ } else {
+ overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(), new Date(), true)));
+ currentOverdueMapper.updateById(overdue);
+ }
}
});
}
@@ -627,16 +799,24 @@
public R copyNewContract(Long id) {
Contract oldContract = baseMapper.selectById(id);
Contract newContract = BeanUtil.copyProperties(oldContract, Contract.class, "id", "createTime");
- newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
newContract.setPaidAmount(new BigDecimal("0"));
newContract.setBillingStatus("0");
newContract.setErpPushFlag("0");
newContract.setContractStatus(0);
- List<Contract> contracts;
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, newContract.getContractNo()));
- while (ArrayUtil.isNotEmpty(contracts.toArray())) {
- newContract.setContractNo(ContractNumberGenerator.generateContractNumber());
- contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, newContract.getContractNo()));
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
+ newContract.setContractNo(generateSMJContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ newContract.setContractNo(generateGYBContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ newContract.setContractNo(generateYMJContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ newContract.setContractNo(generateTFContractNo());
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ newContract.setContractNo(generateJXCContractNo());
}
baseMapper.insert(newContract);
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, id));
@@ -1169,10 +1349,425 @@
return baseMapper.pageScope(page,queryDTO, DataScope.of("comp_id"));
}
- public static void main(String[] args) {
- System.out.println(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")));
- System.out.println(DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")));
- System.out.println(DateUtil.betweenMonth(DateUtil.beginOfQuarter(DateUtil.parseDate("2026-06-05")),
- DateUtil.endOfQuarter(DateUtil.parseDate("2026-09-30")),true));
+ @Override
+ public void exportContractTFGSGYPMMWord(Long id, HttpServletResponse response) {
+ Contract contract = baseMapper.selectById(id);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, id).orderByAsc(ContractSubjectMatter::getCreateTime));
+ Map<String, Object> map = new HashMap<>();
+ //鍚堝悓鍩烘湰淇℃伅
+ map.put("partyA", contract.getPartyA());
+ map.put("partyB", contract.getPartyB());
+ map.put("contractNo", contract.getContractNo());
+ map.put("signPlace", contract.getSignPlace());
+ map.put("signDate", DateUtil.formatDate(contract.getSignDate()));
+ map.put("signDateYMD", DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+ map.put("total", contract.getAmount());
+ map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+ //鏍囩殑鐗�
+ List<Map<String, Object>> items = new ArrayList<>();
+ List<RowRenderData> dataList = new ArrayList<>();
+ AtomicReference<Integer> no = new AtomicReference<>(0);
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ Map<String, Object> item = new HashMap<>();
+ item.put("materialName", contractSubjectMatter.getMaterialName());
+ item.put("guige", contractSubjectMatter.getSpecification());
+ item.put("unit", contractSubjectMatter.getUnit());
+ item.put("quantity", contractSubjectMatter.getQuantity());
+ item.put("unitPrice", contractSubjectMatter.getUnitPrice());
+ item.put("price", contractSubjectMatter.getTotalAmount());
+
+ items.add(item);
+ no.updateAndGet(v -> v + 1);
+ });
+ map.put("items", items);
+ //瀹氬埗鏂�
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ map.put("companyName", customer.getRegisterName());
+ map.put("legalPerson", customer.getLegalPerson());
+ map.put("contactPhone", customer.getContactPhone());
+ map.put("bankName", customer.getBankName());
+ map.put("bankAccount", customer.getBankAccount());
+
+ //鎵挎徑鏂�
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ SysDept dept = r.getData();
+ map.put("orgName", dept.getOrgName());
+ map.put("legalPerson1", StrUtil.isNotEmpty(dept.getLegalPerson()) ? dept.getLegalPerson() : "");
+ map.put("entrustedAgent", StrUtil.isNotEmpty(dept.getLegalPerson()) ? "" : dept.getEntrustedAgent());
+ map.put("orgContact", dept.getOrgContact());
+ map.put("orgBank", dept.getOrgBank());
+ map.put("orgBankAccount", dept.getOrgBankAccount());
+
+ //鐢熸垚鏂囦欢鍚�
+ Long time = new Date().getTime();
+ // 鐢熸垚鐨剋ord鏍煎紡
+ String formatSuffix = ".docx";
+ // 鎷兼帴鍚庣殑鏂囦欢鍚�
+ String fileName = time + formatSuffix;//鏂囦欢鍚� 甯﹀悗缂�
+ //瀵煎嚭word
+ try {
+ // 1. 鍔犺浇妯＄増
+ // 鍋囪妯＄増鍦� resources/templates/template.docx
+ ClassPathResource resource = new ClassPathResource("template/tfgs/tfgsgypmmht.docx");
+ // 閰嶇疆鍒楄〃绛栫暐
+ Configure config = Configure.builder()
+ .bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+ .build();
+ // 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+ XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(), config).render(map);
+
+ // 3. 璁剧疆鍝嶅簲澶�
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+ // 4. 鍐欏叆杈撳嚭娴�
+ OutputStream out = response.getOutputStream();
+ xwpfTemplate.write(out);
+ out.flush();
+ out.close();
+ xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
+
+ @Override
+ public R addContractSgb(ContractAddDTO addDTO) {
+ if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter().toArray())){
+ return R.failed("璇锋坊鍔犳爣鐨勭墿");
+ }
+ if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule().toArray())){
+ return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+ }
+ if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())){
+ return R.failed("浠樻闃舵淇℃伅寮傚父");
+ }
+ if (addDTO.getContractPaymentSchedule().stream().map(item->item.getPaymentRatio()).reduce(BigDecimal.ZERO,BigDecimal::add)
+ .compareTo(new BigDecimal("100.00"))!=0){
+ return R.failed("浠樻闃舵姣斾緥寮傚父");
+ }
+ Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+ contract.setErpContractNo(contract.getContractNo());
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ contract.setContractStatus(2);
+ contract.setPaidAmount(new BigDecimal("0"));
+ contract.setBillingStatus("0");
+ contract.setErpPushFlag("1");
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())){
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(),addDTO.getDeliveryCycle()));
+ }
+
+ contract.setContractNo(generateGYBContractNo());
+
+ if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")){
+ // 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+ Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+ .filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+ .max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+ if (maxDateObj.isPresent()) {
+ contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+ }
+ }
+ baseMapper.insert(contract);
+
+ if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setContractName(contract.getContractName());
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ //姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+ if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+ ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
+ record.setContractId(contract.getId());
+ record.setMatterId(subjectMatter.getId());
+ record.setContractName(contract.getContractName());
+ record.setBusGuestId(contract.getPartyAId());
+ record.setBusGuestName(contract.getPartyA());
+ record.setMeterReadTime(new Date());
+ meterReadRecordMapper.insert(record);
+ }
+ if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
+ &&ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())&&ObjUtil.isNotNull(contract.getExpirationDate())
+ &&DateUtil.compare(contract.getExpirationDate(),subjectMatter.getPlannedDeliveryDate())>0) {
+ contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+ if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+ AtomicInteger index = new AtomicInteger(1);
+ addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+ int currentIndex = index.getAndIncrement();
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+ schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+ }
+ if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+ if (schedule.getEffectiveDate().before(DateUtil.date())) {
+ schedule.setFulfillmentStatus(1);
+ } else {
+ schedule.setFulfillmentStatus(0);
+ }
+ }
+ if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ schedule.setPaymentStatus(0);
+ } else {
+ schedule.setPaymentStatus(3);
+ }
+ schedule.setContractId(contract.getId());
+ schedule.setContractName(contract.getContractName());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+ schedule.setStageOrder(currentIndex);
+ contractPaymentScheduleMapper.insert(schedule);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+
+ return R.ok(contract.getId());
+ }
+
+ @Override
+ public R updateContractSgb(ContractUpdateDTO updateDTO) {
+ if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter().toArray())){
+ return R.failed("璇锋坊鍔犳爣鐨勭墿");
+ }
+ if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule().toArray())){
+ return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+ }
+ if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())){
+ return R.failed("浠樻闃舵淇℃伅寮傚父");
+ }
+ if (updateDTO.getContractPaymentSchedule().stream().map(item->item.getPaymentRatio()).reduce(BigDecimal.ZERO,BigDecimal::add)
+ .compareTo(new BigDecimal("100.00"))!=0){
+ return R.failed("浠樻闃舵姣斾緥寮傚父");
+ }
+
+ Contract contract = BeanUtil.copyProperties(updateDTO, Contract.class);
+ if (ObjUtil.isNotNull(updateDTO.getDeliveryCycle())){
+ contract.setExpirationDate(DateUtil.offsetDay(updateDTO.getSignDate(),updateDTO.getDeliveryCycle()));
+ }
+ if (!StrUtil.equals(updateDTO.getContractCategory(), "water_house")){
+ // 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+ Optional<ContractSubjectMatterAddDTO> maxDateObj = updateDTO.getContractSubjectMatter().stream()
+ .filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+ .max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+ if (maxDateObj.isPresent()) {
+ contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+ }
+ }
+ baseMapper.updateById(contract);
+
+ if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+
+ updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setContractName(contract.getContractName());
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ contractSubjectMatterMapper.insert(subjectMatter);
+ //姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+ if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+ ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+ meterReadRecordMapper.delete(Wrappers.<MeterReadRecord>lambdaQuery().eq(MeterReadRecord::getContractId, contract.getId()));
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class,"id");
+ record.setContractId(contract.getId());
+ record.setMatterId(subjectMatter.getId());
+ record.setContractName(contract.getContractName());
+ record.setBusGuestId(contract.getPartyAId());
+ record.setBusGuestName(contract.getPartyA());
+ record.setMeterReadTime(new Date());
+ meterReadRecordMapper.insert(record);
+ }
+ });
+ }
+
+ if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+ contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
+
+ AtomicInteger index = new AtomicInteger(1);
+ updateDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+ int currentIndex = index.getAndIncrement();
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+ schedule.setContractId(contract.getId());
+ schedule.setContractName(contract.getContractName());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+ schedule.setStageOrder(currentIndex);
+ if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ schedule.setPaymentStatus(0);
+ } else {
+ schedule.setPaymentStatus(3);
+ }
+ contractPaymentScheduleMapper.insert(schedule);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+ return R.ok();
+ }
+
+ // 瀹氫箟鏍囧噯鐨勪簲涓樁娈�
+ private static final Set<String> VALID_STAGES = new HashSet<>(Arrays.asList(
+ "鍚堝悓绛捐",
+ "鍙戣揣鍓�",
+ "璐у埌绛炬敹",
+ "璋冭瘯瀹屾垚鎴栭獙鏀�",
+ "璐ㄤ繚閲�"
+ ));
+
+ /**
+ * 鍒ゆ柇浠樻闃舵鍒楄〃鏄惁绗﹀悎鏍囧噯
+ * @param scheduleList 浠樻闃舵鍒楄〃
+ * @return true 濡傛灉鍖呭惈涓斾粎鍖呭惈鏍囧噯鐨勪簲涓樁娈碉紝false 鍚﹀垯
+ */
+ public static boolean isValidPaymentStages(List<ContractPaymentScheduleAddDTO> scheduleList) {
+ if (scheduleList == null || scheduleList.isEmpty()) {
+ return false;
+ }
+
+ // 1. 鎻愬彇鎵�鏈夐潪绌虹殑 stageName
+ List<String> actualStages = scheduleList.stream()
+ .map(ContractPaymentScheduleAddDTO::getStageName)
+ .filter(stage -> stage != null && !stage.trim().isEmpty())
+ .map(String::trim)
+ .collect(Collectors.toList());
+
+ // 2. 鍩烘湰鏁伴噺妫�鏌ワ細蹇呴』姝ｅソ鏄�5涓�
+ if (actualStages.size() != VALID_STAGES.size()) {
+ return false;
+ }
+
+ // 3. 鍐呭妫�鏌ワ細鎵�鏈夊疄闄呴樁娈甸兘蹇呴』鍦ㄦ爣鍑嗛泦鍚堜腑
+ // 浣跨敤 Set 鍘婚噸鍚庢瘮杈冿紝闃叉鍒楄〃涓湁閲嶅闃舵浣嗘�绘暟鍑戝5涓殑鎯呭喌
+ Set<String> actualStageSet = new HashSet<>(actualStages);
+
+ // 妫�鏌ュ疄闄呴泦鍚堝ぇ灏忔槸鍚︿篃涓�5锛堢‘淇濇棤閲嶅锛変笖鍖呭惈浜庢爣鍑嗛泦鍚�
+ return VALID_STAGES.equals(actualStageSet);
+ }
+
+ /**
+ * 鐢熸垚鏍煎紡涓�: yyyyMMdd + 4浣嶅簭鍒楀彿 (渚嬪: 20260629000001)
+ */
+ public String generateSMJContractNo() {
+ // 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+ // 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+ String key = "ZB-SMJ:" + dateStr;
+
+ // 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+ Long sequence = redisTemplate.opsForValue().increment(key, 1);
+ redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+ // 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+ String seqStr = String.format("%04d", sequence);
+
+ // 5. 鎷兼帴杩斿洖
+ return "ZB-SMJ-"+dateStr + seqStr;
+ }
+
+ public String generateYMJContractNo() {
+ // 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+ // 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+ String key = "ZB-YMJ:" + dateStr;
+
+ // 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+ Long sequence = redisTemplate.opsForValue().increment(key, 1);
+ redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+ // 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+ String seqStr = String.format("%04d", sequence);
+
+ // 5. 鎷兼帴杩斿洖
+ return "ZB-YMJ-"+dateStr + seqStr;
+ }
+
+ public String generateJXCContractNo() {
+ // 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+ // 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+ String key = "ZB-JXC:" + dateStr;
+
+ // 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+ Long sequence = redisTemplate.opsForValue().increment(key, 1);
+ redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+ // 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+ String seqStr = String.format("%04d", sequence);
+
+ // 5. 鎷兼帴杩斿洖
+ return "ZB-JXC-"+dateStr + seqStr;
+ }
+
+ public String generateTFContractNo() {
+ // 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+ // 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+ String key = "ZB-TF:" + dateStr;
+
+ // 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+ Long sequence = redisTemplate.opsForValue().increment(key, 1);
+ redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+ // 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+ String seqStr = String.format("%04d", sequence);
+
+ // 5. 鎷兼帴杩斿洖
+ return "ZB-TF-"+dateStr + seqStr;
+ }
+
+ public String generateGYBContractNo() {
+ // 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+
+ // 2. 鏋勫缓 Redis Key锛屾寜澶╅殧绂伙紝渚嬪: order:no:20260629
+ String key = "ZB-GYB:" + dateStr;
+
+ // 3. Redis 鍘熷瓙閫掑锛岃缃繃鏈熸椂闂翠负2澶╋紙闃叉Key鍫嗙Н锛屽悓鏃惰鐩栬法澶╄竟鐣屾儏鍐碉級
+ Long sequence = redisTemplate.opsForValue().increment(key, 1);
+ redisTemplate.expire(key, 1, java.util.concurrent.TimeUnit.DAYS);
+
+ // 4. 鏍煎紡鍖栧簭鍒楀彿锛屼笉瓒�6浣嶅墠琛�0
+ String seqStr = String.format("%04d", sequence);
+
+ // 5. 鎷兼帴杩斿洖
+ return "ZB-GYB-"+dateStr + seqStr;
+ }
+
}
--
Gitblit v1.9.1