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

feat:合同

Browse Source
This commit is contained in:
苏竹红
2025-11-25 16:31:42 +08:00
parent 19376134d0
commit 1ca3994821
5 changed files with 113 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java
View File

@@ -41,5 +41,14 @@ public interface SignFranchiseService {
*/
Boolean rePay(Long shopId);
/**
* 回退到缴费阶段
* @param shopId
* @return
*/
Boolean backPayFeeStage(Long shopId);
Integer dateHandle();
}

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

@@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -205,6 +206,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
if (Boolean.TRUE.equals(acquired)) {
SignFranchiseDO signFranchiseDO = request.toSignFranchiseDO();
if (Objects.isNull(request.getId())) {
signFranchiseDO.setCreateUserId(user.getUserId());
signFranchiseMapper.insertSelective(signFranchiseDO);
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83);
//发送通知
@@ -531,6 +533,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(shopId);
SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
String userName = "";
if (signFranchiseDO == null){
userName = enterpriseUserDAO.getUserName(signFranchiseDO.getCreateUserId());
}
log.info("加盟合同审批时签约类型:{}", SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
//自营店 无缴费信息 不需要校验
@@ -560,7 +568,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
contractInformationDTO.setJoinSource(signFranchiseDO.getJoinSource());
contractInformationDTO.setManageFeeFrequency(signFranchiseDO.getManageFeeFrequency());
contractInformationDTO.setDiscountAmount(signFranchiseDO.getDiscountAmount());
contractInformationDTO.setSummitUserName(userName);
//老店转加盟(也叫直营转加盟)
if (SignTypeEnum.DIRECT_SALES_TO_JOINING.getCode().equals(signFranchiseDO.getSignType())){
@@ -655,38 +663,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setManagerRegionName(managerRegion.getName());
}
if (Objects.nonNull(signFranchiseDO)) {
addSignFranchiseResponse.setUnifiedManagement(signFranchiseDO.getUnifiedManagement());
addSignFranchiseResponse.setInfoConsistencyFlag(signFranchiseDO.getInfoConsistencyFlag());
addSignFranchiseResponse.setReason(signFranchiseDO.getReason());
addSignFranchiseResponse.setId(signFranchiseDO.getId());
addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId());
addSignFranchiseResponse.setSignType(signFranchiseDO.getSignType());
addSignFranchiseResponse.setBrandFee(signFranchiseDO.getBrandFee());
addSignFranchiseResponse.setIsBusinessLicense(signFranchiseDO.getIsBusinessLicense());
addSignFranchiseResponse.setIsFoodLicense(signFranchiseDO.getIsFoodLicense());
addSignFranchiseResponse.setContractStartTime(signFranchiseDO.getContractStartTime());
addSignFranchiseResponse.setContractStartEndTime(signFranchiseDO.getContractEndTime());
addSignFranchiseResponse.setImpressionNum(signFranchiseDO.getImpressionNum());
addSignFranchiseResponse.setBusinessStartHours(signFranchiseDO.getBusinessStartHours());
addSignFranchiseResponse.setBusinessEndHours(signFranchiseDO.getBusinessEndHours());
addSignFranchiseResponse.setIrregularReason(signFranchiseDO.getIrregularReason());
addSignFranchiseResponse.setRemark(signFranchiseDO.getRemark());
addSignFranchiseResponse.setResign(signFranchiseDO.getResign());
addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile());
addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode());
addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount());
addSignFranchiseResponse.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
addSignFranchiseResponse.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
addSignFranchiseResponse.setBusinessModel(signFranchiseDO.getBusinessModel());
addSignFranchiseResponse.setPartnershipSignatorySecondIdNumber(signFranchiseDO.getPartnershipSignatorySecondIdNumber());
addSignFranchiseResponse.setPartnershipSignatorySecondMobile(signFranchiseDO.getPartnershipSignatorySecondMobile());
addSignFranchiseResponse.setProtectiveDistance(signFranchiseDO.getProtectiveDistance());
addSignFranchiseResponse.setIntroducer(signFranchiseDO.getIntroducer());
addSignFranchiseResponse.setIntroduceStore(signFranchiseDO.getIntroduceStore());
addSignFranchiseResponse.setIntroductionAward(signFranchiseDO.getIntroductionAward());
addSignFranchiseResponse.setPartnershipSignatoryFirstWhichStore(signFranchiseDO.getPartnershipSignatoryFirstWhichStore());
addSignFranchiseResponse.setOldShopCode(signFranchiseDO.getOldShopCode());
BeanUtils.copyProperties(signFranchiseDO, addSignFranchiseResponse);
} else {
if (Objects.nonNull(franchiseFeeDO)) {
BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee())
@@ -778,6 +755,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
return true;
}
@Override
public Boolean backPayFeeStage(Long shopId) {
//回退到对账中 此阶段账单可编辑 可再次对账
shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72);
//缴费阶段回退到未开始
shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_8);
return true;
}
@Override
public Integer dateHandle() {
return signFranchiseMapper.dateHandle();