From 33a70a9f59d1ae9fffb8e43ff2d735589a5c13c3 Mon Sep 17 00:00:00 2001 From: guohb Date: Mon, 27 May 2024 13:58:20 +0800 Subject: [PATCH] =?UTF-8?q?ResponseResult=20message=20&=E6=AF=AB=E7=A7=92?= =?UTF-8?q?=E8=88=8D=E5=BC=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/AddSignFranchiseRequest.java | 20 +++++++++++++++++-- .../impl/IntentAgreementServiceImpl.java | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) 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 1decb1ae3..08367ef92 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 @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; @Data @@ -67,12 +69,26 @@ public class AddSignFranchiseRequest { signFranchiseDO.setContractStartTime(this.contractStartTime); signFranchiseDO.setContractEndTime(this.contractStartEndTime); signFranchiseDO.setImpressionNum(this.impressionNum); - signFranchiseDO.setBusinessStartHours(this.businessStartHours); - signFranchiseDO.setBusinessEndHours(this.businessEndHours); + signFranchiseDO.setBusinessStartHours(setMill(this.businessStartHours)); + signFranchiseDO.setBusinessEndHours(setMill(this.businessEndHours)); signFranchiseDO.setIrregularReason(this.irregularReason); signFranchiseDO.setRemark(this.remark); signFranchiseDO.setResign(this.resign); signFranchiseDO.setMobile(this.mobile); return signFranchiseDO; } + + /** + * 丢弃毫秒日期 + * @param date + * @return + */ + private Date setMill(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.MILLISECOND, 0); + Date dateWithoutMilliseconds = calendar.getTime(); + return dateWithoutMilliseconds; + + } } 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 7b4ca4bdf..974d654c4 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 @@ -304,7 +304,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten if (initiatingResponse.getCode() != 0) { lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_63.getCode()); lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO); - return new ResponseResult(500, initiatingResponse.getMessage(), initiatingResponse.getData()); + return new ResponseResult(500, initiatingResponse.getMessage()+",状态已回退", initiatingResponse.getData()); } else { return new ResponseResult(200000, initiatingResponse.getMessage(), initiatingResponse.getData()); }