Skip to content

F
fit-finance
Commit 32fc9fbe by 程裕兵
Options

feat:save rule

parent 84fe0f3f
Showing with 7 additions and 1 deletions
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
...@@ -277,11 +277,17 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -277,11 +277,17 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
@Override @Override
public List<String> checkUnbind(Long studioId) { public List<String> checkUnbind(Long studioId) {
List<PartyToMerchant> relation = partyToMerchantRpService.listByParty(studioId, PartyTypeEnum.STUDIO, config.getCashier()); List<PartyToMerchant> relation = partyToMerchantRpService.listByParty(studioId, PartyTypeEnum.STUDIO,
config.getCashier());
if (CollectionUtil.isEmpty(relation)) { if (CollectionUtil.isEmpty(relation)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
Long merchantId = relation.stream().findFirst().orElse(new PartyToMerchant()).getMerchantId(); Long merchantId = relation.stream().findFirst().orElse(new PartyToMerchant()).getMerchantId();
StudioMerchantApply apply = studioMerchantApplyRpService.getLatestOneSuccessByMerchantId(merchantId);
if (!Objects.equals(studioId,
Optional.ofNullable(apply).map(StudioMerchantApply::getStudioId).orElse(null))) {
return Lists.newArrayList();
}
List<PartyToMerchant> merchants = partyToMerchantRpService.listByMerchantIdAndPartyType(merchantId, List<PartyToMerchant> merchants = partyToMerchantRpService.listByMerchantIdAndPartyType(merchantId,
PartyTypeEnum.STUDIO); PartyTypeEnum.STUDIO);
if (CollectionUtil.isEmpty(merchants)) { if (CollectionUtil.isEmpty(merchants)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment