From 102f95a43634a03428ec46efd94e250075467945 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 13 Jan 2023 11:06:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/web/controller/business/OrderOilController.java | 3 +++ .../main/java/com/hai/order/model/ExportGasOrderModel.java | 4 ++++ .../java/com/hai/service/impl/HighGasOrderServiceImpl.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/hai-order/src/main/java/com/web/controller/business/OrderOilController.java b/hai-order/src/main/java/com/web/controller/business/OrderOilController.java index af031391..99da7b9e 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderOilController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderOilController.java @@ -17,6 +17,7 @@ import com.hai.order.model.ExportGasOrderModel; import com.hai.order.service.OrderService; import com.hai.order.service.OrderServiceExt; import com.hai.order.type.OrderOilStatus; +import com.hai.order.type.OrderPayType; import com.hai.service.HighGasOrderService; import com.web.config.SysConst; import io.swagger.annotations.Api; @@ -315,6 +316,7 @@ public class OrderOilController { model.setGasPricePlatform(gasOrder.getGasPricePlatform()); model.setGasPriceGun(gasOrder.getGasPriceGun()); model.setGasPriceOfficial(gasOrder.getGasPriceOfficial()); + model.setPayTypeName(gasOrder.getPayType()!=null?OrderPayType.getDataByType(gasOrder.getPayType()).getName():"未支付"); model.setTotalDeductionPrice(gasOrder.getTotalDeductionPrice()); model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice()); model.setDeductionProductPrice(gasOrder.getDeductionProductPrice()); @@ -353,6 +355,7 @@ public class OrderOilController { includeColumnFiledNames.add("gasPricePlatform"); includeColumnFiledNames.add("gasPriceGun"); includeColumnFiledNames.add("gasPriceOfficial"); + includeColumnFiledNames.add("payTypeName"); includeColumnFiledNames.add("totalDeductionPrice"); includeColumnFiledNames.add("deductionCouponPrice"); includeColumnFiledNames.add("deductionProductPrice"); diff --git a/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java b/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java index a8f746f1..eb448df0 100644 --- a/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java +++ b/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java @@ -68,6 +68,10 @@ public class ExportGasOrderModel { @ExcelProperty({ "加油信息", "国标价"}) private BigDecimal gasPriceOfficial; + @ColumnWidth(15) + @ExcelProperty({ "支付信息", "支付方式"}) + private String payTypeName; + @ColumnWidth(15) @ExcelProperty({ "支付信息", "总优惠"}) private BigDecimal totalDeductionPrice; diff --git a/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java index 5b9b08c9..8c36c769 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java @@ -102,6 +102,10 @@ public class HighGasOrderServiceImpl implements HighGasOrderService { criteria.andChildOrderNoLike("%"+MapUtils.getString(param, "childOrderNo")+"%"); } + if (StringUtils.isNotBlank(MapUtils.getString(param, "memCardNo"))) { + criteria.andMemCardNoLike("%"+MapUtils.getString(param, "memCardNo")+"%"); + } + if (StringUtils.isNotBlank(MapUtils.getString(param, "memPhone"))) { criteria.andMemPhoneLike("%"+MapUtils.getString(param, "memPhone")+"%"); }