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

ResponseResult message

Browse Source 
&毫秒舍弃
This commit is contained in:
guohb
2024-05-27 13:58:20 +08:00
parent 91f21fa738
commit 33a70a9f59
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -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;
}
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -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());
}