|
@@ -81,11 +81,15 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
|
|
|
String enterCardNum = analysisDto.getEnterCardNum();
|
|
String enterCardNum = analysisDto.getEnterCardNum();
|
|
|
InvAccountCardVo outAccount = invAccountMapper.getByCarNumber(outCardNum);
|
|
InvAccountCardVo outAccount = invAccountMapper.getByCarNumber(outCardNum);
|
|
|
InvAccountCardVo enterAccount = invAccountMapper.getByCarNumber(enterCardNum);
|
|
InvAccountCardVo enterAccount = invAccountMapper.getByCarNumber(enterCardNum);
|
|
|
- if(StringUtils.isNotEmpty(outAccount.getOuterFlag()) && StringUtils.isNotEmpty(enterAccount.getOuterFlag())){
|
|
|
|
|
- if(!enterAccount.getOuterFlag().equals(outAccount.getOuterFlag())){
|
|
|
|
|
- variableCost=variableCost.add(analysisDto.getApplyAmount());
|
|
|
|
|
|
|
+ if(ObjectUtils.isNotEmpty(outAccount) && ObjectUtils.isNotEmpty(enterAccount) ){
|
|
|
|
|
+ if( (StringUtils.isNotEmpty(outAccount.getOuterFlag()) && StringUtils.isNotEmpty(enterAccount.getOuterFlag()))){
|
|
|
|
|
+ if(!enterAccount.getOuterFlag().equals(outAccount.getOuterFlag())){
|
|
|
|
|
+ variableCost=variableCost.add(analysisDto.getApplyAmount());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
profitAnalysisDto.setVariableCost(variableCost);
|
|
profitAnalysisDto.setVariableCost(variableCost);
|
|
|
}
|
|
}
|