From 8243cdc01ab4020aa93095ce8e163999d9f615d0 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 22 May 2024 16:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 3 +++ .../cool/store/request/InitiatingRequest.java | 25 +++++++++++-------- ...TrainingExperienceDistributionRequest.java | 3 +++ .../impl/IntentAgreementServiceImpl.java | 10 ++++++++ .../webb/PCTrainingExperienceController.java | 6 ++--- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index ad47947e8..4f4146271 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -188,6 +188,9 @@ public enum ErrorCodeEnum { AUDIT_RESULT_FALSE(109012, "意向加盟合同API本次调用结果与上一次不一致", null), + TIME_NULL_FALSE(109013, "有时间为空", null), + + INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null), INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null), SHOP_ID_IS_NULL(103003,"验参shopId失败，为空",null), diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java index fac973e38..207c78af8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java @@ -7,6 +7,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.Date; @Data public class InitiatingRequest { @@ -105,6 +106,10 @@ public class InitiatingRequest { private String csfzName; + private Date signStartTime; + + private Date signEndTime; + public InitiatingDO toInitiatingDO() { InitiatingDO initiatingDO = new InitiatingDO(); @@ -115,14 +120,14 @@ public class InitiatingRequest { initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime); initiatingDO.setApply_date(this.apply_date); initiatingDO.setJms_id_card(this.idCardNo); - if (StringUtil.isNotBlank(this.businessLicenseAddress)){ + if (StringUtil.isNotBlank(this.businessLicenseAddress)) { initiatingDO.setJms_id_card_address(this.businessLicenseAddress); - }else if (StringUtil.isNotBlank(this.idCardAddress)){ + } else if (StringUtil.isNotBlank(this.idCardAddress)) { initiatingDO.setJms_id_card_address(this.idCardAddress); } - if (StringUtil.isNotBlank(this.businessLicenseCode)){ + if (StringUtil.isNotBlank(this.businessLicenseCode)) { initiatingDO.setJms_id_card(this.businessLicenseCode); - }else if (StringUtil.isNotBlank(this.idCardNo)){ + } else if (StringUtil.isNotBlank(this.idCardNo)) { initiatingDO.setJms_id_card(this.idCardNo); } initiatingDO.setJms_name(this.signName); @@ -133,12 +138,12 @@ public class InitiatingRequest { initiatingDO.setAnnex1(this.annex1); initiatingDO.setAnnex2(this.annex2); initiatingDO.setAnnex3(this.annex3); - initiatingDO.setQy_year(this.qy_year); - initiatingDO.setQy_month(this.qy_month); - initiatingDO.setQy_day(this.qy_day); - initiatingDO.setJy_year(this.jy_year); - initiatingDO.setJy_month(this.jy_month); - initiatingDO.setJy_day(this.jy_day); + initiatingDO.setQy_year(this.signStartTime.getYear()); + initiatingDO.setQy_month(this.signStartTime.getMonth()); + initiatingDO.setQy_day(this.signStartTime.getDay()); + initiatingDO.setJy_year(this.signEndTime.getYear()); + initiatingDO.setJy_month(this.signEndTime.getMonth()); + initiatingDO.setJy_day(this.signEndTime.getDay()); initiatingDO.setYxjzz(this.yxjzz); initiatingDO.setXyqx_month(this.xyqx_month); initiatingDO.setJmf(this.jmf); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceDistributionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceDistributionRequest.java index 01936550b..a721537f6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceDistributionRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceDistributionRequest.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; @Data @@ -15,8 +16,10 @@ public class TrainingExperienceDistributionRequest { @ApiModelProperty("用户信息表partnerId") private String partnerId; @ApiModelProperty("体验门店id") + @NotNull(message = "门店id为空") private String storeId; @ApiModelProperty("门店名") + @NotNull(message = "门店名为空") private String storeName; @ApiModelProperty("开始体验时间") private Date experienceStartTime; 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 964eb6ab0..d208cb41e 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 @@ -188,6 +188,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } + verifyDate(request); Map requestMap = new HashMap<>(); fillSignatureInfo(requestMap); String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); @@ -211,6 +212,15 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten } } + private void verifyDate(InitiatingRequest request) { + if (request.getSignStartTime() == null || request.getSignEndTime() == null) { + throw new ServiceException(ErrorCodeEnum.TIME_NULL_FALSE); + } + if (request.getSignStartTime().after(request.getSignEndTime())) { + throw new ServiceException(ErrorCodeEnum.TIME_FALSE); + } + } + @Override public InitiatingRequest getOaDetail(String mobile, String idCardNo) { String redisKey = "OA:" + mobile + idCardNo; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java index b7bbe3fea..5105692de 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java @@ -1,18 +1,16 @@ package com.cool.store.controller.webb; import com.cool.store.entity.LeaseBaseInfoDO; -import com.cool.store.enums.ExperienceStatusEnum; import com.cool.store.request.TrainingExperienceDistributionRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.TrainingExperienceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.websocket.server.PathParam; @RestController @RequestMapping("/pc/training/experience/") @@ -25,7 +23,7 @@ public class PCTrainingExperienceController { @ApiOperation("实训体验分配或更新") @PostMapping("/distribution") - public ResponseResult distribution(@RequestBody TrainingExperienceDistributionRequest request) { + public ResponseResult distribution(@RequestBody @Validated TrainingExperienceDistributionRequest request) { return ResponseResult.success(trainingExperienceService.distribution(request)); }