|
|
@ -338,7 +338,7 @@ public class OrderOilController { |
|
|
|
model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice()); |
|
|
|
model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice()); |
|
|
|
model.setDeductionProductPrice(gasOrder.getDeductionProductPrice()); |
|
|
|
model.setDeductionProductPrice(gasOrder.getDeductionProductPrice()); |
|
|
|
model.setPayablePrice(gasOrder.getPayablePrice()); |
|
|
|
model.setPayablePrice(gasOrder.getPayablePrice()); |
|
|
|
model.setPayGold(gasOrder.getPayGold()==null?null:gasOrder.getPayGold()/100); |
|
|
|
model.setPayGold(gasOrder.getPayGold()==null?new BigDecimal("0"):new BigDecimal(""+gasOrder.getPayGold()).divide(new BigDecimal("100"))); |
|
|
|
model.setPayPrice(gasOrder.getPayPrice()!=null?gasOrder.getPayPrice().toString():"未支付"); |
|
|
|
model.setPayPrice(gasOrder.getPayPrice()!=null?gasOrder.getPayPrice().toString():"未支付"); |
|
|
|
model.setStatus(OrderOilStatus.getNameByType(gasOrder.getStatus())); |
|
|
|
model.setStatus(OrderOilStatus.getNameByType(gasOrder.getStatus())); |
|
|
|
model.setCreateTime(gasOrder.getCreateTime()); |
|
|
|
model.setCreateTime(gasOrder.getCreateTime()); |
|
|
|