Commit 09ec18bc authored by 周健威's avatar 周健威

修改订单取消修改违约金

parent cee0521f
...@@ -9,6 +9,7 @@ import java.math.BigDecimal; ...@@ -9,6 +9,7 @@ import java.math.BigDecimal;
BigDecimal refundAmount; BigDecimal refundAmount;
BigDecimal realAmount; BigDecimal realAmount;
BigDecimal cutAmount; BigDecimal cutAmount;
BigDecimal topAmount;
String refundDesc; String refundDesc;
public void setRefundAmount(BigDecimal refundAmount) { public void setRefundAmount(BigDecimal refundAmount) {
......
...@@ -274,6 +274,7 @@ public class OrderCalculateBiz { ...@@ -274,6 +274,7 @@ public class OrderCalculateBiz {
StringBuilder refundDescBuilder = new StringBuilder(""); StringBuilder refundDescBuilder = new StringBuilder("");
String refundDesc = ""; String refundDesc = "";
InProgressVO inProgressVO = new InProgressVO(); InProgressVO inProgressVO = new InProgressVO();
BigDecimal topAmount = BigDecimal.ZERO;
switch (orderTypeEnum) { switch (orderTypeEnum) {
case RENT_VEHICLE: case RENT_VEHICLE:
...@@ -287,6 +288,7 @@ public class OrderCalculateBiz { ...@@ -287,6 +288,7 @@ public class OrderCalculateBiz {
setType(ItemTypeEnum.VEHICLE_MODEL.getCode()); setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
setOrderId(orderPageVO.getId()); setOrderId(orderPageVO.getId());
}}); }});
topAmount = vehicleItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
if(timeLag < 0 ) { if(timeLag < 0 ) {
OrderAccountDetail oad = new OrderAccountDetail(); OrderAccountDetail oad = new OrderAccountDetail();
...@@ -330,6 +332,7 @@ public class OrderCalculateBiz { ...@@ -330,6 +332,7 @@ public class OrderCalculateBiz {
BigDecimal adultItemAmount = (null == adultItem)? BigDecimal.ZERO: adultItem.getRealAmount(); BigDecimal adultItemAmount = (null == adultItem)? BigDecimal.ZERO: adultItem.getRealAmount();
BigDecimal childItemAmount = (null == childItem)? BigDecimal.ZERO: childItem.getRealAmount(); BigDecimal childItemAmount = (null == childItem)? BigDecimal.ZERO: childItem.getRealAmount();
topAmount = adultItemAmount.add(childItemAmount);
BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(adultItemAmount.add(childItemAmount) BigDecimal deductionAmount = orderAccountBiz.calculateDeduction(adultItemAmount.add(childItemAmount)
, orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis() , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
...@@ -348,6 +351,7 @@ public class OrderCalculateBiz { ...@@ -348,6 +351,7 @@ public class OrderCalculateBiz {
orpv.setRealAmount(orderPageVO.getRealAmount()); orpv.setRealAmount(orderPageVO.getRealAmount());
orpv.setRefundAmount(totalRefundAmount); orpv.setRefundAmount(totalRefundAmount);
orpv.setCutAmount(totalDeductAmount); orpv.setCutAmount(totalDeductAmount);
orpv.setTopAmount(topAmount);
return orpv; return orpv;
} }
} }
\ No newline at end of file
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