diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java index 97ea9369..9bc5cf8c 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -327,8 +327,8 @@ public class HighOrderController { childOrder.setGoodsActualPrice(childOrder.getGoodsPrice()); // 油价信息 childOrder.setGasPriceGun(priceModel.getPriceGun()); - childOrder.setGasPriceVip(priceModel.getPriceVip()); - childOrder.setGasPriceOfficial(priceModel.getPriceOfficial()); + childOrder.setGasPriceVip(priceModel.getPriceGun()); + childOrder.setGasPriceOfficial(new BigDecimal("0")); childOrder.setGasPricePlatform(priceModel.getPriceVip()); childOrder.setGasOilLiters(priceModel.getOilLiters()); childOrder.setGasDiscount(new BigDecimal("0")); diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java index 0850af7d..ac3efd3b 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java @@ -1154,9 +1154,12 @@ public interface HighOrderMapperExt { " b.id orderId," + " b.order_no orderNo," + " a.gas_order_no gasOrderNo," + + " b.mem_discount_name memDiscountName," + " b.pay_type payType," + " b.total_price totalPrice," + " b.deduction_price deductionPrice," + + " b.payable_price payablePrice," + + " b.pay_gold payGold," + " b.pay_real_price payRealPrice," + " b.order_status status," + " REPLACE(b.mem_phone, SUBSTR(b.mem_phone,4,4), '****') merPhone," + diff --git a/hai-service/src/main/java/com/hai/model/GasOrderModel.java b/hai-service/src/main/java/com/hai/model/GasOrderModel.java index fb068d8d..e2f1a538 100644 --- a/hai-service/src/main/java/com/hai/model/GasOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/GasOrderModel.java @@ -12,9 +12,12 @@ public class GasOrderModel { private Long orderId; private String orderNo; private String gasOrderNo; + private String memDiscountName; private Integer payType; private BigDecimal totalPrice; private BigDecimal deductionPrice; + private BigDecimal payablePrice; + private BigDecimal payGold; private BigDecimal payRealPrice; private Integer status; private String merPhone; @@ -39,6 +42,30 @@ public class GasOrderModel { private Boolean printStatus; private Integer printNum; + public BigDecimal getPayablePrice() { + return payablePrice; + } + + public void setPayablePrice(BigDecimal payablePrice) { + this.payablePrice = payablePrice; + } + + public BigDecimal getPayGold() { + return payGold; + } + + public void setPayGold(BigDecimal payGold) { + this.payGold = payGold; + } + + public String getMemDiscountName() { + return memDiscountName; + } + + public void setMemDiscountName(String memDiscountName) { + this.memDiscountName = memDiscountName; + } + public String getGasStaffName() { return gasStaffName; }