Refactor: 新增资金对账功能，扩展商户与骑手账单查询接口

shaofan
1 parent 146da27e
Showing 11 changed files with 528 additions and 0 deletions
src/main/java/com/diligrp/rider/controller/AdminMerchantFundController.java
src/main/java/com/diligrp/rider/mapper/MerchantFundMapper.java
src/main/java/com/diligrp/rider/service/MerchantFundService.java
src/main/java/com/diligrp/rider/service/impl/MenuBootstrapServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/MerchantFundServiceImpl.java
src/main/java/com/diligrp/rider/vo/MerchantBillDetailItemVO.java
src/main/java/com/diligrp/rider/vo/MerchantBillItemVO.java
src/main/java/com/diligrp/rider/vo/PageResultVO.java
src/main/java/com/diligrp/rider/vo/RiderBillDetailItemVO.java
src/main/java/com/diligrp/rider/vo/RiderBillItemVO.java
src/main/resources/mapper/MerchantFundMapper.xml
+package com.diligrp.rider.controller;
+
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.common.result.Result;
+import com.diligrp.rider.service.MerchantFundService;
+import com.diligrp.rider.vo.*;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/admin/merchant/fund")
+@RequiredArgsConstructor
+public class AdminMerchantFundController {
+
+    private final MerchantFundService merchantFundService;
+
+    @GetMapping("/merchant-bills")
+    public Result<PageResultVO<MerchantBillItemVO>> merchantBills(@RequestParam(required = false) Long cityId,
+                                                                  @RequestParam(required = false) String keyword,
+                                                                  @RequestParam String startDate,
+                                                                  @RequestParam String endDate,
+                                                                  @RequestParam(defaultValue = "1") int page,
+                                                                  HttpServletRequest request) {
+        return Result.success(merchantFundService.merchantBillList(resolveQueryCityId(request, cityId), keyword, startDate, endDate, page));
+    }
+
+    @GetMapping("/merchant-bill-detail")
+    public Result<PageResultVO<MerchantBillDetailItemVO>> merchantBillDetail(@RequestParam(required = false) Long cityId,
+                                                                              @RequestParam String outStoreId,
+                                                                              @RequestParam String startDate,
+                                                                              @RequestParam String endDate,
+                                                                              @RequestParam(defaultValue = "1") int page,
+                                                                              HttpServletRequest request) {
+        return Result.success(merchantFundService.merchantBillDetail(resolveQueryCityId(request, cityId), outStoreId, startDate, endDate, page));
+    }
+
+    @GetMapping("/rider-bills")
+    public Result<PageResultVO<RiderBillItemVO>> riderBills(@RequestParam(required = false) Long cityId,
+                                                            @RequestParam(required = false) String keyword,
+                                                            @RequestParam String startDate,
+                                                            @RequestParam String endDate,
+                                                            @RequestParam(defaultValue = "1") int page,
+                                                            HttpServletRequest request) {
+        return Result.success(merchantFundService.riderBillList(resolveQueryCityId(request, cityId), keyword, startDate, endDate, page));
+    }
+
+    @GetMapping("/rider-bill-detail")
+    public Result<PageResultVO<RiderBillDetailItemVO>> riderBillDetail(@RequestParam(required = false) Long cityId,
+                                                                       @RequestParam Long riderId,
+                                                                       @RequestParam String startDate,
+                                                                       @RequestParam String endDate,
+                                                                       @RequestParam(defaultValue = "1") int page,
+                                                                       HttpServletRequest request) {
+        return Result.success(merchantFundService.riderBillDetail(resolveQueryCityId(request, cityId), riderId, startDate, endDate, page));
+    }
+
+    private Long resolveScopedCityId(HttpServletRequest request) {
+        if (!"substation".equals(request.getAttribute("role"))) {
+            return null;
+        }
+        Long cityId = (Long) request.getAttribute("cityId");
+        if (cityId == null || cityId < 1) {
+            throw new BizException("当前账号未绑定有效城市");
+        }
+        return cityId;
+    }
+
+    private Long resolveQueryCityId(HttpServletRequest request, Long queryCityId) {
+        Long scopedCityId = resolveScopedCityId(request);
+        return scopedCityId != null ? scopedCityId : queryCityId;
+    }
+}
+package com.diligrp.rider.mapper;
+
+import com.diligrp.rider.vo.MerchantBillDetailItemVO;
+import com.diligrp.rider.vo.MerchantBillItemVO;
+import com.diligrp.rider.vo.RiderBillDetailItemVO;
+import com.diligrp.rider.vo.RiderBillItemVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface MerchantFundMapper {
+    long countMerchantBills(@Param("cityId") Long cityId,
+                            @Param("keyword") String keyword,
+                            @Param("startTime") Long startTime,
+                            @Param("endTime") Long endTime);
+
+    List<MerchantBillItemVO> selectMerchantBills(@Param("cityId") Long cityId,
+                                                 @Param("keyword") String keyword,
+                                                 @Param("startTime") Long startTime,
+                                                 @Param("endTime") Long endTime,
+                                                 @Param("offset") int offset,
+                                                 @Param("pageSize") int pageSize);
+
+    long countMerchantBillDetails(@Param("cityId") Long cityId,
+                                  @Param("outStoreId") String outStoreId,
+                                  @Param("startTime") Long startTime,
+                                  @Param("endTime") Long endTime);
+
+    List<MerchantBillDetailItemVO> selectMerchantBillDetails(@Param("cityId") Long cityId,
+                                                             @Param("outStoreId") String outStoreId,
+                                                             @Param("startTime") Long startTime,
+                                                             @Param("endTime") Long endTime,
+                                                             @Param("offset") int offset,
+                                                             @Param("pageSize") int pageSize);
+
+    long countRiderBills(@Param("cityId") Long cityId,
+                         @Param("keyword") String keyword,
+                         @Param("startTime") Long startTime,
+                         @Param("endTime") Long endTime);
+
+    List<RiderBillItemVO> selectRiderBills(@Param("cityId") Long cityId,
+                                           @Param("keyword") String keyword,
+                                           @Param("startTime") Long startTime,
+                                           @Param("endTime") Long endTime,
+                                           @Param("offset") int offset,
+                                           @Param("pageSize") int pageSize);
+
+    long countRiderBillDetails(@Param("cityId") Long cityId,
+                               @Param("riderId") Long riderId,
+                               @Param("startTime") Long startTime,
+                               @Param("endTime") Long endTime);
+
+    List<RiderBillDetailItemVO> selectRiderBillDetails(@Param("cityId") Long cityId,
+                                                       @Param("riderId") Long riderId,
+                                                       @Param("startTime") Long startTime,
+                                                       @Param("endTime") Long endTime,
+                                                       @Param("offset") int offset,
+                                                       @Param("pageSize") int pageSize);
+}
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.vo.*;
+
+public interface MerchantFundService {
+    PageResultVO<MerchantBillItemVO> merchantBillList(Long cityId, String keyword, String startDate, String endDate, int page);
+    PageResultVO<MerchantBillDetailItemVO> merchantBillDetail(Long cityId, String outStoreId, String startDate, String endDate, int page);
+    PageResultVO<RiderBillItemVO> riderBillList(Long cityId, String keyword, String startDate, String endDate, int page);
+    PageResultVO<RiderBillDetailItemVO> riderBillDetail(Long cityId, Long riderId, String startDate, String endDate, int page);
+}
@@ -64,6 +64,7 @@ public class MenuBootstrapServiceImpl implements MenuBootstrapService {
         defaults.add(menu("merchant.root", "商家管理", "DIR", "", "ShopOutlined", 0L, MenuScopeEnum.BOTH, 40));
         defaults.add(menu("merchant.enter", "入驻申请", "MENU", "/merchant/enter", "", 0L, MenuScopeEnum.BOTH, 41));
         defaults.add(menu("merchant.store", "店铺管理", "MENU", "/merchant/store", "", 0L, MenuScopeEnum.BOTH, 42));
+        defaults.add(menu("merchant.fund", "资金对账", "MENU", "/merchant/fund", "", 0L, MenuScopeEnum.BOTH, 43));
         defaults.add(menu("rider.list", "骑手管理", "MENU", "/rider", "UserOutlined", 0L, MenuScopeEnum.BOTH, 50));
         defaults.add(menu("rider.level", "骑手等级", "MENU", "/rider/level", "TrophyOutlined", 0L, MenuScopeEnum.BOTH, 55));
         defaults.add(menu("rider.evaluate", "骑手评价", "MENU", "/rider/evaluate", "StarOutlined", 0L, MenuScopeEnum.BOTH, 60));
@@ -104,6 +105,7 @@ public class MenuBootstrapServiceImpl implements MenuBootstrapService {
         persisted.get("merchant.enter").setParentId(persisted.get("merchant.root").getId());
         persisted.get("merchant.store").setParentId(persisted.get("merchant.root").getId());
+        persisted.get("merchant.fund").setParentId(persisted.get("merchant.root").getId());
         persisted.get("order.list").setParentId(persisted.get("order.root").getId());
         persisted.get("order.refund").setParentId(persisted.get("order.root").getId());
         persisted.get("order.delivery").setParentId(persisted.get("order.root").getId());
+package com.diligrp.rider.service.impl;
+
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.mapper.MerchantFundMapper;
+import com.diligrp.rider.service.MerchantFundService;
+import com.diligrp.rider.vo.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+
+@Service
+@RequiredArgsConstructor
+public class MerchantFundServiceImpl implements MerchantFundService {
+
+    private static final int PAGE_SIZE = 20;
+    private static final ZoneId ZONE_ID = ZoneId.of("Asia/Shanghai");
+
+    private final MerchantFundMapper merchantFundMapper;
+
+    @Override
+    public PageResultVO<MerchantBillItemVO> merchantBillList(Long cityId, String keyword, String startDate, String endDate, int page) {
+        long startTime = parseStartTime(startDate);
+        long endTime = parseEndTime(endDate);
+        int currentPage = normalizePage(page);
+        int offset = (currentPage - 1) * PAGE_SIZE;
+        PageResultVO<MerchantBillItemVO> result = new PageResultVO<>();
+        result.setList(merchantFundMapper.selectMerchantBills(cityId, normalizeKeyword(keyword), startTime, endTime, offset, PAGE_SIZE));
+        result.setPage(currentPage);
+        result.setPageSize(PAGE_SIZE);
+        result.setTotal(merchantFundMapper.countMerchantBills(cityId, normalizeKeyword(keyword), startTime, endTime));
+        return result;
+    }
+
+    @Override
+    public PageResultVO<MerchantBillDetailItemVO> merchantBillDetail(Long cityId, String outStoreId, String startDate, String endDate, int page) {
+        if (outStoreId == null || outStoreId.isBlank()) {
+            throw new BizException("店铺编号不能为空");
+        }
+        long startTime = parseStartTime(startDate);
+        long endTime = parseEndTime(endDate);
+        int currentPage = normalizePage(page);
+        int offset = (currentPage - 1) * PAGE_SIZE;
+        PageResultVO<MerchantBillDetailItemVO> result = new PageResultVO<>();
+        result.setList(merchantFundMapper.selectMerchantBillDetails(cityId, outStoreId, startTime, endTime, offset, PAGE_SIZE));
+        result.setPage(currentPage);
+        result.setPageSize(PAGE_SIZE);
+        result.setTotal(merchantFundMapper.countMerchantBillDetails(cityId, outStoreId, startTime, endTime));
+        return result;
+    }
+
+    @Override
+    public PageResultVO<RiderBillItemVO> riderBillList(Long cityId, String keyword, String startDate, String endDate, int page) {
+        long startTime = parseStartTime(startDate);
+        long endTime = parseEndTime(endDate);
+        int currentPage = normalizePage(page);
+        int offset = (currentPage - 1) * PAGE_SIZE;
+        PageResultVO<RiderBillItemVO> result = new PageResultVO<>();
+        result.setList(merchantFundMapper.selectRiderBills(cityId, normalizeKeyword(keyword), startTime, endTime, offset, PAGE_SIZE));
+        result.setPage(currentPage);
+        result.setPageSize(PAGE_SIZE);
+        result.setTotal(merchantFundMapper.countRiderBills(cityId, normalizeKeyword(keyword), startTime, endTime));
+        return result;
+    }
+
+    @Override
+    public PageResultVO<RiderBillDetailItemVO> riderBillDetail(Long cityId, Long riderId, String startDate, String endDate, int page) {
+        if (riderId == null || riderId < 1) {
+            throw new BizException("骑手ID不能为空");
+        }
+        long startTime = parseStartTime(startDate);
+        long endTime = parseEndTime(endDate);
+        int currentPage = normalizePage(page);
+        int offset = (currentPage - 1) * PAGE_SIZE;
+        PageResultVO<RiderBillDetailItemVO> result = new PageResultVO<>();
+        result.setList(merchantFundMapper.selectRiderBillDetails(cityId, riderId, startTime, endTime, offset, PAGE_SIZE));
+        result.setPage(currentPage);
+        result.setPageSize(PAGE_SIZE);
+        result.setTotal(merchantFundMapper.countRiderBillDetails(cityId, riderId, startTime, endTime));
+        return result;
+    }
+
+    private int normalizePage(int page) {
+        return Math.max(page, 1);
+    }
+
+    private String normalizeKeyword(String keyword) {
+        return keyword == null || keyword.isBlank() ? null : keyword.trim();
+    }
+
+    private long parseStartTime(String startDate) {
+        LocalDate date = parseDate(startDate, "开始日期不能为空");
+        return date.atStartOfDay(ZONE_ID).toEpochSecond();
+    }
+
+    private long parseEndTime(String endDate) {
+        LocalDate date = parseDate(endDate, "结束日期不能为空");
+        return date.plusDays(1).atStartOfDay(ZONE_ID).toEpochSecond();
+    }
+
+    private LocalDate parseDate(String value, String errorMessage) {
+        if (value == null || value.isBlank()) {
+            throw new BizException(errorMessage);
+        }
+        try {
+            return LocalDate.parse(value);
+        } catch (Exception ex) {
+            throw new BizException(errorMessage);
+        }
+    }
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MerchantBillDetailItemVO {
+    private Long orderId;
+    private String orderNo;
+    private Long payTime;
+    private Long completeTime;
+    private Integer status;
+    private BigDecimal orderAmount;
+    private BigDecimal deliveryAmount;
+    private BigDecimal refundAmount;
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MerchantBillItemVO {
+    private Long storeId;
+    private String outStoreId;
+    private String storeName;
+    private Long cityId;
+    private Long orderCount;
+    private BigDecimal orderAmount;
+    private BigDecimal deliveryAmount;
+    private BigDecimal refundAmount;
+    private BigDecimal merchantReceivableAmount;
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PageResultVO<T> {
+    private List<T> list;
+    private Integer page;
+    private Integer pageSize;
+    private Long total;
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RiderBillDetailItemVO {
+    private Long orderId;
+    private String orderNo;
+    private Long completeTime;
+    private Integer status;
+    private BigDecimal deliveryAmount;
+    private BigDecimal riderIncomeAmount;
+    private BigDecimal refundAmount;
+    private BigDecimal settleableAmount;
+}
+package com.diligrp.rider.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RiderBillItemVO {
+    private Long riderId;
+    private String riderName;
+    private String mobile;
+    private Long orderCount;
+    private BigDecimal deliveryAmount;
+    private BigDecimal riderIncomeAmount;
+    private BigDecimal refundAdjustAmount;
+    private BigDecimal settleableAmount;
+}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diligrp.rider.mapper.MerchantFundMapper">
+
+    <sql id="merchantBillFilter">
+        WHERE o.is_del = 0
+          AND o.status IN (2, 3, 4, 6, 7, 8, 9)
+          AND o.pay_time &gt;= #{startTime}
+          AND o.pay_time &lt; #{endTime}
+        <if test="cityId != null">
+          AND o.city_id = #{cityId}
+        </if>
+        <if test="keyword != null and keyword != ''">
+          AND ms.name LIKE CONCAT('%', #{keyword}, '%')
+        </if>
+    </sql>
+
+    <sql id="merchantBillDetailFilter">
+        WHERE o.is_del = 0
+          AND o.status IN (2, 3, 4, 6, 7, 8, 9)
+          AND o.pay_time &gt;= #{startTime}
+          AND o.pay_time &lt; #{endTime}
+          AND CAST(o.store_oid AS CHAR) = #{outStoreId}
+        <if test="cityId != null">
+          AND o.city_id = #{cityId}
+        </if>
+    </sql>
+
+    <sql id="riderBillFilter">
+        WHERE o.is_del = 0
+          AND o.rider_id &gt; 0
+          AND o.status IN (6, 7, 8, 9)
+          AND o.complete_time &gt;= #{startTime}
+          AND o.complete_time &lt; #{endTime}
+        <if test="cityId != null">
+          AND o.city_id = #{cityId}
+        </if>
+        <if test="keyword != null and keyword != ''">
+          AND (r.user_nickname LIKE CONCAT('%', #{keyword}, '%') OR r.mobile LIKE CONCAT('%', #{keyword}, '%'))
+        </if>
+    </sql>
+
+    <sql id="riderBillDetailFilter">
+        WHERE o.is_del = 0
+          AND o.rider_id = #{riderId}
+          AND o.status IN (6, 7, 8, 9)
+          AND o.complete_time &gt;= #{startTime}
+          AND o.complete_time &lt; #{endTime}
+        <if test="cityId != null">
+          AND o.city_id = #{cityId}
+        </if>
+    </sql>
+
+    <select id="countMerchantBills" resultType="long">
+        SELECT COUNT(1)
+        FROM (
+            SELECT ms.out_store_id
+            FROM orders o
+            INNER JOIN merchant_store ms ON ms.out_store_id = CAST(o.store_oid AS CHAR)
+                AND ms.city_id = o.city_id
+                AND ms.is_del = 0
+            <include refid="merchantBillFilter"/>
+            GROUP BY ms.out_store_id
+        ) t
+    </select>
+
+    <select id="selectMerchantBills" resultType="com.diligrp.rider.vo.MerchantBillItemVO">
+        SELECT
+            MAX(ms.id) AS storeId,
+            ms.out_store_id AS outStoreId,
+            MAX(ms.name) AS storeName,
+            MAX(ms.city_id) AS cityId,
+            COUNT(o.id) AS orderCount,
+            COALESCE(SUM(o.money), 0) AS orderAmount,
+            COALESCE(SUM(o.money_delivery), 0) AS deliveryAmount,
+            COALESCE(SUM(rr.refund_amount), 0) AS refundAmount,
+            COALESCE(SUM(o.money), 0) - COALESCE(SUM(rr.refund_amount), 0) AS merchantReceivableAmount
+        FROM orders o
+        INNER JOIN merchant_store ms ON ms.out_store_id = CAST(o.store_oid AS CHAR)
+            AND ms.city_id = o.city_id
+            AND ms.is_del = 0
+        LEFT JOIN (
+            SELECT oid, SUM(money) AS refund_amount
+            FROM orders_refund_record
+            WHERE status = 1
+            GROUP BY oid
+        ) rr ON rr.oid = o.id
+        <include refid="merchantBillFilter"/>
+        GROUP BY ms.out_store_id
+        ORDER BY MAX(o.pay_time) DESC
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="countMerchantBillDetails" resultType="long">
+        SELECT COUNT(1)
+        FROM orders o
+        <include refid="merchantBillDetailFilter"/>
+    </select>
+
+    <select id="selectMerchantBillDetails" resultType="com.diligrp.rider.vo.MerchantBillDetailItemVO">
+        SELECT
+            o.id AS orderId,
+            o.order_no AS orderNo,
+            o.pay_time AS payTime,
+            o.complete_time AS completeTime,
+            o.status AS status,
+            o.money AS orderAmount,
+            o.money_delivery AS deliveryAmount,
+            COALESCE(rr.refund_amount, 0) AS refundAmount
+        FROM orders o
+        LEFT JOIN (
+            SELECT oid, SUM(money) AS refund_amount
+            FROM orders_refund_record
+            WHERE status = 1
+            GROUP BY oid
+        ) rr ON rr.oid = o.id
+        <include refid="merchantBillDetailFilter"/>
+        ORDER BY o.pay_time DESC, o.id DESC
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="countRiderBills" resultType="long">
+        SELECT COUNT(1)
+        FROM (
+            SELECT o.rider_id
+            FROM orders o
+            INNER JOIN rider r ON r.id = o.rider_id AND r.is_del = 0
+            <include refid="riderBillFilter"/>
+            GROUP BY o.rider_id
+        ) t
+    </select>
+
+    <select id="selectRiderBills" resultType="com.diligrp.rider.vo.RiderBillItemVO">
+        SELECT
+            o.rider_id AS riderId,
+            MAX(r.user_nickname) AS riderName,
+            MAX(r.mobile) AS mobile,
+            COUNT(o.id) AS orderCount,
+            COALESCE(SUM(o.money_delivery), 0) AS deliveryAmount,
+            COALESCE(SUM(o.rider_income), 0) AS riderIncomeAmount,
+            COALESCE(SUM(rr.refund_amount), 0) AS refundAdjustAmount,
+            COALESCE(SUM(o.rider_income), 0) AS settleableAmount
+        FROM orders o
+        INNER JOIN rider r ON r.id = o.rider_id AND r.is_del = 0
+        LEFT JOIN (
+            SELECT oid, SUM(money) AS refund_amount
+            FROM orders_refund_record
+            WHERE status = 1
+            GROUP BY oid
+        ) rr ON rr.oid = o.id
+        <include refid="riderBillFilter"/>
+        GROUP BY o.rider_id
+        ORDER BY MAX(o.complete_time) DESC
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="countRiderBillDetails" resultType="long">
+        SELECT COUNT(1)
+        FROM orders o
+        <include refid="riderBillDetailFilter"/>
+    </select>
+
+    <select id="selectRiderBillDetails" resultType="com.diligrp.rider.vo.RiderBillDetailItemVO">
+        SELECT
+            o.id AS orderId,
+            o.order_no AS orderNo,
+            o.complete_time AS completeTime,
+            o.status AS status,
+            o.money_delivery AS deliveryAmount,
+            o.rider_income AS riderIncomeAmount,
+            COALESCE(rr.refund_amount, 0) AS refundAmount,
+            o.rider_income AS settleableAmount
+        FROM orders o
+        LEFT JOIN (
+            SELECT oid, SUM(money) AS refund_amount
+            FROM orders_refund_record
+            WHERE status = 1
+            GROUP BY oid
+        ) rr ON rr.oid = o.id
+        <include refid="riderBillDetailFilter"/>
+        ORDER BY o.complete_time DESC, o.id DESC
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+</mapper>