|
@@ -1878,19 +1878,20 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
}
|
|
}
|
|
|
|
|
|
// 校验结算金额 0.5~2
|
|
// 校验结算金额 0.5~2
|
|
- double min = new BigDecimal(scorePackage.getUserScore())
|
|
|
|
|
|
+ double min = new BigDecimal(scorePackage.getScore())
|
|
.divide(new BigDecimal(scorePackage.getTaskNum()),2,RoundingMode.HALF_EVEN)
|
|
.divide(new BigDecimal(scorePackage.getTaskNum()),2,RoundingMode.HALF_EVEN)
|
|
.multiply(new BigDecimal("0.5"))
|
|
.multiply(new BigDecimal("0.5"))
|
|
.setScale(2, RoundingMode.HALF_EVEN)
|
|
.setScale(2, RoundingMode.HALF_EVEN)
|
|
.doubleValue();
|
|
.doubleValue();
|
|
- double max = new BigDecimal(scorePackage.getUserScore())
|
|
|
|
|
|
+ double max = new BigDecimal(scorePackage.getScore())
|
|
.divide(new BigDecimal(scorePackage.getTaskNum()),2,RoundingMode.HALF_EVEN)
|
|
.divide(new BigDecimal(scorePackage.getTaskNum()),2,RoundingMode.HALF_EVEN)
|
|
.multiply(new BigDecimal("2.0"))
|
|
.multiply(new BigDecimal("2.0"))
|
|
.setScale(2, RoundingMode.HALF_EVEN)
|
|
.setScale(2, RoundingMode.HALF_EVEN)
|
|
.doubleValue();
|
|
.doubleValue();
|
|
double amount = commonEvidenceDTO.getAmount().doubleValue();
|
|
double amount = commonEvidenceDTO.getAmount().doubleValue();
|
|
|
|
+
|
|
if (amount < min || amount > max) {
|
|
if (amount < min || amount > max) {
|
|
- log.error("结算金额不在范围内");
|
|
|
|
|
|
+ log.error("结算金额不在范围内, min:[{}], max:[{}], amount:[{}]", min, max, amount);
|
|
errorMap(errorMap, "结算金额不在范围内", commonEvidenceDTO.getId());
|
|
errorMap(errorMap, "结算金额不在范围内", commonEvidenceDTO.getId());
|
|
return;
|
|
return;
|
|
}
|
|
}
|