diff --git a/app/user/cmd/api/internal/logic/query/querylistlogic.go b/app/user/cmd/api/internal/logic/query/querylistlogic.go index 9cf5531..0fdb03f 100644 --- a/app/user/cmd/api/internal/logic/query/querylistlogic.go +++ b/app/user/cmd/api/internal/logic/query/querylistlogic.go @@ -30,19 +30,25 @@ func (l *QueryListLogic) QueryList(req *types.QueryListReq) (resp *types.QueryLi userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx) if getUidErr != nil { return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "报告列表查询, 获取用户信息失败, %+v", getUidErr) - } - build := l.svcCtx.QueryModel.SelectBuilder().Where(squirrel.Eq{ + build := l.svcCtx.OrderModel.SelectBuilder().Where(squirrel.Eq{ "user_id": userID, + }).Where(squirrel.NotEq{ + "status": []string{"pending", "closed"}, }) - queryList, total, err := l.svcCtx.QueryModel.FindPageListByPageWithTotal(l.ctx, build, req.Page, req.PageSize, "create_time DESC") + orderList, total, err := l.svcCtx.OrderModel.FindPageListByPageWithTotal(l.ctx, build, req.Page, req.PageSize, "create_time DESC") if err != nil { - return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "报告列表查询, 查找报告列表错误, %+v", err) + return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "报告列表查询, 查找订单列表错误, %+v", err) } var list []types.Query - if len(queryList) > 0 { - for _, queryModel := range queryList { + if len(orderList) > 0 { + for _, orderModel := range orderList { + queryModel, findQueryErr := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, orderModel.Id) + if findQueryErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "报告列表查询, 查找报告错误, %+v", findQueryErr) + + } var query types.Query query.CreateTime = queryModel.CreateTime.Format("2006-01-02 15:04:05") query.UpdateTime = queryModel.UpdateTime.Format("2006-01-02 15:04:05") diff --git a/app/user/cmd/api/internal/service/alipayService.go b/app/user/cmd/api/internal/service/alipayService.go index 04ccfdc..d44f790 100644 --- a/app/user/cmd/api/internal/service/alipayService.go +++ b/app/user/cmd/api/internal/service/alipayService.go @@ -68,7 +68,7 @@ func (a *AliPayService) CreateAlipayH5Order(amount float64, subject string, outT Subject: subject, OutTradeNo: outTradeNo, TotalAmount: totalAmount, - ProductCode: "QUICK_WAP_WAY", // H5支付专用产品码 + ProductCode: "QUICK_WAP_PAY", // H5支付专用产品码 NotifyURL: a.config.NotifyUrl, // 异步回调通知地址 ReturnURL: a.config.ReturnURL, },