From abfedddb15ff90b7810a231dac964d2450372b94 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 09:01:42 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
index e357f60..02b9936 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.*;
+import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderSaleDTO;
import com.ruoyi.system.mapper.TOrderSaleMapper;
import com.ruoyi.system.query.TDataGeneratorSaleQuery;
@@ -92,8 +93,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
PageInfo<TOrderSaleVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
List<TOrderSaleVO> list = this.baseMapper.pageList(query,pageInfo);
@@ -184,8 +185,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
List<TOrderSaleVO> list = this.baseMapper.exportOrderSale(query);
List<Long> ids = list.stream().map(TOrderSaleVO::getId).collect(Collectors.toList());
@@ -205,8 +206,8 @@
}
@Override
- public Map<String, BigDecimal> getDataGeneratorMealDetail(TDataGeneratorSaleQuery query) {
- return this.baseMapper.getDataGeneratorMealDetail(query);
+ public Map<String, Double> getDataGeneratorSaleDetail(TDataGeneratorSaleQuery query) {
+ return this.baseMapper.getDataGeneratorSaleDetail(query);
}
@Override
@@ -236,8 +237,8 @@
endTime = LocalDateTime.now();
break;
}
- query.setStartTime(startTime);
- query.setEndTime(endTime);
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
List<TOrderSaleVO> list = this.baseMapper.saleGeneratorExport(query);
List<Long> ids = list.stream().map(TOrderSaleVO::getId).collect(Collectors.toList());
@@ -250,4 +251,13 @@
}
return list;
}
+
+ @Override
+ public void checkout(CheckoutDTO dto) {
+ TOrderSale orderSale = this.getById(dto.getOrderId());
+ orderSale.setPayType(dto.getPayType());
+ orderSale.setPayMoney(dto.getPayMoney());
+ orderSale.setStatus(2);
+ this.updateById(orderSale);
+ }
}
--
Gitblit v1.7.1