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-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index 84673f37b..a50d5ad59 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -199,10 +199,10 @@
#{param.updateUserId},
- #{param.deleted}
+ #{param.deleted},
- #{param.partnerNum}
+ #{param.partnerNum},
ON DUPLICATE KEY UPDATE
@@ -283,7 +283,7 @@
update_user_id = #{param.updateUserId},
- deleted = #{param.deleted}
+ deleted = #{param.deleted},
partner_num = #{param.partnerNum}
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/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
index 7e4d76d6e..c7779f1dd 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
@@ -34,15 +34,9 @@ public class LinePayServiceImpl implements LinePayService {
@Resource
private LinePayDAO linePayDAO;
- @Resource
- private HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
-
@Resource
private LineInfoDAO lineInfoDAO;
- @Resource
- LineInfoMapper lineInfoMapper;
-
@Override
public LinePayVO getLinePayInfo(Long lineId) {
LinePayVO result = null;
@@ -76,7 +70,7 @@ public class LinePayServiceImpl implements LinePayService {
lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.PAY_DEPOSIT.getCode());
lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode());
- lineInfoMapper.insertOrUpdate(lineInfo);
+ lineInfoDAO.insertOrUpdate(lineInfo);
return linePayDO.getId();
}
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("加盟店储备店长");