|
|
|
@ -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"); |
|
|
|
|