feat: 商户订单/退款页面增加商户名称筛选功能

前端:
- 商户订单页面(index.vue)和退款页面(refund/index.vue)增加merchant-name组件
- 搜索表单新增"商户名称"下拉选择,支持远程搜索和分页加载
- 订单列表表格新增"商户名称"列(merName)
- 重置按钮同时清除商户筛选条件

后端:
- MerchantOrderPageResponse增加merId和merName字段
- OrderMapper.xml的getMerchantAdminPage查询JOIN eb_merchant表获取商户名称
- OrderServiceImpl: 平台管理员支持按request.merId筛选指定商户订单
- RefundOrderServiceImpl: 同样支持按request.merId筛选退款订单

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
AriadenCaseblg
2026-04-10 12:09:29 +08:00
parent 0e6519b176
commit ad6fbc30ab
6 changed files with 42 additions and 5 deletions

View File

@@ -288,9 +288,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
map.put("endTime", dateLimit.getEndTime());
}
}
// 平台管理员(mer_id=0)查看全部商户订单,商户管理员只查看自己的订单
// 平台管理员(mer_id=0)可按商户筛选或查看全部,商户管理员只查看自己的订单
if (systemAdmin.getMerId() > 0) {
map.put("merId", systemAdmin.getMerId());
} else if (ObjectUtil.isNotNull(request.getMerId()) && request.getMerId() > 0) {
map.put("merId", request.getMerId());
}
if (StrUtil.isNotBlank(request.getOrderNo())) {
map.put("orderNo", URLUtil.decode(request.getOrderNo()));

View File

@@ -151,9 +151,11 @@ public class RefundOrderServiceImpl extends ServiceImpl<RefundOrderDao, RefundOr
map.put("endTime", dateLimit.getEndTime());
}
}
// 平台管理员(mer_id=0)查看全部商户退款订单
// 平台管理员(mer_id=0)可按商户筛选或查看全部商户管理员只查看自己的
if (systemAdmin.getMerId() > 0) {
map.put("merId", systemAdmin.getMerId());
} else if (ObjectUtil.isNotNull(request.getMerId()) && request.getMerId() > 0) {
map.put("merId", request.getMerId());
}
if (StrUtil.isNotBlank(request.getRefundOrderNo())) {
map.put("refundOrderNo", request.getRefundOrderNo());

View File

@@ -128,10 +128,12 @@
o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType, o.group_buy_record_status as groupBuyRecordStatus,
o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType,
mo.merchant_remark as merchantRemark, mo.verify_code as verifyCode, mo.shipping_type as shippingType,
u.nickname,u.is_logoff
u.nickname,u.is_logoff,
m.name as merName
from eb_order o
left join eb_merchant_order as mo on o.order_no = mo.order_no
left join eb_user as u on o.uid = u.id
left join eb_merchant as m on o.mer_id = m.id
where o.is_del = 0 and o.is_merchant_del = 0 and o.level = 1
<if test="merId != null">
and o.mer_id = #{merId}