Commit 732d4e87 authored by 周健威's avatar 周健威

修改代码

parent 063098e7
package com.xxfc.platform.order.pojo.price; package com.xxfc.platform.order.pojo.price;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO; import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
import lombok.Data; import lombok.Data;
...@@ -41,7 +42,7 @@ public class CostDetailExtend { ...@@ -41,7 +42,7 @@ public class CostDetailExtend {
/** /**
* 使用(消耗)详情列表 * 使用(消耗)详情列表
*/ */
List<VMCalendarPriceCostDTO> useAmountList; List<VMCalendarPriceCostDTO> useAmountList = CollUtil.newArrayList();;
public void initParamJson() { public void initParamJson() {
paramJson = JSONUtil.toJsonStr(this); paramJson = JSONUtil.toJsonStr(this);
......
...@@ -469,6 +469,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> { ...@@ -469,6 +469,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
csv.setHadConpon((StrUtil.isNotBlank(orderMQDTO.getCouponTickerNos())? Boolean.TRUE: Boolean.FALSE)); csv.setHadConpon((StrUtil.isNotBlank(orderMQDTO.getCouponTickerNos())? Boolean.TRUE: Boolean.FALSE));
csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList()); csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList()); csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList());
csv.setUseAmountList(inProgressVO.getUseAmountList());
csv.setOverAmountList(inProgressVO.getOverAmountList());
if(csv.getUsedDayNum() == orderMQDTO.getOrderRentVehicleDetail().getDayNum()) { if(csv.getUsedDayNum() == orderMQDTO.getOrderRentVehicleDetail().getDayNum()) {
csv.setType(CostDetailExtend.FINLISH_ONTIME); csv.setType(CostDetailExtend.FINLISH_ONTIME);
......
...@@ -178,6 +178,8 @@ public class OrderCancelBiz { ...@@ -178,6 +178,8 @@ public class OrderCancelBiz {
csv.setViolateDesc(""); csv.setViolateDesc("");
csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList()); csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList()); csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList());
csv.setUseAmountList(inProgressVO.getUseAmountList());
csv.setOverAmountList(inProgressVO.getOverAmountList());
//如果有扣款项,则生成额外的费用明细 //如果有扣款项,则生成额外的费用明细
if(oad.getDeductions().size() > 0) { if(oad.getDeductions().size() > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment