|
@@ -28,7 +28,7 @@ public class SysUserCashAccountLogServiceImpl extends BaseServiceImpl<Long, SysU
|
|
|
public BigDecimal musicReturnFeeCharges(BigDecimal returnFee, Integer size) {
|
|
|
String configName = SysConfigService.MUSIC_COURSE_START_RETURN_FEE_CHARGES;
|
|
|
if(size == null || size == 0){
|
|
|
- configName = SysConfigService.MUSIC_RETURN_FEE_CHARGES;
|
|
|
+ return returnFee.subtract(calcCharges1(returnFee,SysConfigService.MUSIC_RETURN_FEE_CHARGES));
|
|
|
}
|
|
|
return calcCharges(returnFee,configName);
|
|
|
}
|
|
@@ -49,4 +49,12 @@ public class SysUserCashAccountLogServiceImpl extends BaseServiceImpl<Long, SysU
|
|
|
}
|
|
|
return returnFee.multiply(new BigDecimal(returnFeeCharges)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
+
|
|
|
+ private BigDecimal calcCharges1(BigDecimal returnFee,String configValue){
|
|
|
+ double returnFeeCharges = 1;
|
|
|
+ if(StringUtils.isNotEmpty(configValue)){
|
|
|
+ returnFeeCharges = Double.parseDouble(configValue) / 1000;
|
|
|
+ }
|
|
|
+ return returnFee.subtract(returnFee.multiply(new BigDecimal(returnFeeCharges)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
|
|
|
+ }
|
|
|
}
|