From 14b929273816f4ed2e78a68202e27c942c8d7694 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 21 May 2025 16:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3=E5=8A=A0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/BaseInfoVO.java | 2 +- .../main/java/com/cool/store/vo/desk/PayStagePendingVO.java | 4 +++- .../main/java/com/cool/store/vo/desk/SigningPendingVO.java | 3 +++ .../java/com/cool/store/service/impl/DeskServiceImpl.java | 6 ++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java index d9c88c29d..f8493d904 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java @@ -45,7 +45,7 @@ public class BaseInfoVO { private Integer workflowSubStageStatus; @ApiModelProperty("加盟模式") private Integer joinMode; - private Date updateTime; + public BaseInfoVO(){} /** diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java index 512be35dc..50b0508cf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PayStagePendingVO.java @@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author suzhuhong * @Date 2024/4/1 16:37 @@ -14,7 +16,7 @@ public class PayStagePendingVO extends BaseInfoVO { @ApiModelProperty("缴费时间 2024年04月23日 16:00") private String payTime; - + private Date updateTime; public PayStagePendingVO(){}; public PayStagePendingVO(BaseInfoVO baseInfoVO) { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java index d3c9bbf0c..110dc8636 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/SigningPendingVO.java @@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author suzhuhong * @Date 2024/4/1 16:55 @@ -14,6 +16,7 @@ public class SigningPendingVO extends BaseInfoVO { @ApiModelProperty("提交时间 2024年04月23日 16:00") private String submitTime; + private Date updateTime; public SigningPendingVO(){}; 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 e03b39f18..c459490cb 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 @@ -107,6 +107,7 @@ public class DeskServiceImpl implements DeskService { IntendPendingVO intendPendingVO = new IntendPendingVO(baseInfoVO); intendPendingVO.setJoinTime(new Date()); intendPendingVO.setJoinMode(x.getJoinMode()); + intendPendingVO.setUpdateTime(x.getUpdateTime()); list.add(intendPendingVO); }); @@ -133,7 +134,7 @@ public class DeskServiceImpl implements DeskService { if (linePayDO != null && linePayDO.getPayTime() != null) { payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime())); } - + payStagePendingVO.setUpdateTime(x.getUpdateTime()); list.add(payStagePendingVO); }); @@ -161,6 +162,7 @@ public class DeskServiceImpl implements DeskService { if (date != null) { signingPendingVO.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); } + signingPendingVO.setUpdateTime(x.getUpdateTime()); list.add(signingPendingVO); }); page.setList(list); @@ -197,7 +199,7 @@ public class DeskServiceImpl implements DeskService { baseInfoVO.setUserPortraitList(labelBaseInfoList); baseInfoVO.setJoinMode(lineInfoDO.getJoinMode()); baseInfoVO.setWantShopAreaName(wantShopAreaMap.get(lineInfoDO.getWantShopAreaId())); - baseInfoVO.setUpdateTime(lineInfoDO.getUpdateTime()); + return baseInfoVO; }