From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
new file mode 100644
index 0000000..d1b9785
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -0,0 +1,90 @@
+package com.oying.modules.rider.service.impl;
+
+import com.oying.modules.rider.domain.RiderOrderRecord;
+import com.oying.utils.FileUtil;
+import lombok.RequiredArgsConstructor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.oying.modules.rider.service.RiderOrderRecordService;
+import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
+import com.oying.modules.rider.mapper.RiderOrderRecordMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.oying.utils.PageUtil;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import com.oying.utils.PageResult;
+
+/**
+* @description 服务实现
+* @author pxb
+* @date 2025-07-01
+**/
+@Service
+@RequiredArgsConstructor
+public class RiderOrderRecordServiceImpl extends ServiceImpl<RiderOrderRecordMapper, RiderOrderRecord> implements RiderOrderRecordService {
+
+ private final RiderOrderRecordMapper riderOrderRecordMapper;
+
+ @Override
+ public PageResult<RiderOrderRecord> queryAll(RiderOrderRecordQueryCriteria criteria, Page<Object> page){
+ return PageUtil.toPage(riderOrderRecordMapper.findAll(criteria, page));
+ }
+
+ @Override
+ public List<RiderOrderRecord> queryAll(RiderOrderRecordQueryCriteria criteria){
+ return riderOrderRecordMapper.findAll(criteria);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void create(RiderOrderRecord resources) {
+ riderOrderRecordMapper.insert(resources);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(RiderOrderRecord resources) {
+ RiderOrderRecord riderOrderRecord = getById(resources.getRecordId());
+ riderOrderRecord.copy(resources);
+ riderOrderRecordMapper.updateById(riderOrderRecord);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteAll(List<Long> ids) {
+ riderOrderRecordMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void download(List<RiderOrderRecord> all, HttpServletResponse response) throws IOException {
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (RiderOrderRecord riderOrderRecord : all) {
+ Map<String, Object> map = new LinkedHashMap<>();
+ map.put("订单id", riderOrderRecord.getOrderId());
+ map.put("订单编号", riderOrderRecord.getOrderNum());
+ map.put("商家ID", riderOrderRecord.getMerchantId());
+ map.put("商家名称", riderOrderRecord.getMerchantName());
+ map.put("商家地址", riderOrderRecord.getMerchantAddress());
+ map.put("收货地址", riderOrderRecord.getReceiverAddress());
+ map.put("订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消", riderOrderRecord.getOrderStatus());
+ map.put("接单时间", riderOrderRecord.getAcceptTime());
+ map.put("接单编号", riderOrderRecord.getAcceptNum());
+ map.put("完成/取消时间", riderOrderRecord.getFinishTime());
+ map.put("配送时长（秒）", riderOrderRecord.getDeliveryDuration());
+ map.put("是否超时：1-是 0-否", riderOrderRecord.getIsOvertime());
+ map.put("订单来源： 1-平台派单 2-骑手抢单 3-商家直派 4-其他", riderOrderRecord.getOrderSource());
+ map.put("订单收入配送费", riderOrderRecord.getOrderIncome());
+ map.put("创建人", riderOrderRecord.getCreateBy());
+ map.put("创建时间", riderOrderRecord.getCreateTime());
+ map.put("修改人", riderOrderRecord.getUpdateBy());
+ map.put("修改时间", riderOrderRecord.getUpdateTime());
+ list.add(map);
+ }
+ FileUtil.downloadExcel(list, response);
+ }
+}
--
Gitblit v1.9.3