From 31f0fc0b71679e36053029c3b35012b9d139b854 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 06 十一月 2024 17:51:22 +0800
Subject: [PATCH] 订单导入
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 71001eb..554b959 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -759,6 +759,17 @@
public R<String> importTemplate(HttpServletResponse response) throws Exception {
List<FrozenBuckleImportDTO> list = new ArrayList<>();
FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
+ bean.setSiteName("站点名称");
+ bean.setServeName("服务信息");
+ bean.setReservationName("预约姓名");
+ bean.setReservationPhone("预约电话");
+ bean.setProvince("省份");
+ bean.setCity("市");
+ bean.setArea("区");
+ bean.setReservationAddress("详细地址");
+ bean.setCustClass("上门时间");
+ bean.setServerName("服务人员");
+ bean.setReservationRemark("备注");
list.add(bean);
// 这里URLEncoder.encode可以防止中文乱码
@@ -845,6 +856,8 @@
Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
if(Objects.nonNull(site)){
order.setSiteId(site.getId());
+ }else {
+ return R.fail("站点信息不存在");
}
// 师傅信息
if (StringUtils.hasLength(order.getServerName())) {
@@ -852,6 +865,8 @@
if(Objects.nonNull(masterWorker)){
order.setServerId(masterWorker.getId());
order.setServerPhone(masterWorker.getPhone());
+ }else {
+ return R.fail("师傅信息不存在");
}
order.setAcceptTime(new Date());
// 待上门
@@ -869,6 +884,8 @@
if(Objects.nonNull(recoveryServe)){
order.setServeId(recoveryServe.getId());
order.setServePrice(recoveryServe.getDefaultPrice());
+ }else {
+ return R.fail("回收服务不存在");
}
RecoveryServePrice one = recoveryServePriceService.lambdaQuery().eq(RecoveryServePrice::getCity, order.getCityCode()).eq(RecoveryServePrice::getRecoveryServeId, order.getServeId()).eq(BaseEntity::getIsDelete, 0).one();
if (one==null) {
--
Gitblit v1.7.1