提交代码

dev-discount
胡锐 2 years ago
parent a16f04a05c
commit 102f95a436
  1. 3
      hai-order/src/main/java/com/web/controller/business/OrderOilController.java
  2. 4
      hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java
  3. 4
      hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java

@ -17,6 +17,7 @@ import com.hai.order.model.ExportGasOrderModel;
import com.hai.order.service.OrderService; import com.hai.order.service.OrderService;
import com.hai.order.service.OrderServiceExt; import com.hai.order.service.OrderServiceExt;
import com.hai.order.type.OrderOilStatus; import com.hai.order.type.OrderOilStatus;
import com.hai.order.type.OrderPayType;
import com.hai.service.HighGasOrderService; import com.hai.service.HighGasOrderService;
import com.web.config.SysConst; import com.web.config.SysConst;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -315,6 +316,7 @@ public class OrderOilController {
model.setGasPricePlatform(gasOrder.getGasPricePlatform()); model.setGasPricePlatform(gasOrder.getGasPricePlatform());
model.setGasPriceGun(gasOrder.getGasPriceGun()); model.setGasPriceGun(gasOrder.getGasPriceGun());
model.setGasPriceOfficial(gasOrder.getGasPriceOfficial()); model.setGasPriceOfficial(gasOrder.getGasPriceOfficial());
model.setPayTypeName(gasOrder.getPayType()!=null?OrderPayType.getDataByType(gasOrder.getPayType()).getName():"未支付");
model.setTotalDeductionPrice(gasOrder.getTotalDeductionPrice()); model.setTotalDeductionPrice(gasOrder.getTotalDeductionPrice());
model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice()); model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice());
model.setDeductionProductPrice(gasOrder.getDeductionProductPrice()); model.setDeductionProductPrice(gasOrder.getDeductionProductPrice());
@ -353,6 +355,7 @@ public class OrderOilController {
includeColumnFiledNames.add("gasPricePlatform"); includeColumnFiledNames.add("gasPricePlatform");
includeColumnFiledNames.add("gasPriceGun"); includeColumnFiledNames.add("gasPriceGun");
includeColumnFiledNames.add("gasPriceOfficial"); includeColumnFiledNames.add("gasPriceOfficial");
includeColumnFiledNames.add("payTypeName");
includeColumnFiledNames.add("totalDeductionPrice"); includeColumnFiledNames.add("totalDeductionPrice");
includeColumnFiledNames.add("deductionCouponPrice"); includeColumnFiledNames.add("deductionCouponPrice");
includeColumnFiledNames.add("deductionProductPrice"); includeColumnFiledNames.add("deductionProductPrice");

@ -68,6 +68,10 @@ public class ExportGasOrderModel {
@ExcelProperty({ "加油信息", "国标价"}) @ExcelProperty({ "加油信息", "国标价"})
private BigDecimal gasPriceOfficial; private BigDecimal gasPriceOfficial;
@ColumnWidth(15)
@ExcelProperty({ "支付信息", "支付方式"})
private String payTypeName;
@ColumnWidth(15) @ColumnWidth(15)
@ExcelProperty({ "支付信息", "总优惠"}) @ExcelProperty({ "支付信息", "总优惠"})
private BigDecimal totalDeductionPrice; private BigDecimal totalDeductionPrice;

@ -102,6 +102,10 @@ public class HighGasOrderServiceImpl implements HighGasOrderService {
criteria.andChildOrderNoLike("%"+MapUtils.getString(param, "childOrderNo")+"%"); 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"))) { if (StringUtils.isNotBlank(MapUtils.getString(param, "memPhone"))) {
criteria.andMemPhoneLike("%"+MapUtils.getString(param, "memPhone")+"%"); criteria.andMemPhoneLike("%"+MapUtils.getString(param, "memPhone")+"%");
} }

Loading…
Cancel
Save