From fa718af87f6c4ed769eefcdbf1922c3b7fad0d77 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 16 Apr 2024 17:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=B8=8E=E9=B2=9C=E4=B8=B0=E5=9B=9E=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/enums/ErrorCodeEnum.java | 2 ++ .../com/cool/store/response/InitiatingResponse.java | 2 ++ .../store/service/impl/IntentAgreementServiceImpl.java | 10 ++++++++-- .../service/impl/TrainingExperienceServiceImpl.java | 1 - 4 files changed, 12 insertions(+), 3 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 6db4723a6..86cff943c 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 @@ -162,6 +162,8 @@ public enum ErrorCodeEnum { VERIFY_MD5_FALSE(109004, "验签失败,请检查",null), + LINE_PAY_FALSE(109005, "付款信息查询失败",null), + ; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/InitiatingResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/InitiatingResponse.java index dacb64159..b92185dc1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/InitiatingResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/InitiatingResponse.java @@ -18,4 +18,6 @@ public class InitiatingResponse { private String msg; private long serverTime; + + private String message; } 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 c4862ffff..f4ed09418 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 @@ -230,6 +230,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten FranchiseeDO franchiseeDO = request.toFranchiseeDO(); //查银行信息 LinePayDO linePayDO = linePayMapper.getLinePayByLineId(request.getLineId()); + if (Objects.isNull(linePayDO)){ + throw new ServiceException(ErrorCodeEnum.LINE_PAY_FALSE); + } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String dateString = sdf.format(linePayDO.getPayTime()); franchiseeDO.setPayDateStr(dateString); @@ -238,6 +241,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten franchiseeDO.setBankSub(linePayDO.getBranchBankCode()); //查城市信息 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); + if (Objects.isNull(lineInfoDO)){ + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(lineInfoDO.getWantShopAreaId()); franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId())); franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId())); @@ -255,9 +261,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten lineInfoMapper.updateByPrimaryKeySelective(lineInfoParam); } if (initiatingResponse.getCode() != 0){ - return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData()); + return new ResponseResult(500,initiatingResponse.getMessage(),initiatingResponse.getData()); }else { - return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData()); + return new ResponseResult(200000,initiatingResponse.getMessage(),initiatingResponse.getData()); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 9b93effb6..d66a8759c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -104,7 +104,6 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Override public LeaseBaseInfoDO getTrainingExperience(Long lineId) { - String eid = "e17cd2dc350541df8a8b0af9bd27f77d"; List roleNames = new ArrayList<>(); roleNames.add("加盟店店长"); roleNames.add("加盟店储备店长");