diff --git a/Dockerfile b/Dockerfile index b91118f..d828975 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ # 创建最终镜像,用于运行编译后的Go程序 FROM alpine #设置时区 -ENV TimeZone=Asia/Shanghai +RUN apk add --no-cache tzdata +ENV TZ=Asia/Shanghai WORKDIR /app # 将编译好的二进制文件从构建阶段复制到运行阶段 diff --git a/app/http/controllers/front/OrderController.go b/app/http/controllers/front/OrderController.go index 2bbcea0..a091359 100644 --- a/app/http/controllers/front/OrderController.go +++ b/app/http/controllers/front/OrderController.go @@ -56,7 +56,7 @@ func OrderQuery(c *gin.Context) { _, rsp := services.YouChuOrderQuery(order) utils.Log(nil, "三方订单查询", rsp) if rsp.OrderSta == "03" { - err := services.OrdersUpdateService(front.OrdersUpdateRequest{Id: order.Id, Status: common.ORDER_STATUS_PAY}) + err := services.OrdersUpdateService(front.OrdersUpdateRequest{Id: order.Id, Status: common.ORDER_STATUS_PAY, OrgTxnSeq: rsp.OrderNo}) if err != nil { controllers.Error(c, 500, "订单更新失败") return diff --git a/app/http/entities/front/Order.go b/app/http/entities/front/Order.go index f82db62..8124310 100644 --- a/app/http/entities/front/Order.go +++ b/app/http/entities/front/Order.go @@ -69,4 +69,5 @@ type OrdersUpdateRequest struct { Id int `json:"id" validate:"required" form:"id" validate:"required" example:"1"` Status int `json:"status" form:"status" validate:"oneof=1 2 3 4" example:"1"` // '状态(1/待支付,2/已支付,3/已完成4/取消5作废)' VoucherLink string `json:"voucher_link"` + OrgTxnSeq string `json:"orgTxnSeq"` } diff --git a/app/services/OrderService.go b/app/services/OrderService.go index bd6c988..edde19d 100644 --- a/app/services/OrderService.go +++ b/app/services/OrderService.go @@ -121,6 +121,9 @@ func OrdersUpdateService(req front.OrdersUpdateRequest) (err error) { if req.VoucherLink != "" { order.VoucherLink = req.VoucherLink } + if req.OrgTxnSeq != "" { + order.OrgTxnSeq = req.OrgTxnSeq + } _, err = repo.Where("Id = ?", req.Id).Update(&order) return }