Commit af55293f authored by 周健威's avatar 周健威

修改部分bug

parent 7a9269d1
...@@ -294,17 +294,19 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> { ...@@ -294,17 +294,19 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("违约金( ¥"); stringBuilder.append("违约金( ¥");
//延期的天数, 延期违约金是延期天数*200% //延期的天数, 延期违约金是延期天数*200%
int usedDay = getDaysBetweenDateTime(endTime, nowTime); int extraUsedDay = getDaysBetweenDateTimeHasStartEnd(endTime, nowTime) - 1;
stringBuilder.append(amount); if(extraUsedDay > 0) {
stringBuilder.append(" x "); stringBuilder.append(amount);
stringBuilder.append(usedDay); stringBuilder.append(" x ");
stringBuilder.append("(天)"); stringBuilder.append(extraUsedDay);
stringBuilder.append(" x 2"); stringBuilder.append("(天)");
BigDecimal cost = amount.multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2)); stringBuilder.append(" x 2");
stringBuilder.append(" = "); BigDecimal cost = amount.multiply(new BigDecimal(extraUsedDay+ "")).multiply(new BigDecimal(2+ ""));
stringBuilder.append(cost); stringBuilder.append(" = ");
stringBuilder.append("元"); stringBuilder.append(cost);
initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder); stringBuilder.append("元");
initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder);
}
} }
orderPageVO.setDedDetailDTO(JSONObject.toJSONString(dedDetailDTO)); orderPageVO.setDedDetailDTO(JSONObject.toJSONString(dedDetailDTO));
} }
......
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