diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 2435a84d6..6e41b1045 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -60,18 +60,20 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO(); franchiseFeeDO.setShopId(shopId); FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO); - LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId()); - LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(linePayDO.getLineId()); FranchiseFeeResponse resp = FranchiseFeeResponse.from(result); - FranchiseFeeResponse.LinePay linePayResult = FranchiseFeeResponse.LinePay.from(linePayDO); - linePayResult.setAmount(new BigInteger(result.getPerformanceBond()).add(new BigInteger(result.getFirstYearFee())).toString()); - linePayResult.setPartnerName(lineInfoDO.getUsername()); - if (Objects.nonNull(result.getAuditId())){ - ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(result.getAuditId()); - linePayResult.setStatus(shopAuditInfoDO.getResultType()); - linePayResult.setResult(shopAuditInfoDO.getResultType() == 0 ? shopAuditInfoDO.getPassReason() : shopAuditInfoDO.getRejectReason()); + LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId()); + if (Objects.nonNull(linePayDO)){ + FranchiseFeeResponse.LinePay linePayResult = FranchiseFeeResponse.LinePay.from(linePayDO); + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(linePayDO.getLineId()); + linePayResult.setPartnerName(lineInfoDO.getUsername()); + linePayResult.setAmount(new BigInteger(result.getPerformanceBond()).add(new BigInteger(result.getFirstYearFee())).toString()); + if (Objects.nonNull(result.getAuditId())){ + ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(result.getAuditId()); + linePayResult.setStatus(shopAuditInfoDO.getResultType()); + linePayResult.setResult(shopAuditInfoDO.getResultType() == 0 ? shopAuditInfoDO.getPassReason() : shopAuditInfoDO.getRejectReason()); + } + resp.setLinePayDO(linePayResult); } - resp.setLinePayDO(linePayResult); return resp; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 4c9d595e5..080adaeaa 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -17,6 +17,7 @@ import com.cool.store.request.FranchiseAgreementRequest; import com.cool.store.response.AddSignFranchiseResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.CoolStoreStartFlowService; +import com.cool.store.service.PreparationService; import com.cool.store.service.SignFranchiseService; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.constant.Constants; @@ -76,6 +77,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu @Resource ShopAuditInfoMapper shopAuditInfoMapper; + @Resource + PreparationService preparationService; + @Override public Boolean auditResult(AuditResultRequest request) { log.info("SignFranchiseServiceImpl auditResult request:{}", JSONObject.toJSONString(request)); @@ -99,6 +103,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu }else if (request.getAuditResult() == Constants.ONE_INTEGER){ shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); + //校验建店与加盟签约合同是否完成 并初始化后续流程数据 + preparationService.contractAndBuildStoreCompletion(shopId); } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); Long auditId = shopAuditInfoDO.getId();