From bd375f4fe8081c0ca612d72ed06c47ab3f89d68d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb'
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderIncomeDetailServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderIncomeDetailServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderIncomeDetailServiceImpl.java
new file mode 100644
index 0000000..5da95c2
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderIncomeDetailServiceImpl.java
@@ -0,0 +1,89 @@
+package com.oying.modules.rider.service.impl;
+
+import com.oying.modules.rider.domain.RiderIncomeDetail;
+import com.oying.modules.rider.domain.dto.RiderIncomeDetailQueryCriteria;
+import com.oying.modules.rider.mapper.RiderIncomeDetailMapper;
+import com.oying.modules.rider.service.RiderIncomeDetailService;
+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 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;
+
+/**
+ * @author pxb
+ * @description 服务实现
+ * @date 2025-06-18
+ **/
+@Service
+@RequiredArgsConstructor
+public class RiderIncomeDetailServiceImpl extends ServiceImpl<RiderIncomeDetailMapper, RiderIncomeDetail> implements RiderIncomeDetailService {
+
+ private final RiderIncomeDetailMapper riderIncomeDetailMapper;
+
+ @Override
+ public PageResult<RiderIncomeDetail> queryAll(RiderIncomeDetailQueryCriteria criteria, Page<Object> page) {
+ return PageUtil.toPage(riderIncomeDetailMapper.findAll(criteria, page));
+ }
+
+ @Override
+ public List<RiderIncomeDetail> queryAll(RiderIncomeDetailQueryCriteria criteria) {
+ return riderIncomeDetailMapper.findAll(criteria);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void create(RiderIncomeDetail resources) {
+ riderIncomeDetailMapper.insert(resources);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(RiderIncomeDetail resources) {
+ RiderIncomeDetail riderIncomeDetail = getById(resources.getIncomeId());
+ riderIncomeDetail.copy(resources);
+ riderIncomeDetailMapper.updateById(riderIncomeDetail);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteAll(List<Long> ids) {
+ riderIncomeDetailMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void download(List<RiderIncomeDetail> all, HttpServletResponse response) throws IOException {
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (RiderIncomeDetail riderIncomeDetail : all) {
+ Map<String, Object> map = new LinkedHashMap<>();
+ map.put("骑手id", riderIncomeDetail.getRiderId());
+ map.put("骑手名字", riderIncomeDetail.getRiderName());
+ map.put("骑手手机号", riderIncomeDetail.getRiderPhone());
+ map.put("订单id", riderIncomeDetail.getOrderId());
+ map.put("订单号", riderIncomeDetail.getOrderNum());
+ map.put("收入金额", riderIncomeDetail.getIncomeAmount());
+ map.put("收入类型：1-配送费，2-奖励，3-补贴", riderIncomeDetail.getIncomeType());
+ map.put("收入日期(YYYY-MM-dd)方便统计", riderIncomeDetail.getIncomeDate());
+ map.put("收入月份YYYY-MM", riderIncomeDetail.getIncomeMonth());
+ map.put("订单状态：1-待取货，2-配送中，3-已完成，4-已取消", riderIncomeDetail.getOrderStatus());
+ map.put("创建人", riderIncomeDetail.getCreateBy());
+ map.put("创建时间", riderIncomeDetail.getCreateTime());
+ map.put("修改者", riderIncomeDetail.getUpdateBy());
+ map.put("修改时间", riderIncomeDetail.getUpdateTime());
+ list.add(map);
+ }
+ FileUtil.downloadExcel(list, response);
+ }
+
+}
--
Gitblit v1.9.3