From ef69f20f36e1579bc4a722b6d67aa72d13c0051f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 Jun 2023 19:33:17 +0800 Subject: [PATCH] 11 --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- .../java/com/cool/store/entity/HyPartnerBaseInfoDO.java | 4 ++++ .../com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java | 2 +- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 7 ++++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 8fbef2cd8..92b418ef9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -299,7 +299,7 @@ a.investment_manager as investmentManager, b.user_portrait as user_portrait, b.id as partnerBaseInfoId, - b.pass_reason as passReason, + b.pass_reason as passCause, b.certify_file as certifyFile, b.pass_time as passTime, b.pass_user_id as passUserId, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java index 97e46a056..f4d05f762 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java @@ -74,4 +74,8 @@ public class HyPartnerBaseInfoDO implements Serializable { @ApiModelProperty("更新时间") private Date updateTime; + + private Date passTime; + + private String passUserId; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java index 2aa08cf72..2bbf79183 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java @@ -58,7 +58,7 @@ public class PartnerLineInfoAndBaseInfoVO { private String passCause; @ApiModelProperty("通过时间") - private Date passTime; + private String passTime; @ApiModelProperty("通过人名称") private String passUserName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 7cc8207dc..43e599d19 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -258,6 +258,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())){ hyPartnerLineInfoDO.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile())); } + HyPartnerBaseInfoDO hy = hyPartnerBaseInfoDAO.getByPartnerLineId(hyPartnerLineInfoDO.getId()); + hy.setPassReason(closeFollowRequest.getPassReason()); + hy.setPassTime(new Date()); + hy.setPassUserId(userId); + hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hy); } //拒绝 @@ -560,7 +565,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class)); } partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId()); - partnerLineInfoAndBaseInfoVO.setPassTime(partnerLineInfoAndBaseInfoDTO.getPassTime()); + partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(partnerLineInfoAndBaseInfoDTO.getPassTime(),CoolDateUtils.DATE_FORMAT_SEC)); return partnerLineInfoAndBaseInfoVO; }