Commit 7bfa3066 by unknown

repair the multiple is null

parent 78e60522
...@@ -313,7 +313,7 @@ public class VoucherRule { ...@@ -313,7 +313,7 @@ public class VoucherRule {
this.createdTime = createdTime; this.createdTime = createdTime;
} }
@Column(name = "multiple") @Column(name = "multiple", nullable = false)
public int getMultiple() { public int getMultiple() {
return multiple; return multiple;
} }
......
...@@ -455,8 +455,7 @@ public class OpEventActivityOrderService ...@@ -455,8 +455,7 @@ public class OpEventActivityOrderService
} }
} }
} }
BigDecimal resultAmount = order
return order
.getTotalAmount() .getTotalAmount()
.subtract( .subtract(
new BigDecimal(orderProcessBean.getPrePayCardRefundAmount() == null ? 0 new BigDecimal(orderProcessBean.getPrePayCardRefundAmount() == null ? 0
...@@ -465,10 +464,11 @@ public class OpEventActivityOrderService ...@@ -465,10 +464,11 @@ public class OpEventActivityOrderService
orderProcessBean.getRefundAmount() == null ? 0 orderProcessBean.getRefundAmount() == null ? 0
: orderProcessBean.getRefundAmount()))).add( : orderProcessBean.getRefundAmount()))).add(
order.getOnPayAmount() == null ? new BigDecimal(0) : order order.getOnPayAmount() == null ? new BigDecimal(0) : order
.getOnPayAmount())).doubleValue() <= 0; .getOnPayAmount()));
return resultAmount.compareTo(BigDecimal.ZERO) <= 1;
} }
@Override @Override
protected void returnInventory(EventActivityOrderProcessBean orderProcessBean) { protected void returnInventory(EventActivityOrderProcessBean orderProcessBean) {
Order order = getOrderDao().findById(orderProcessBean.getOrderId()); Order order = getOrderDao().findById(orderProcessBean.getOrderId());
......
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 sign in to comment