From 6f44f627f7825034d6489c6fe4707859e2123d6d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 12 Mar 2025 10:37:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0=E6=8B=A6?= =?UTF-8?q?=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AuditOpeningOperationPlanImpl.java | 5 ++++ .../store/service/impl/DeskServiceImpl.java | 24 ++++++++++++------- .../service/impl/FranchiseFeeServiceImpl.java | 9 +++++++ .../impl/IntentAgreementServiceImpl.java | 3 +++ .../store/service/impl/PointServiceImpl.java | 4 ++++ .../impl/TempUserDetailServiceImpl.java | 3 +++ 6 files changed, 40 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java index 2f7468e96..1532dfbf7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java @@ -7,6 +7,7 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.*; +import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.OpeningOperationPlanAuditRequest; @@ -55,6 +56,10 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS log.error("auditPlan request is null"); throw new ServiceException("auditPlan request is null"); } + ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_14); + if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_141.getShopSubStageStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } try { ShopAuditInfoDO shopAuditInfoDO = request.toShopAuditInfoDO(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 24f6ff1e7..0cc1194ce 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -303,10 +303,12 @@ public class DeskServiceImpl implements DeskService { } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); doThing(deskStageMap, subStageList); for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } pageInfo.setList(list); return pageInfo; @@ -324,10 +326,12 @@ public class DeskServiceImpl implements DeskService { } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); doThing(deskStageMap, subStageList); for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } pageInfo.setList(list); return pageInfo; @@ -345,10 +349,12 @@ public class DeskServiceImpl implements DeskService { } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); doThing(deskStageMap, subStageList); for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } pageInfo.setList(list); return pageInfo; @@ -365,10 +371,12 @@ public class DeskServiceImpl implements DeskService { } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()); doThing(deskStageMap, subStageList); for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } pageInfo.setList(list); return pageInfo; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index db7ef1e94..1030327f3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -5,6 +5,7 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.*; +import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.*; @@ -54,6 +55,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Transactional(rollbackFor = Exception.class) public Boolean submitLicense(FranchiseFeeRequest request) { log.info("submitLicense request：{}", JSONObject.toJSONString(request)); + ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } FranchiseFeeDO franchiseFeeDO = request.toFranchiseFeeDO(); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71); if (request.getId() != null) { @@ -112,6 +117,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Override public Boolean auditFranchiseFee(AuditFranchiseFeeRequest request, LoginUserInfo user) { + ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(request.getShopId()); ShopSubStageStatusEnum shopSubStageStatusEnum = null; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 30022e612..99195f3cc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -143,6 +143,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten @Override @Transactional(rollbackFor = Exception.class) protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) { + if (!lineInfo.getWorkflowStage().equals(WorkflowStageEnum.INTENT.getCode())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } lineInfo.setId(lineInfo.getId()); lineInfo.setWorkflowStage(WorkflowStageEnum.STORE.getCode()); lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 0aa725e99..e42fc5911 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -950,6 +950,10 @@ public class PointServiceImpl implements PointService { if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){ throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } + ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2); + if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21.getShopSubStageStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); //正新放开限制 // if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index 414e3aa0b..fea6ab98e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -197,6 +197,9 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { @Override public void registrationCompleted(Long shopId) { ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_5); + if (!shopStageInfoDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_50.getShopSubStageStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } if(shopStageInfoDO != null){ shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51); //状态结束 From d740d9ba6cacb203d8df3f440bdef49559ad98f0 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 12 Mar 2025 11:11:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A0=E6=8B=A6?= =?UTF-8?q?=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/DeskServiceImpl.java | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 0cc1194ce..49c5915fc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -20,6 +20,7 @@ import com.cool.store.service.DeskService; import com.cool.store.service.RegionService; import com.cool.store.service.SysRoleService; import com.cool.store.service.UserAuthMappingService; +import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.StringUtil; import com.cool.store.utils.poi.DateUtils; import com.cool.store.vo.BaseInfoVO; @@ -37,6 +38,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; +import static com.cool.store.utils.poi.DateUtils.SPECIAL_DATE_START; import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS; /** @@ -122,7 +124,7 @@ public class DeskServiceImpl implements DeskService { PayStagePendingVO payStagePendingVO = new PayStagePendingVO(baseInfoVO); LinePayDO linePayDO = payMap.get(x.getId()); if (linePayDO != null && linePayDO.getPayTime() != null) { - payStagePendingVO.setPayTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime())); + payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime())); } list.add(payStagePendingVO); @@ -149,7 +151,7 @@ public class DeskServiceImpl implements DeskService { SigningPendingVO signingPendingVO = new SigningPendingVO(baseInfoVO); Date date = dateMap.get(x.getId()); if (date != null) { - signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date)); + signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); } list.add(signingPendingVO); }); @@ -248,7 +250,7 @@ public class DeskServiceImpl implements DeskService { List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map shopPayDoMap = linePayDAO.getLinePayByShopIds(shopIds, PayBusinessTypeEnum.FRANCHISE_FEE.getCode()); for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime())); + vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, shopPayDoMap.getOrDefault(vo.getShopId(), new LinePayDO()).getCreateTime())); } pageInfo.setList(list); return pageInfo; @@ -395,7 +397,9 @@ public class DeskServiceImpl implements DeskService { List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); doThing(deskStageMap, subStageList); for (PreparationCommonPendingVO vo : list) { - vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + if (deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } } pageInfo.setList(list); return pageInfo; @@ -412,32 +416,21 @@ public class DeskServiceImpl implements DeskService { } List shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList()); Map> deskStageMap = new HashMap<>(); - List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); - List decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds); + List subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); doThing(deskStageMap, subStageList); - for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) { - List deskStages = new ArrayList<>(); - deskStages.addAll(deskStageMap.get(decorationDesignInfoDO.getShopId())); - if (CollectionUtils.isEmpty(deskStages)) { - DeskStageDTO dto = new DeskStageDTO(); - dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime())); - dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()); - deskStageMap.put(decorationDesignInfoDO.getShopId(), Collections.singletonList(dto)); - } else { - DeskStageDTO dto = new DeskStageDTO(); - dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime())); - dto.setShopSubStageStatus(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()); - deskStages.add(dto); - deskStageMap.put(decorationDesignInfoDO.getShopId(), deskStages); - } + //施工待提交阶段提交的表单用作施工中的提交时间 + Map constructionMap = new HashMap<>(); + List byIds = decorationDesignInfoDAO.getByIds(shopIds); + if (byIds != null) { + constructionMap = byIds.stream().collect(Collectors.toMap(DecorationDesignInfoDO::getShopId, DecorationDesignInfoDO::getConstructionCreateTime)); } for (PreparationCommonPendingVO vo : list) { - for (DeskStageDTO deskStageDTO : deskStageMap.get(vo.getShopId())) { - if (vo.getSubStageStatus().equals(deskStageDTO.getShopSubStageStatus())) { - vo.setSubmitTime(deskStageDTO.getActualCompleteTime()); - break; - } + if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()) && deskStageMap.get(vo.getShopId()) != null) { + vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); + } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { + vo.setSubmitTime(CoolDateUtils.DateFormat(constructionMap.get(vo.getShopId()),SPECIAL_DATE_START)); } + } pageInfo.setList(list); return pageInfo; @@ -575,13 +568,13 @@ public class DeskServiceImpl implements DeskService { if (CollectionUtils.isEmpty(deskStageDTOS)) { DeskStageDTO dto = new DeskStageDTO(); Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); - dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date)); + dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus()); deskStageMap.put(shopStageInfoDO.getShopId(), Collections.singletonList(dto)); } else { DeskStageDTO dto = new DeskStageDTO(); Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); - dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date)); + dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus()); deskStageDTOS.add(dto); deskStageMap.put(shopStageInfoDO.getShopId(), deskStageDTOS); @@ -631,7 +624,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setSubStage(x.getShopSubStage()); preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus()); - preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, x.getCreateTime())); + preparationCommonPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, x.getCreateTime())); preparationCommonPendingVO.setStoreName(shopInfoDO.getShopName()); PlanLineDTO planLineDTO = lineMap.getOrDefault(shopInfoDO.getLineId(), new PlanLineDTO()); preparationCommonPendingVO.setPartnerName(planLineDTO.getUsername()); From 298b46d04403cf1f96d1b393f8db3f9246bb52f4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 12 Mar 2025 17:32:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5+=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/FranchiseFeeMapper.xml | 3 ++- .../com/cool/store/dto/ExportBranchShopDTO.java | 13 +++++++++++++ .../java/com/cool/store/dto/FranchiseFeeDTO.java | 3 ++- .../java/com/cool/store/entity/SignFranchiseDO.java | 4 ++++ .../cool/store/request/AddSignFranchiseRequest.java | 6 ++++++ .../store/response/AddSignFranchiseResponse.java | 5 +++++ .../service/impl/ExportRealizeServiceImpl.java | 3 +++ .../service/impl/SignFranchiseServiceImpl.java | 2 ++ 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index 81e26ec33..8f1050d4a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -24,7 +24,8 @@ a.first_year_start_time as firstYearStartTime, a.first_year_end_time as firstYearEndTime, a.first_year_fee as firstYearFee, - a.performance_bond as performanceBond + a.performance_bond as performanceBond, + b.pay_user_name as payUserName from xfsg_franchise_fee a LEFT JOIN xfsg_line_pay b ON b.id = a.pay_id where a.shop_id in diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java index e2a984ddd..1f7fb3fdd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java @@ -83,6 +83,15 @@ public class ExportBranchShopDTO { @ExcelProperty(value = "签约时间",order =17) @ColumnWidth(30) private String signTime ; + + @ExcelProperty(value = "合伙签约人1",order =17) + @ColumnWidth(30) + private String partnershipSignatoryFirst ; + + @ExcelProperty(value = "合伙签约人2",order =17) + @ColumnWidth(30) + private String partnershipSignatorySecond ; + @ExcelProperty(value = "合同金额",order =18) @ColumnWidth(30) private String contractAmount; @@ -143,6 +152,10 @@ public class ExportBranchShopDTO { @ColumnWidth(30) private String designFee; + @ExcelProperty(value = "缴款人",order = 33) + @ColumnWidth(30) + private String payUserName; + @ExcelProperty(value = "第1次缴纳时间",order = 33) @ColumnWidth(30) private String firstPayTime; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java index c6bce0e91..473f8c5f0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java @@ -36,5 +36,6 @@ public class FranchiseFeeDTO { private String combinedField; private List payTimeList; - + //付款人 + private String payUserName; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java index 1244d1d11..b831cebf1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java @@ -56,4 +56,8 @@ public class SignFranchiseDO { private String contractCode; @Column(name = "contract_amount") private String contractAmount; + @Column(name = "partnership_signatory_first") + private String partnershipSignatoryFirst; + @Column(name = "partnership_signatory_second") + private String partnershipSignatorySecond; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index c4e411f32..654460031 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -67,6 +67,10 @@ public class AddSignFranchiseRequest { private String contractCode; @ApiModelProperty("合同金额") private String contractAmount; + @ApiModelProperty("合伙签约人1") + private String partnershipSignatoryFirst; + @ApiModelProperty("合伙签约人2") + private String partnershipSignatorySecond; public SignFranchiseDO toSignFranchiseDO() { @@ -88,6 +92,8 @@ public class AddSignFranchiseRequest { signFranchiseDO.setMobile(this.mobile); signFranchiseDO.setContractCode(this.contractCode); signFranchiseDO.setContractAmount(this.contractAmount); + signFranchiseDO.setPartnershipSignatoryFirst(this.partnershipSignatoryFirst); + signFranchiseDO.setPartnershipSignatorySecond(this.partnershipSignatorySecond); return signFranchiseDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index 9c7ac43e0..c2fde0640 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -165,5 +165,10 @@ public class AddSignFranchiseResponse { @ApiModelProperty("合同金额") private String contractAmount; + @ApiModelProperty("合伙签约人1") + private String partnershipSignatoryFirst; + @ApiModelProperty("合伙签约人2") + private String partnershipSignatorySecond; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index cd823c54f..d41899148 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -153,6 +153,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setPerformanceBondBill(franchiseFeeDTO.getPerformanceBond()); dto.setFirstYearManagementFeeBill(franchiseFeeDTO.getFirstYearManagementFee()); dto.setFirstYearBrandingFeeBill(franchiseFeeDTO.getFirstYearFee()); + dto.setPayUserName(franchiseFeeDTO.getPayUserName()); } dto.setUserName(response.getUsername()); dto.setMobile(response.getMobile()); @@ -169,6 +170,8 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime())); dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime())); dto.setSignTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime())); + dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst()); + dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond()); } List payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>()); for (int i = 0; i < payTime.size() && i <= 3; i++) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 7a1f38bc3..9077902c3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -288,6 +288,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile()); addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode()); addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount()); + addSignFranchiseResponse.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst()); + addSignFranchiseResponse.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond()); } else { BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee()) From c7ae833e0bf9f72fe7a640c4d530e4691e7902cb Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 12 Mar 2025 17:40:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5+=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SignFranchiseMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml index 7e9994470..75ecf3ced 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml @@ -14,7 +14,7 @@ limit 1