fix: 第1批 M2、M3、M16、M23 导入与展示类缺陷
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8h37m36s
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 8h37m36s
- M2 批量换绑表头改为“平台登录账号”,只认手机号,细分格式、不存在、多匹配、非平台、已禁用失败原因 - M3 后台订单列表与详情返回 C 端在线购买的交易流水号、支付渠道、商户名称,详情新增全部支付单 payments - M16 预警规则不再返回 real_data_mb,预警列表/详情新增 threshold_mb,导出末列追加“阈值流量(MB)” - M23 设备导入 IMEI 必填,空 IMEI 行记为失败 - OpenSpec Change fix-august-iteration-follow-up-gaps:13/18,导入任务、导出任务的 Worker 端到端验证与前端/运营通知待部署后完成
This commit is contained in:
@@ -1297,6 +1297,27 @@ func (s *Service) Get(ctx context.Context, id uint) (*dto.OrderResponse, error)
|
||||
return s.buildOrderResponse(ctx, order, items), nil
|
||||
}
|
||||
|
||||
// GetDetail 返回后台订单详情,含 C 端在线购买的原始支付信息与该订单全部支付单。
|
||||
func (s *Service) GetDetail(ctx context.Context, id uint) (*dto.OrderDetailResponse, error) {
|
||||
order, items, err := s.orderStore.GetByIDWithItems(ctx, id)
|
||||
if err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
return nil, errors.New(errors.CodeNotFound, "订单不存在")
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
resp := s.buildOrderResponse(ctx, order, items)
|
||||
if err := s.fillOrderPaymentInfo(ctx, []*model.Order{order}, []*dto.OrderResponse{resp}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
payments, err := s.listOrderPayments(ctx, order)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &dto.OrderDetailResponse{OrderResponse: resp, Payments: payments}, nil
|
||||
}
|
||||
|
||||
func (s *Service) List(ctx context.Context, req *dto.OrderListRequest, startTime, endTime *time.Time, buyerType string, buyerID uint) (*dto.OrderListResponse, error) {
|
||||
page := req.Page
|
||||
pageSize := req.PageSize
|
||||
@@ -1387,6 +1408,9 @@ func (s *Service) List(ctx context.Context, req *dto.OrderListRequest, startTime
|
||||
for _, o := range orders {
|
||||
list = append(list, s.buildOrderResponse(ctx, o, itemsMap[o.ID]))
|
||||
}
|
||||
if err := s.fillOrderPaymentInfo(ctx, orders, list); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &dto.OrderListResponse{
|
||||
List: list,
|
||||
|
||||
Reference in New Issue
Block a user