From ad6fbc30abcf28a9f3d64b44a6a9840326982790 Mon Sep 17 00:00:00 2001 From: AriadenCaseblg Date: Fri, 10 Apr 2026 12:09:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E6=88=B7=E8=AE=A2=E5=8D=95/?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 前端： - 商户订单页面(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 --- .../response/MerchantOrderPageResponse.java | 6 ++++++ .../service/service/impl/OrderServiceImpl.java | 4 +++- .../service/impl/RefundOrderServiceImpl.java | 4 +++- .../main/resources/mapper/order/OrderMapper.xml | 4 +++- .../src/views/merchantOrder/index.vue | 17 +++++++++++++++-- .../src/views/merchantOrder/refund/index.vue | 12 ++++++++++++ 6 files changed, 42 insertions(+), 5 deletions(-) diff --git a/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java b/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java index 0f7bdc8..8fc9178 100644 --- a/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java +++ b/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantOrderPageResponse.java @@ -31,6 +31,12 @@ public class MerchantOrderPageResponse implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "商户ID") + private Integer merId; + + @ApiModelProperty(value = "商户名称") + private String merName; + @ApiModelProperty(value = "订单号") private String orderNo; diff --git a/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java index 6245495..149f138 100644 --- a/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java +++ b/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java @@ -288,9 +288,11 @@ public class OrderServiceImpl extends ServiceImpl 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())); diff --git a/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RefundOrderServiceImpl.java b/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RefundOrderServiceImpl.java index e494229..6baf5ba 100644 --- a/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RefundOrderServiceImpl.java +++ b/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/RefundOrderServiceImpl.java @@ -151,9 +151,11 @@ public class RefundOrderServiceImpl extends ServiceImpl 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()); diff --git a/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml b/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml index 516ff14..13a2443 100644 --- a/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml +++ b/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml @@ -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 and o.mer_id = #{merId} diff --git a/mer_plat_admin/src/views/merchantOrder/index.vue b/mer_plat_admin/src/views/merchantOrder/index.vue index 821f743..0e3b165 100644 --- a/mer_plat_admin/src/views/merchantOrder/index.vue +++ b/mer_plat_admin/src/views/merchantOrder/index.vue @@ -48,6 +48,9 @@ + + + 查询 重置 @@ -108,6 +111,7 @@ 用户已删除 +