suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:addContractConfig

Browse Source
This commit is contained in:
苏竹红
2025-09-08 18:46:42 +08:00
parent 2d4402c351
commit 83ddafb842
11 changed files with 661 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
coolstore-partner-service/src/main/java/com/cool/store/service/ContractConfigService.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cool.store.service;
import com.cool.store.dto.contract.ContractConfigDTO;
import com.cool.store.dto.contract.ContractListDTO;
import com.cool.store.dto.contract.QueryContractListDTO;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
/**
* @Author suzhuhong
* @Date 2025/9/8 15:46
* @Version 1.0
*/
public interface ContractConfigService {
/**
* 新增配置
* @param addContractConfigDTO
* @return
*/
Boolean addContractConfig(ContractConfigDTO addContractConfigDTO);
/**
* 修改配置
* @param addContractConfigDTO
* @return
*/
Boolean updateContractConfig(ContractConfigDTO addContractConfigDTO);
/**
* 查询配置列表
* @param queryContractListDTO
* @return
*/
PageInfo<ContractListDTO> queryContractConfigList(QueryContractListDTO queryContractListDTO);
}

82
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContractConfigServiceImpl.java Normal file
View File

@@ -0,0 +1,82 @@
package com.cool.store.service.impl;
import com.cool.store.dao.ContractConfigDAO;
import com.cool.store.dto.contract.ContractConfigDTO;
import com.cool.store.dto.contract.ContractListDTO;
import com.cool.store.dto.contract.QueryContractListDTO;
import com.cool.store.entity.ContractConfigDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.service.ContractConfigService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Author suzhuhong
* @Date 2025/9/8 15:47
* @Version 1.0
*/
@Service
public class ContractConfigServiceImpl implements ContractConfigService {
@Resource
private ContractConfigDAO contractConfigDAO;
@Override
public Boolean addContractConfig(ContractConfigDTO addContractConfigDTO) {
ContractConfigDO contractConfig = contractConfigDAO.queryContractConfigByBrand(addContractConfigDTO.getBrand(), addContractConfigDTO.getSerialNumber());
if (contractConfig != null){
throw new ServiceException(ErrorCodeEnum.CURRENT_BRAND_SORT_NUMBER_EXIST);
}
ContractConfigDO contractConfigDO = new ContractConfigDO();
BeanUtils.copyProperties(addContractConfigDTO, contractConfigDO);
if (addContractConfigDTO.getFranchiseModeList() != null){
String modelStr = addContractConfigDTO.getFranchiseModeList().stream().collect(Collectors.joining(","));
contractConfigDO.setFranchiseMode("," + modelStr + ",");
}
contractConfigDAO.addContractConfig(contractConfigDO);
return Boolean.TRUE;
}
@Override
public Boolean updateContractConfig(ContractConfigDTO addContractConfigDTO) {
ContractConfigDO contractConfig = contractConfigDAO.queryContractConfigByBrand(addContractConfigDTO.getBrand(), addContractConfigDTO.getSerialNumber());
if (contractConfig != null && !contractConfig.getId().equals(addContractConfigDTO.getId())){
throw new ServiceException(ErrorCodeEnum.CURRENT_BRAND_SORT_NUMBER_EXIST);
}
ContractConfigDO contractConfigDO = new ContractConfigDO();
BeanUtils.copyProperties(addContractConfigDTO, contractConfigDO);
if (addContractConfigDTO.getFranchiseModeList() != null){
String modelStr = addContractConfigDTO.getFranchiseModeList().stream().collect(Collectors.joining(","));
contractConfigDO.setFranchiseMode("," + modelStr + ",");
}
return Boolean.TRUE;
}
@Override
public PageInfo<ContractListDTO> queryContractConfigList(QueryContractListDTO queryContractListDTO) {
PageHelper.startPage(queryContractListDTO.getPageNum(), queryContractListDTO.getPageSize());
List<ContractConfigDO> contractConfigDOList = contractConfigDAO.queryContractConfigList(queryContractListDTO.getBrand());
if (CollectionUtils.isEmpty(contractConfigDOList)){
return new PageInfo<>();
}
PageInfo contractConfigDOPageInfo = new PageInfo<>(contractConfigDOList);
List<ContractListDTO> result = new ArrayList<>();
contractConfigDOList.forEach(contractConfigDO -> {
ContractListDTO contractListDTO = new ContractListDTO();
BeanUtils.copyProperties(contractConfigDO, contractListDTO);
result.add(contractListDTO);
});
contractConfigDOPageInfo.setList( result);
return contractConfigDOPageInfo;
}
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -418,7 +418,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
contractInformationDTO.setShopName(shopInfoDO.getShopName());
//品牌信息
contractInformationDTO.setSign1Name(signFranchiseDO.getPartnershipSignatoryFirst());
contractInformationDTO.setSign2Name(signFranchiseDO.getPartnershipSignatorySecond());
contractInformationDTO.setFirstYearFee(franchiseFeeDO.getFirstYearFee());
@@ -428,9 +427,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
contractInformationDTO.setPerformanceBond(franchiseFeeDO.getPerformanceBond());
log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
Boolean sendNotice = Boolean.TRUE;
commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SIGN_CONTRACT);