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:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user