ZhangRongHong/qnc-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.0

Browse Source
This commit is contained in:
liangzai 2024-12-30 15:58:48 +08:00
parent f3d6c1e666
commit 0161382d12
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/user/cmd/api/internal/logic/query/querylistlogic.go
View File

@ -30,19 +30,25 @@ func (l *QueryListLogic) QueryList(req *types.QueryListReq) (resp *types.QueryLi
userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx) userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
if getUidErr != nil { if getUidErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "报告列表查询, 获取用户信息失败, %+v", getUidErr) 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, "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 { 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 var list []types.Query
if len(queryList) > 0 { if len(orderList) > 0 {
for _, queryModel := range queryList { 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 var query types.Query
query.CreateTime = queryModel.CreateTime.Format("2006-01-02 15:04:05") query.CreateTime = queryModel.CreateTime.Format("2006-01-02 15:04:05")
query.UpdateTime = queryModel.UpdateTime.Format("2006-01-02 15:04:05") query.UpdateTime = queryModel.UpdateTime.Format("2006-01-02 15:04:05")

2
app/user/cmd/api/internal/service/alipayService.go
View File

@ -68,7 +68,7 @@ func (a *AliPayService) CreateAlipayH5Order(amount float64, subject string, outT
Subject: subject, Subject: subject,
OutTradeNo: outTradeNo, OutTradeNo: outTradeNo,
TotalAmount: totalAmount, TotalAmount: totalAmount,
ProductCode: "QUICK_WAP_WAY", // H5支付专用产品码 ProductCode: "QUICK_WAP_PAY", // H5支付专用产品码
NotifyURL: a.config.NotifyUrl, // 异步回调通知地址 NotifyURL: a.config.NotifyUrl, // 异步回调通知地址
ReturnURL: a.config.ReturnURL, ReturnURL: a.config.ReturnURL,
}, },