From 73013ed7580a5ffa03421db820baa00aafb27e96 Mon Sep 17 00:00:00 2001 From: li Date: Mon, 18 Apr 2022 13:50:31 +0800 Subject: [PATCH] fix: --- controller/user_share_card.go | 52 +- lib/status/status.go | 48 +- model/autogenerated_order.go | 886 ++++++++++++++++++++++++++++++++++ model/order.go | 2 +- model/share_card.go | 15 +- router/router_app.go | 9 +- 6 files changed, 981 insertions(+), 31 deletions(-) diff --git a/controller/user_share_card.go b/controller/user_share_card.go index 7fa2db4..d6bc31f 100644 --- a/controller/user_share_card.go +++ b/controller/user_share_card.go @@ -10,6 +10,7 @@ import ( "mh-server/lib/status" "mh-server/lib/wxpay" "mh-server/model" + "time" ) func UserShareCardBillCreate(c *gin.Context) { @@ -382,10 +383,14 @@ func ShareCardRetrieveCreate(c *gin.Context) { RespJson(c, status.ShareCardRetrieveExistAppliedCard, nil) return } - req.Amount = 40 // TODO + req.Amount = 40 // TODO 测试数据 retrieve, err := req.RetrieveCreate() if err != nil { logger.Error("share card retrieve create err:", err) + if err.Error() == "before_6_month" { + RespJson(c, status.CardRetrieveBefore6Month, nil) + return + } RespJson(c, status.InternalServerError, nil) return } @@ -645,6 +650,12 @@ func CardIssueCreate(c *gin.Context) { RespJson(c, status.InternalServerError, nil) return } + if !shareCardRetrieveCard.ReceiptTime.IsZero() && shareCardRetrieveCard.ReceiptTime. + AddDate(0, 0, 2).After(time.Now()) { + logger.Error("receipt time is over 48 hour:") + RespJson(c, status.IssueFeedbackReceiptTimeOver48Hour, nil) + return + } feedback = &model.CardIssueFeedback{ Uid: shareCardRetrieveCard.Uid, GameCardId: shareCardRetrieveCard.GameCardId, @@ -827,3 +838,42 @@ func CardIssueInfo(c *gin.Context) { RespOK(c, issueFeedback) return } + +func CardIssueDeliver(c *gin.Context) { + req := struct { + CardIssueFeedbackId uint32 `json:"card_issue_feedback_id"` + }{} + if c.ShouldBindJSON(&req) != nil { + logger.Error("parameter err") + RespJson(c, status.BadRequest, nil) + return + } + var issueFeedback model.CardIssueFeedback + err := model.NewCardIssueFeedbackQuerySet(model.DB).IDEq(req.CardIssueFeedbackId).One(&issueFeedback) + if err != nil { + logger.Error("card issue feedback err") + RespJson(c, status.InternalServerError, nil) + return + } + //model.GetImpo() + + var store model.Store + err = model.NewStoreQuerySet(model.DB).IDEq(issueFeedback.StoreId).One(&store) + if err != nil && err != model.RecordNotFound { + logger.Error("store err") + RespJson(c, status.InternalServerError, nil) + return + } + var gameCard model.GameCard + err = model.NewGameCardQuerySet(model.DB).IDEq(issueFeedback.GameCardId).One(&gameCard) + if err != nil && err != model.RecordNotFound { + logger.Error("game card err") + RespJson(c, status.InternalServerError, nil) + return + } + issueFeedback.Store = &store + issueFeedback.GameCard = &gameCard + + RespOK(c, issueFeedback) + return +} diff --git a/lib/status/status.go b/lib/status/status.go index 638ae37..b7f641c 100644 --- a/lib/status/status.go +++ b/lib/status/status.go @@ -83,18 +83,20 @@ const ( AwardOffShelves = 500407 //奖品下架 AwardExchangeOut = 500408 //奖品已兑完 - NotMember = 500501 //非会员 - HadReceiveReward = 500502 // 已经领取过奖励 - OrderDelivered = 500503 // 订单已发货 - OrderCompleted = 500504 // 订单已完成 - OrderStockOut = 500505 // 没有库存 - OrderUnpaidDeposit = 500506 // 未交押金 - RefundDepositSubmitted = 500507 // 已提交押金退款 - OrderMemberLevelLow = 500508 // 会员等级低 - OrderOutRentCount = 500509 // 会员超过可借卡数 - OrderStatusNotReturning = 500510 // 订单已完成 - ShareCardBillStateCancelError = 500511 // 共享单状态不能取消 - ShareCardRetrieveExistAppliedCard = 500513 // 共享单状态不能取消 + NotMember = 500501 //非会员 + HadReceiveReward = 500502 // 已经领取过奖励 + OrderDelivered = 500503 // 订单已发货 + OrderCompleted = 500504 // 订单已完成 + OrderStockOut = 500505 // 没有库存 + OrderUnpaidDeposit = 500506 // 未交押金 + RefundDepositSubmitted = 500507 // 已提交押金退款 + OrderMemberLevelLow = 500508 // 会员等级低 + OrderOutRentCount = 500509 // 会员超过可借卡数 + OrderStatusNotReturning = 500510 // 订单已完成 + ShareCardBillStateCancelError = 500511 // 共享单状态不能取消 + ShareCardRetrieveExistAppliedCard = 500513 // 共享单状态不能取消 + IssueFeedbackReceiptTimeOver48Hour = 500514 // 问题反馈 超过 48小时 + CardRetrieveBefore6Month = 500515 // 用户收回卡需要半年后 GoodsNotSale = 500508 // 商品已下架 @@ -215,16 +217,18 @@ var statusMsg = map[int]string{ RequestTimeout: "服务器开小差了，请稍后再试", InviteUserFail: "邀请失败", - UserHasBeenInvited: "用户已被邀请过", - UserSelfInviteSelf: "不允许自己邀请自己", - OutOffWithdrawCountLimit: "超出每天提现次数", - OutOffWithdrawAccountLimit: "超出提现金额范围", - CaptchaDelivered: "验证码5分钟内有效", - ShareCardBillStateCancelError: "当前状态不能取消", - ShareCardRetrieveExistAppliedCard: "存在重复申请收回的卡", - PayStateIng: "支付中", - PayStateFail: "支付失败", - MoneySufficient: "余额不足", + UserHasBeenInvited: "用户已被邀请过", + UserSelfInviteSelf: "不允许自己邀请自己", + OutOffWithdrawCountLimit: "超出每天提现次数", + OutOffWithdrawAccountLimit: "超出提现金额范围", + CaptchaDelivered: "验证码5分钟内有效", + ShareCardBillStateCancelError: "当前状态不能取消", + ShareCardRetrieveExistAppliedCard: "存在重复申请收回的卡", + IssueFeedbackReceiptTimeOver48Hour: "签收后已超过48小时", + CardRetrieveBefore6Month: "收回的卡需共享满半年", + PayStateIng: "支付中", + PayStateFail: "支付失败", + MoneySufficient: "余额不足", AwardOffShelves: "奖品已下架", AwardExchangeOut: "奖品已兑完", diff --git a/model/autogenerated_order.go b/model/autogenerated_order.go index 87b57a5..214022f 100644 --- a/model/autogenerated_order.go +++ b/model/autogenerated_order.go @@ -4,6 +4,7 @@ package model import ( "errors" "fmt" + "strings" "time" "github.com/jinzhu/gorm" @@ -29,6 +30,15 @@ func (qs ExpressCompanyQuerySet) w(db *gorm.DB) ExpressCompanyQuerySet { return NewExpressCompanyQuerySet(db) } +func (qs ExpressCompanyQuerySet) Select(fields ...ExpressCompanyDBSchemaField) ExpressCompanyQuerySet { + names := []string{} + for _, f := range fields { + names = append(names, f.String()) + } + + return qs.w(qs.db.Select(strings.Join(names, ","))) +} + // Create is an autogenerated method // nolint: dupl func (o *ExpressCompany) Create(db *gorm.DB) error { @@ -53,6 +63,18 @@ func (qs ExpressCompanyQuerySet) CompanyCodeEq(companyCode string) ExpressCompan return qs.w(qs.db.Where("company_code = ?", companyCode)) } +// CompanyCodeGt is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyCodeGt(companyCode string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_code > ?", companyCode)) +} + +// CompanyCodeGte is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyCodeGte(companyCode string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_code >= ?", companyCode)) +} + // CompanyCodeIn is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) CompanyCodeIn(companyCode ...string) ExpressCompanyQuerySet { @@ -63,6 +85,24 @@ func (qs ExpressCompanyQuerySet) CompanyCodeIn(companyCode ...string) ExpressCom return qs.w(qs.db.Where("company_code IN (?)", companyCode)) } +// CompanyCodeLike is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyCodeLike(companyCode string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_code LIKE ?", companyCode)) +} + +// CompanyCodeLt is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyCodeLt(companyCode string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_code < ?", companyCode)) +} + +// CompanyCodeLte is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyCodeLte(companyCode string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_code <= ?", companyCode)) +} + // CompanyCodeNe is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) CompanyCodeNe(companyCode string) ExpressCompanyQuerySet { @@ -79,12 +119,30 @@ func (qs ExpressCompanyQuerySet) CompanyCodeNotIn(companyCode ...string) Express return qs.w(qs.db.Where("company_code NOT IN (?)", companyCode)) } +// CompanyCodeNotlike is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyCodeNotlike(companyCode string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_code NOT LIKE ?", companyCode)) +} + // CompanyNameEq is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) CompanyNameEq(companyName string) ExpressCompanyQuerySet { return qs.w(qs.db.Where("company_name = ?", companyName)) } +// CompanyNameGt is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyNameGt(companyName string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_name > ?", companyName)) +} + +// CompanyNameGte is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyNameGte(companyName string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_name >= ?", companyName)) +} + // CompanyNameIn is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) CompanyNameIn(companyName ...string) ExpressCompanyQuerySet { @@ -95,6 +153,24 @@ func (qs ExpressCompanyQuerySet) CompanyNameIn(companyName ...string) ExpressCom return qs.w(qs.db.Where("company_name IN (?)", companyName)) } +// CompanyNameLike is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyNameLike(companyName string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_name LIKE ?", companyName)) +} + +// CompanyNameLt is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyNameLt(companyName string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_name < ?", companyName)) +} + +// CompanyNameLte is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyNameLte(companyName string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_name <= ?", companyName)) +} + // CompanyNameNe is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) CompanyNameNe(companyName string) ExpressCompanyQuerySet { @@ -111,6 +187,12 @@ func (qs ExpressCompanyQuerySet) CompanyNameNotIn(companyName ...string) Express return qs.w(qs.db.Where("company_name NOT IN (?)", companyName)) } +// CompanyNameNotlike is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) CompanyNameNotlike(companyName string) ExpressCompanyQuerySet { + return qs.w(qs.db.Where("company_name NOT LIKE ?", companyName)) +} + // Count is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) Count() (int, error) { @@ -309,6 +391,18 @@ func (qs ExpressCompanyQuerySet) One(ret *ExpressCompany) error { return qs.db.First(ret).Error } +// OrderAscByCompanyCode is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) OrderAscByCompanyCode() ExpressCompanyQuerySet { + return qs.w(qs.db.Order("company_code ASC")) +} + +// OrderAscByCompanyName is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) OrderAscByCompanyName() ExpressCompanyQuerySet { + return qs.w(qs.db.Order("company_name ASC")) +} + // OrderAscByCreatedAt is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) OrderAscByCreatedAt() ExpressCompanyQuerySet { @@ -333,6 +427,18 @@ func (qs ExpressCompanyQuerySet) OrderAscByUpdatedAt() ExpressCompanyQuerySet { return qs.w(qs.db.Order("updated_at ASC")) } +// OrderDescByCompanyCode is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) OrderDescByCompanyCode() ExpressCompanyQuerySet { + return qs.w(qs.db.Order("company_code DESC")) +} + +// OrderDescByCompanyName is an autogenerated method +// nolint: dupl +func (qs ExpressCompanyQuerySet) OrderDescByCompanyName() ExpressCompanyQuerySet { + return qs.w(qs.db.Order("company_name DESC")) +} + // OrderDescByCreatedAt is an autogenerated method // nolint: dupl func (qs ExpressCompanyQuerySet) OrderDescByCreatedAt() ExpressCompanyQuerySet { @@ -542,6 +648,15 @@ func (qs OrderCardQuerySet) w(db *gorm.DB) OrderCardQuerySet { return NewOrderCardQuerySet(db) } +func (qs OrderCardQuerySet) Select(fields ...OrderCardDBSchemaField) OrderCardQuerySet { + names := []string{} + for _, f := range fields { + names = append(names, f.String()) + } + + return qs.w(qs.db.Select(strings.Join(names, ","))) +} + // Create is an autogenerated method // nolint: dupl func (o *OrderCard) Create(db *gorm.DB) error { @@ -1084,12 +1199,30 @@ func (qs OrderCardQuerySet) OrderAscByReceiptTime() OrderCardQuerySet { return qs.w(qs.db.Order("receipt_time ASC")) } +// OrderAscByRevertExpressCompany is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderAscByRevertExpressCompany() OrderCardQuerySet { + return qs.w(qs.db.Order("revert_express_company ASC")) +} + +// OrderAscByRevertExpressCompanyNo is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderAscByRevertExpressCompanyNo() OrderCardQuerySet { + return qs.w(qs.db.Order("revert_express_company_no ASC")) +} + // OrderAscByRevertExpressDuration is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) OrderAscByRevertExpressDuration() OrderCardQuerySet { return qs.w(qs.db.Order("revert_express_duration ASC")) } +// OrderAscByRevertExpressNo is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderAscByRevertExpressNo() OrderCardQuerySet { + return qs.w(qs.db.Order("revert_express_no ASC")) +} + // OrderAscByRevertStoreId is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) OrderAscByRevertStoreId() OrderCardQuerySet { @@ -1102,6 +1235,12 @@ func (qs OrderCardQuerySet) OrderAscByRevertTime() OrderCardQuerySet { return qs.w(qs.db.Order("revert_time ASC")) } +// OrderAscBySerialNumber is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderAscBySerialNumber() OrderCardQuerySet { + return qs.w(qs.db.Order("serial_number ASC")) +} + // OrderAscByStoreId is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) OrderAscByStoreId() OrderCardQuerySet { @@ -1186,12 +1325,30 @@ func (qs OrderCardQuerySet) OrderDescByReceiptTime() OrderCardQuerySet { return qs.w(qs.db.Order("receipt_time DESC")) } +// OrderDescByRevertExpressCompany is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderDescByRevertExpressCompany() OrderCardQuerySet { + return qs.w(qs.db.Order("revert_express_company DESC")) +} + +// OrderDescByRevertExpressCompanyNo is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderDescByRevertExpressCompanyNo() OrderCardQuerySet { + return qs.w(qs.db.Order("revert_express_company_no DESC")) +} + // OrderDescByRevertExpressDuration is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) OrderDescByRevertExpressDuration() OrderCardQuerySet { return qs.w(qs.db.Order("revert_express_duration DESC")) } +// OrderDescByRevertExpressNo is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderDescByRevertExpressNo() OrderCardQuerySet { + return qs.w(qs.db.Order("revert_express_no DESC")) +} + // OrderDescByRevertStoreId is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) OrderDescByRevertStoreId() OrderCardQuerySet { @@ -1204,6 +1361,12 @@ func (qs OrderCardQuerySet) OrderDescByRevertTime() OrderCardQuerySet { return qs.w(qs.db.Order("revert_time DESC")) } +// OrderDescBySerialNumber is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) OrderDescBySerialNumber() OrderCardQuerySet { + return qs.w(qs.db.Order("serial_number DESC")) +} + // OrderDescByStoreId is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) OrderDescByStoreId() OrderCardQuerySet { @@ -1376,6 +1539,18 @@ func (qs OrderCardQuerySet) RevertExpressCompanyEq(revertExpressCompany string) return qs.w(qs.db.Where("revert_express_company = ?", revertExpressCompany)) } +// RevertExpressCompanyGt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyGt(revertExpressCompany string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company > ?", revertExpressCompany)) +} + +// RevertExpressCompanyGte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyGte(revertExpressCompany string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company >= ?", revertExpressCompany)) +} + // RevertExpressCompanyIn is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressCompanyIn(revertExpressCompany ...string) OrderCardQuerySet { @@ -1386,6 +1561,24 @@ func (qs OrderCardQuerySet) RevertExpressCompanyIn(revertExpressCompany ...strin return qs.w(qs.db.Where("revert_express_company IN (?)", revertExpressCompany)) } +// RevertExpressCompanyLike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyLike(revertExpressCompany string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company LIKE ?", revertExpressCompany)) +} + +// RevertExpressCompanyLt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyLt(revertExpressCompany string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company < ?", revertExpressCompany)) +} + +// RevertExpressCompanyLte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyLte(revertExpressCompany string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company <= ?", revertExpressCompany)) +} + // RevertExpressCompanyNe is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressCompanyNe(revertExpressCompany string) OrderCardQuerySet { @@ -1398,6 +1591,18 @@ func (qs OrderCardQuerySet) RevertExpressCompanyNoEq(revertExpressCompanyNo stri return qs.w(qs.db.Where("revert_express_company_no = ?", revertExpressCompanyNo)) } +// RevertExpressCompanyNoGt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNoGt(revertExpressCompanyNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company_no > ?", revertExpressCompanyNo)) +} + +// RevertExpressCompanyNoGte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNoGte(revertExpressCompanyNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company_no >= ?", revertExpressCompanyNo)) +} + // RevertExpressCompanyNoIn is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressCompanyNoIn(revertExpressCompanyNo ...string) OrderCardQuerySet { @@ -1408,6 +1613,24 @@ func (qs OrderCardQuerySet) RevertExpressCompanyNoIn(revertExpressCompanyNo ...s return qs.w(qs.db.Where("revert_express_company_no IN (?)", revertExpressCompanyNo)) } +// RevertExpressCompanyNoLike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNoLike(revertExpressCompanyNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company_no LIKE ?", revertExpressCompanyNo)) +} + +// RevertExpressCompanyNoLt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNoLt(revertExpressCompanyNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company_no < ?", revertExpressCompanyNo)) +} + +// RevertExpressCompanyNoLte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNoLte(revertExpressCompanyNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company_no <= ?", revertExpressCompanyNo)) +} + // RevertExpressCompanyNoNe is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressCompanyNoNe(revertExpressCompanyNo string) OrderCardQuerySet { @@ -1424,6 +1647,12 @@ func (qs OrderCardQuerySet) RevertExpressCompanyNoNotIn(revertExpressCompanyNo . return qs.w(qs.db.Where("revert_express_company_no NOT IN (?)", revertExpressCompanyNo)) } +// RevertExpressCompanyNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNoNotlike(revertExpressCompanyNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company_no NOT LIKE ?", revertExpressCompanyNo)) +} + // RevertExpressCompanyNotIn is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressCompanyNotIn(revertExpressCompany ...string) OrderCardQuerySet { @@ -1434,6 +1663,12 @@ func (qs OrderCardQuerySet) RevertExpressCompanyNotIn(revertExpressCompany ...st return qs.w(qs.db.Where("revert_express_company NOT IN (?)", revertExpressCompany)) } +// RevertExpressCompanyNotlike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressCompanyNotlike(revertExpressCompany string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_company NOT LIKE ?", revertExpressCompany)) +} + // RevertExpressDurationEq is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressDurationEq(revertExpressDuration uint64) OrderCardQuerySet { @@ -1496,6 +1731,18 @@ func (qs OrderCardQuerySet) RevertExpressNoEq(revertExpressNo string) OrderCardQ return qs.w(qs.db.Where("revert_express_no = ?", revertExpressNo)) } +// RevertExpressNoGt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressNoGt(revertExpressNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_no > ?", revertExpressNo)) +} + +// RevertExpressNoGte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressNoGte(revertExpressNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_no >= ?", revertExpressNo)) +} + // RevertExpressNoIn is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressNoIn(revertExpressNo ...string) OrderCardQuerySet { @@ -1506,6 +1753,24 @@ func (qs OrderCardQuerySet) RevertExpressNoIn(revertExpressNo ...string) OrderCa return qs.w(qs.db.Where("revert_express_no IN (?)", revertExpressNo)) } +// RevertExpressNoLike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressNoLike(revertExpressNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_no LIKE ?", revertExpressNo)) +} + +// RevertExpressNoLt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressNoLt(revertExpressNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_no < ?", revertExpressNo)) +} + +// RevertExpressNoLte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressNoLte(revertExpressNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_no <= ?", revertExpressNo)) +} + // RevertExpressNoNe is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertExpressNoNe(revertExpressNo string) OrderCardQuerySet { @@ -1522,6 +1787,12 @@ func (qs OrderCardQuerySet) RevertExpressNoNotIn(revertExpressNo ...string) Orde return qs.w(qs.db.Where("revert_express_no NOT IN (?)", revertExpressNo)) } +// RevertExpressNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) RevertExpressNoNotlike(revertExpressNo string) OrderCardQuerySet { + return qs.w(qs.db.Where("revert_express_no NOT LIKE ?", revertExpressNo)) +} + // RevertStoreIdEq is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) RevertStoreIdEq(revertStoreId uint64) OrderCardQuerySet { @@ -1620,6 +1891,18 @@ func (qs OrderCardQuerySet) SerialNumberEq(serialNumber string) OrderCardQuerySe return qs.w(qs.db.Where("serial_number = ?", serialNumber)) } +// SerialNumberGt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) SerialNumberGt(serialNumber string) OrderCardQuerySet { + return qs.w(qs.db.Where("serial_number > ?", serialNumber)) +} + +// SerialNumberGte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) SerialNumberGte(serialNumber string) OrderCardQuerySet { + return qs.w(qs.db.Where("serial_number >= ?", serialNumber)) +} + // SerialNumberIn is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) SerialNumberIn(serialNumber ...string) OrderCardQuerySet { @@ -1630,6 +1913,24 @@ func (qs OrderCardQuerySet) SerialNumberIn(serialNumber ...string) OrderCardQuer return qs.w(qs.db.Where("serial_number IN (?)", serialNumber)) } +// SerialNumberLike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) SerialNumberLike(serialNumber string) OrderCardQuerySet { + return qs.w(qs.db.Where("serial_number LIKE ?", serialNumber)) +} + +// SerialNumberLt is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) SerialNumberLt(serialNumber string) OrderCardQuerySet { + return qs.w(qs.db.Where("serial_number < ?", serialNumber)) +} + +// SerialNumberLte is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) SerialNumberLte(serialNumber string) OrderCardQuerySet { + return qs.w(qs.db.Where("serial_number <= ?", serialNumber)) +} + // SerialNumberNe is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) SerialNumberNe(serialNumber string) OrderCardQuerySet { @@ -1646,6 +1947,12 @@ func (qs OrderCardQuerySet) SerialNumberNotIn(serialNumber ...string) OrderCardQ return qs.w(qs.db.Where("serial_number NOT IN (?)", serialNumber)) } +// SerialNumberNotlike is an autogenerated method +// nolint: dupl +func (qs OrderCardQuerySet) SerialNumberNotlike(serialNumber string) OrderCardQuerySet { + return qs.w(qs.db.Where("serial_number NOT LIKE ?", serialNumber)) +} + // StoreIdEq is an autogenerated method // nolint: dupl func (qs OrderCardQuerySet) StoreIdEq(storeId uint32) OrderCardQuerySet { @@ -2093,6 +2400,15 @@ func (qs OrderQuerySet) w(db *gorm.DB) OrderQuerySet { return NewOrderQuerySet(db) } +func (qs OrderQuerySet) Select(fields ...OrderDBSchemaField) OrderQuerySet { + names := []string{} + for _, f := range fields { + names = append(names, f.String()) + } + + return qs.w(qs.db.Select(strings.Join(names, ","))) +} + // Create is an autogenerated method // nolint: dupl func (o *Order) Create(db *gorm.DB) error { @@ -2433,6 +2749,18 @@ func (qs OrderQuerySet) ExpressCompanyEq(expressCompany string) OrderQuerySet { return qs.w(qs.db.Where("express_company = ?", expressCompany)) } +// ExpressCompanyGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyGt(expressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("express_company > ?", expressCompany)) +} + +// ExpressCompanyGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyGte(expressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("express_company >= ?", expressCompany)) +} + // ExpressCompanyIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressCompanyIn(expressCompany ...string) OrderQuerySet { @@ -2443,6 +2771,24 @@ func (qs OrderQuerySet) ExpressCompanyIn(expressCompany ...string) OrderQuerySet return qs.w(qs.db.Where("express_company IN (?)", expressCompany)) } +// ExpressCompanyLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyLike(expressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("express_company LIKE ?", expressCompany)) +} + +// ExpressCompanyLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyLt(expressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("express_company < ?", expressCompany)) +} + +// ExpressCompanyLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyLte(expressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("express_company <= ?", expressCompany)) +} + // ExpressCompanyNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressCompanyNe(expressCompany string) OrderQuerySet { @@ -2455,6 +2801,18 @@ func (qs OrderQuerySet) ExpressCompanyNoEq(expressCompanyNo string) OrderQuerySe return qs.w(qs.db.Where("express_company_no = ?", expressCompanyNo)) } +// ExpressCompanyNoGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNoGt(expressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_company_no > ?", expressCompanyNo)) +} + +// ExpressCompanyNoGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNoGte(expressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_company_no >= ?", expressCompanyNo)) +} + // ExpressCompanyNoIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressCompanyNoIn(expressCompanyNo ...string) OrderQuerySet { @@ -2465,6 +2823,24 @@ func (qs OrderQuerySet) ExpressCompanyNoIn(expressCompanyNo ...string) OrderQuer return qs.w(qs.db.Where("express_company_no IN (?)", expressCompanyNo)) } +// ExpressCompanyNoLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNoLike(expressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_company_no LIKE ?", expressCompanyNo)) +} + +// ExpressCompanyNoLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNoLt(expressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_company_no < ?", expressCompanyNo)) +} + +// ExpressCompanyNoLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNoLte(expressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_company_no <= ?", expressCompanyNo)) +} + // ExpressCompanyNoNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressCompanyNoNe(expressCompanyNo string) OrderQuerySet { @@ -2481,6 +2857,12 @@ func (qs OrderQuerySet) ExpressCompanyNoNotIn(expressCompanyNo ...string) OrderQ return qs.w(qs.db.Where("express_company_no NOT IN (?)", expressCompanyNo)) } +// ExpressCompanyNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNoNotlike(expressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_company_no NOT LIKE ?", expressCompanyNo)) +} + // ExpressCompanyNotIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressCompanyNotIn(expressCompany ...string) OrderQuerySet { @@ -2491,6 +2873,12 @@ func (qs OrderQuerySet) ExpressCompanyNotIn(expressCompany ...string) OrderQuery return qs.w(qs.db.Where("express_company NOT IN (?)", expressCompany)) } +// ExpressCompanyNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressCompanyNotlike(expressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("express_company NOT LIKE ?", expressCompany)) +} + // ExpressDurationEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressDurationEq(expressDuration uint64) OrderQuerySet { @@ -2553,6 +2941,18 @@ func (qs OrderQuerySet) ExpressNoEq(expressNo string) OrderQuerySet { return qs.w(qs.db.Where("express_no = ?", expressNo)) } +// ExpressNoGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressNoGt(expressNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_no > ?", expressNo)) +} + +// ExpressNoGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressNoGte(expressNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_no >= ?", expressNo)) +} + // ExpressNoIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressNoIn(expressNo ...string) OrderQuerySet { @@ -2563,6 +2963,24 @@ func (qs OrderQuerySet) ExpressNoIn(expressNo ...string) OrderQuerySet { return qs.w(qs.db.Where("express_no IN (?)", expressNo)) } +// ExpressNoLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressNoLike(expressNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_no LIKE ?", expressNo)) +} + +// ExpressNoLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressNoLt(expressNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_no < ?", expressNo)) +} + +// ExpressNoLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressNoLte(expressNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_no <= ?", expressNo)) +} + // ExpressNoNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) ExpressNoNe(expressNo string) OrderQuerySet { @@ -2579,6 +2997,12 @@ func (qs OrderQuerySet) ExpressNoNotIn(expressNo ...string) OrderQuerySet { return qs.w(qs.db.Where("express_no NOT IN (?)", expressNo)) } +// ExpressNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) ExpressNoNotlike(expressNo string) OrderQuerySet { + return qs.w(qs.db.Where("express_no NOT LIKE ?", expressNo)) +} + // GameCardGoodsIdEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) GameCardGoodsIdEq(gameCardGoodsId uint64) OrderQuerySet { @@ -2691,6 +3115,74 @@ func (qs OrderQuerySet) GameCardIdNotIn(gameCardId ...uint64) OrderQuerySet { return qs.w(qs.db.Where("game_card_id NOT IN (?)", gameCardId)) } +// GameCardSerialNumberEq is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberEq(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number = ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberGt(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number > ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberGte(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number >= ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberIn is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberIn(gameCardSerialNumber ...string) OrderQuerySet { + if len(gameCardSerialNumber) == 0 { + qs.db.AddError(errors.New("must at least pass one gameCardSerialNumber in GameCardSerialNumberIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("game_card_serial_number IN (?)", gameCardSerialNumber)) +} + +// GameCardSerialNumberLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberLike(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number LIKE ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberLt(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number < ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberLte(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number <= ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberNe is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberNe(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number != ?", gameCardSerialNumber)) +} + +// GameCardSerialNumberNotIn is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberNotIn(gameCardSerialNumber ...string) OrderQuerySet { + if len(gameCardSerialNumber) == 0 { + qs.db.AddError(errors.New("must at least pass one gameCardSerialNumber in GameCardSerialNumberNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("game_card_serial_number NOT IN (?)", gameCardSerialNumber)) +} + +// GameCardSerialNumberNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) GameCardSerialNumberNotlike(gameCardSerialNumber string) OrderQuerySet { + return qs.w(qs.db.Where("game_card_serial_number NOT LIKE ?", gameCardSerialNumber)) +} + // GetDB is an autogenerated method // nolint: dupl func (qs OrderQuerySet) GetDB() *gorm.DB { @@ -2771,6 +3263,18 @@ func (qs OrderQuerySet) MchidEq(mchid string) OrderQuerySet { return qs.w(qs.db.Where("mchid = ?", mchid)) } +// MchidGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) MchidGt(mchid string) OrderQuerySet { + return qs.w(qs.db.Where("mchid > ?", mchid)) +} + +// MchidGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) MchidGte(mchid string) OrderQuerySet { + return qs.w(qs.db.Where("mchid >= ?", mchid)) +} + // MchidIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) MchidIn(mchid ...string) OrderQuerySet { @@ -2781,6 +3285,24 @@ func (qs OrderQuerySet) MchidIn(mchid ...string) OrderQuerySet { return qs.w(qs.db.Where("mchid IN (?)", mchid)) } +// MchidLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) MchidLike(mchid string) OrderQuerySet { + return qs.w(qs.db.Where("mchid LIKE ?", mchid)) +} + +// MchidLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) MchidLt(mchid string) OrderQuerySet { + return qs.w(qs.db.Where("mchid < ?", mchid)) +} + +// MchidLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) MchidLte(mchid string) OrderQuerySet { + return qs.w(qs.db.Where("mchid <= ?", mchid)) +} + // MchidNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) MchidNe(mchid string) OrderQuerySet { @@ -2797,6 +3319,12 @@ func (qs OrderQuerySet) MchidNotIn(mchid ...string) OrderQuerySet { return qs.w(qs.db.Where("mchid NOT IN (?)", mchid)) } +// MchidNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) MchidNotlike(mchid string) OrderQuerySet { + return qs.w(qs.db.Where("mchid NOT LIKE ?", mchid)) +} + // Offset is an autogenerated method // nolint: dupl func (qs OrderQuerySet) Offset(offset int) OrderQuerySet { @@ -2845,12 +3373,30 @@ func (qs OrderQuerySet) OrderAscByDeliveryType() OrderQuerySet { return qs.w(qs.db.Order("delivery_type ASC")) } +// OrderAscByExpressCompany is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByExpressCompany() OrderQuerySet { + return qs.w(qs.db.Order("express_company ASC")) +} + +// OrderAscByExpressCompanyNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByExpressCompanyNo() OrderQuerySet { + return qs.w(qs.db.Order("express_company_no ASC")) +} + // OrderAscByExpressDuration is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByExpressDuration() OrderQuerySet { return qs.w(qs.db.Order("express_duration ASC")) } +// OrderAscByExpressNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByExpressNo() OrderQuerySet { + return qs.w(qs.db.Order("express_no ASC")) +} + // OrderAscByGameCardGoodsId is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByGameCardGoodsId() OrderQuerySet { @@ -2863,12 +3409,36 @@ func (qs OrderQuerySet) OrderAscByGameCardId() OrderQuerySet { return qs.w(qs.db.Order("game_card_id ASC")) } +// OrderAscByGameCardSerialNumber is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByGameCardSerialNumber() OrderQuerySet { + return qs.w(qs.db.Order("game_card_serial_number ASC")) +} + // OrderAscByID is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByID() OrderQuerySet { return qs.w(qs.db.Order("id ASC")) } +// OrderAscByMchid is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByMchid() OrderQuerySet { + return qs.w(qs.db.Order("mchid ASC")) +} + +// OrderAscByOrderSn is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByOrderSn() OrderQuerySet { + return qs.w(qs.db.Order("order_sn ASC")) +} + +// OrderAscByOutTradeNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByOutTradeNo() OrderQuerySet { + return qs.w(qs.db.Order("out_trade_no ASC")) +} + // OrderAscByPayPrice is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByPayPrice() OrderQuerySet { @@ -2887,6 +3457,12 @@ func (qs OrderQuerySet) OrderAscByPayTime() OrderQuerySet { return qs.w(qs.db.Order("pay_time ASC")) } +// OrderAscByPickupCode is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByPickupCode() OrderQuerySet { + return qs.w(qs.db.Order("pickup_code ASC")) +} + // OrderAscByPostage is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByPostage() OrderQuerySet { @@ -2899,12 +3475,30 @@ func (qs OrderQuerySet) OrderAscByReceiptTime() OrderQuerySet { return qs.w(qs.db.Order("receipt_time ASC")) } +// OrderAscByRevertExpressCompany is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByRevertExpressCompany() OrderQuerySet { + return qs.w(qs.db.Order("revert_express_company ASC")) +} + +// OrderAscByRevertExpressCompanyNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByRevertExpressCompanyNo() OrderQuerySet { + return qs.w(qs.db.Order("revert_express_company_no ASC")) +} + // OrderAscByRevertExpressDuration is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByRevertExpressDuration() OrderQuerySet { return qs.w(qs.db.Order("revert_express_duration ASC")) } +// OrderAscByRevertExpressNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderAscByRevertExpressNo() OrderQuerySet { + return qs.w(qs.db.Order("revert_express_no ASC")) +} + // OrderAscByRevertStoreId is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderAscByRevertStoreId() OrderQuerySet { @@ -2977,12 +3571,30 @@ func (qs OrderQuerySet) OrderDescByDeliveryType() OrderQuerySet { return qs.w(qs.db.Order("delivery_type DESC")) } +// OrderDescByExpressCompany is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByExpressCompany() OrderQuerySet { + return qs.w(qs.db.Order("express_company DESC")) +} + +// OrderDescByExpressCompanyNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByExpressCompanyNo() OrderQuerySet { + return qs.w(qs.db.Order("express_company_no DESC")) +} + // OrderDescByExpressDuration is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByExpressDuration() OrderQuerySet { return qs.w(qs.db.Order("express_duration DESC")) } +// OrderDescByExpressNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByExpressNo() OrderQuerySet { + return qs.w(qs.db.Order("express_no DESC")) +} + // OrderDescByGameCardGoodsId is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByGameCardGoodsId() OrderQuerySet { @@ -2995,12 +3607,36 @@ func (qs OrderQuerySet) OrderDescByGameCardId() OrderQuerySet { return qs.w(qs.db.Order("game_card_id DESC")) } +// OrderDescByGameCardSerialNumber is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByGameCardSerialNumber() OrderQuerySet { + return qs.w(qs.db.Order("game_card_serial_number DESC")) +} + // OrderDescByID is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByID() OrderQuerySet { return qs.w(qs.db.Order("id DESC")) } +// OrderDescByMchid is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByMchid() OrderQuerySet { + return qs.w(qs.db.Order("mchid DESC")) +} + +// OrderDescByOrderSn is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByOrderSn() OrderQuerySet { + return qs.w(qs.db.Order("order_sn DESC")) +} + +// OrderDescByOutTradeNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByOutTradeNo() OrderQuerySet { + return qs.w(qs.db.Order("out_trade_no DESC")) +} + // OrderDescByPayPrice is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByPayPrice() OrderQuerySet { @@ -3019,6 +3655,12 @@ func (qs OrderQuerySet) OrderDescByPayTime() OrderQuerySet { return qs.w(qs.db.Order("pay_time DESC")) } +// OrderDescByPickupCode is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByPickupCode() OrderQuerySet { + return qs.w(qs.db.Order("pickup_code DESC")) +} + // OrderDescByPostage is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByPostage() OrderQuerySet { @@ -3031,12 +3673,30 @@ func (qs OrderQuerySet) OrderDescByReceiptTime() OrderQuerySet { return qs.w(qs.db.Order("receipt_time DESC")) } +// OrderDescByRevertExpressCompany is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByRevertExpressCompany() OrderQuerySet { + return qs.w(qs.db.Order("revert_express_company DESC")) +} + +// OrderDescByRevertExpressCompanyNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByRevertExpressCompanyNo() OrderQuerySet { + return qs.w(qs.db.Order("revert_express_company_no DESC")) +} + // OrderDescByRevertExpressDuration is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByRevertExpressDuration() OrderQuerySet { return qs.w(qs.db.Order("revert_express_duration DESC")) } +// OrderDescByRevertExpressNo is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderDescByRevertExpressNo() OrderQuerySet { + return qs.w(qs.db.Order("revert_express_no DESC")) +} + // OrderDescByRevertStoreId is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderDescByRevertStoreId() OrderQuerySet { @@ -3079,6 +3739,18 @@ func (qs OrderQuerySet) OrderSnEq(orderSn string) OrderQuerySet { return qs.w(qs.db.Where("order_sn = ?", orderSn)) } +// OrderSnGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderSnGt(orderSn string) OrderQuerySet { + return qs.w(qs.db.Where("order_sn > ?", orderSn)) +} + +// OrderSnGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderSnGte(orderSn string) OrderQuerySet { + return qs.w(qs.db.Where("order_sn >= ?", orderSn)) +} + // OrderSnIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderSnIn(orderSn ...string) OrderQuerySet { @@ -3089,6 +3761,24 @@ func (qs OrderQuerySet) OrderSnIn(orderSn ...string) OrderQuerySet { return qs.w(qs.db.Where("order_sn IN (?)", orderSn)) } +// OrderSnLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderSnLike(orderSn string) OrderQuerySet { + return qs.w(qs.db.Where("order_sn LIKE ?", orderSn)) +} + +// OrderSnLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderSnLt(orderSn string) OrderQuerySet { + return qs.w(qs.db.Where("order_sn < ?", orderSn)) +} + +// OrderSnLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderSnLte(orderSn string) OrderQuerySet { + return qs.w(qs.db.Where("order_sn <= ?", orderSn)) +} + // OrderSnNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OrderSnNe(orderSn string) OrderQuerySet { @@ -3105,12 +3795,30 @@ func (qs OrderQuerySet) OrderSnNotIn(orderSn ...string) OrderQuerySet { return qs.w(qs.db.Where("order_sn NOT IN (?)", orderSn)) } +// OrderSnNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OrderSnNotlike(orderSn string) OrderQuerySet { + return qs.w(qs.db.Where("order_sn NOT LIKE ?", orderSn)) +} + // OutTradeNoEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OutTradeNoEq(outTradeNo string) OrderQuerySet { return qs.w(qs.db.Where("out_trade_no = ?", outTradeNo)) } +// OutTradeNoGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OutTradeNoGt(outTradeNo string) OrderQuerySet { + return qs.w(qs.db.Where("out_trade_no > ?", outTradeNo)) +} + +// OutTradeNoGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OutTradeNoGte(outTradeNo string) OrderQuerySet { + return qs.w(qs.db.Where("out_trade_no >= ?", outTradeNo)) +} + // OutTradeNoIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OutTradeNoIn(outTradeNo ...string) OrderQuerySet { @@ -3121,6 +3829,24 @@ func (qs OrderQuerySet) OutTradeNoIn(outTradeNo ...string) OrderQuerySet { return qs.w(qs.db.Where("out_trade_no IN (?)", outTradeNo)) } +// OutTradeNoLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OutTradeNoLike(outTradeNo string) OrderQuerySet { + return qs.w(qs.db.Where("out_trade_no LIKE ?", outTradeNo)) +} + +// OutTradeNoLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OutTradeNoLt(outTradeNo string) OrderQuerySet { + return qs.w(qs.db.Where("out_trade_no < ?", outTradeNo)) +} + +// OutTradeNoLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OutTradeNoLte(outTradeNo string) OrderQuerySet { + return qs.w(qs.db.Where("out_trade_no <= ?", outTradeNo)) +} + // OutTradeNoNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) OutTradeNoNe(outTradeNo string) OrderQuerySet { @@ -3137,6 +3863,12 @@ func (qs OrderQuerySet) OutTradeNoNotIn(outTradeNo ...string) OrderQuerySet { return qs.w(qs.db.Where("out_trade_no NOT IN (?)", outTradeNo)) } +// OutTradeNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) OutTradeNoNotlike(outTradeNo string) OrderQuerySet { + return qs.w(qs.db.Where("out_trade_no NOT LIKE ?", outTradeNo)) +} + // PayPriceEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) PayPriceEq(payPrice uint32) OrderQuerySet { @@ -3291,6 +4023,18 @@ func (qs OrderQuerySet) PickupCodeEq(pickupCode string) OrderQuerySet { return qs.w(qs.db.Where("pickup_code = ?", pickupCode)) } +// PickupCodeGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) PickupCodeGt(pickupCode string) OrderQuerySet { + return qs.w(qs.db.Where("pickup_code > ?", pickupCode)) +} + +// PickupCodeGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) PickupCodeGte(pickupCode string) OrderQuerySet { + return qs.w(qs.db.Where("pickup_code >= ?", pickupCode)) +} + // PickupCodeIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) PickupCodeIn(pickupCode ...string) OrderQuerySet { @@ -3301,6 +4045,24 @@ func (qs OrderQuerySet) PickupCodeIn(pickupCode ...string) OrderQuerySet { return qs.w(qs.db.Where("pickup_code IN (?)", pickupCode)) } +// PickupCodeLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) PickupCodeLike(pickupCode string) OrderQuerySet { + return qs.w(qs.db.Where("pickup_code LIKE ?", pickupCode)) +} + +// PickupCodeLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) PickupCodeLt(pickupCode string) OrderQuerySet { + return qs.w(qs.db.Where("pickup_code < ?", pickupCode)) +} + +// PickupCodeLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) PickupCodeLte(pickupCode string) OrderQuerySet { + return qs.w(qs.db.Where("pickup_code <= ?", pickupCode)) +} + // PickupCodeNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) PickupCodeNe(pickupCode string) OrderQuerySet { @@ -3317,6 +4079,12 @@ func (qs OrderQuerySet) PickupCodeNotIn(pickupCode ...string) OrderQuerySet { return qs.w(qs.db.Where("pickup_code NOT IN (?)", pickupCode)) } +// PickupCodeNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) PickupCodeNotlike(pickupCode string) OrderQuerySet { + return qs.w(qs.db.Where("pickup_code NOT LIKE ?", pickupCode)) +} + // PostageEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) PostageEq(postage uint32) OrderQuerySet { @@ -3415,6 +4183,18 @@ func (qs OrderQuerySet) RevertExpressCompanyEq(revertExpressCompany string) Orde return qs.w(qs.db.Where("revert_express_company = ?", revertExpressCompany)) } +// RevertExpressCompanyGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyGt(revertExpressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company > ?", revertExpressCompany)) +} + +// RevertExpressCompanyGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyGte(revertExpressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company >= ?", revertExpressCompany)) +} + // RevertExpressCompanyIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressCompanyIn(revertExpressCompany ...string) OrderQuerySet { @@ -3425,6 +4205,24 @@ func (qs OrderQuerySet) RevertExpressCompanyIn(revertExpressCompany ...string) O return qs.w(qs.db.Where("revert_express_company IN (?)", revertExpressCompany)) } +// RevertExpressCompanyLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyLike(revertExpressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company LIKE ?", revertExpressCompany)) +} + +// RevertExpressCompanyLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyLt(revertExpressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company < ?", revertExpressCompany)) +} + +// RevertExpressCompanyLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyLte(revertExpressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company <= ?", revertExpressCompany)) +} + // RevertExpressCompanyNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressCompanyNe(revertExpressCompany string) OrderQuerySet { @@ -3437,6 +4235,18 @@ func (qs OrderQuerySet) RevertExpressCompanyNoEq(revertExpressCompanyNo string) return qs.w(qs.db.Where("revert_express_company_no = ?", revertExpressCompanyNo)) } +// RevertExpressCompanyNoGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNoGt(revertExpressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company_no > ?", revertExpressCompanyNo)) +} + +// RevertExpressCompanyNoGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNoGte(revertExpressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company_no >= ?", revertExpressCompanyNo)) +} + // RevertExpressCompanyNoIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressCompanyNoIn(revertExpressCompanyNo ...string) OrderQuerySet { @@ -3447,6 +4257,24 @@ func (qs OrderQuerySet) RevertExpressCompanyNoIn(revertExpressCompanyNo ...strin return qs.w(qs.db.Where("revert_express_company_no IN (?)", revertExpressCompanyNo)) } +// RevertExpressCompanyNoLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNoLike(revertExpressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company_no LIKE ?", revertExpressCompanyNo)) +} + +// RevertExpressCompanyNoLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNoLt(revertExpressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company_no < ?", revertExpressCompanyNo)) +} + +// RevertExpressCompanyNoLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNoLte(revertExpressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company_no <= ?", revertExpressCompanyNo)) +} + // RevertExpressCompanyNoNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressCompanyNoNe(revertExpressCompanyNo string) OrderQuerySet { @@ -3463,6 +4291,12 @@ func (qs OrderQuerySet) RevertExpressCompanyNoNotIn(revertExpressCompanyNo ...st return qs.w(qs.db.Where("revert_express_company_no NOT IN (?)", revertExpressCompanyNo)) } +// RevertExpressCompanyNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNoNotlike(revertExpressCompanyNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company_no NOT LIKE ?", revertExpressCompanyNo)) +} + // RevertExpressCompanyNotIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressCompanyNotIn(revertExpressCompany ...string) OrderQuerySet { @@ -3473,6 +4307,12 @@ func (qs OrderQuerySet) RevertExpressCompanyNotIn(revertExpressCompany ...string return qs.w(qs.db.Where("revert_express_company NOT IN (?)", revertExpressCompany)) } +// RevertExpressCompanyNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressCompanyNotlike(revertExpressCompany string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_company NOT LIKE ?", revertExpressCompany)) +} + // RevertExpressDurationEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressDurationEq(revertExpressDuration uint64) OrderQuerySet { @@ -3535,6 +4375,18 @@ func (qs OrderQuerySet) RevertExpressNoEq(revertExpressNo string) OrderQuerySet return qs.w(qs.db.Where("revert_express_no = ?", revertExpressNo)) } +// RevertExpressNoGt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressNoGt(revertExpressNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_no > ?", revertExpressNo)) +} + +// RevertExpressNoGte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressNoGte(revertExpressNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_no >= ?", revertExpressNo)) +} + // RevertExpressNoIn is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressNoIn(revertExpressNo ...string) OrderQuerySet { @@ -3545,6 +4397,24 @@ func (qs OrderQuerySet) RevertExpressNoIn(revertExpressNo ...string) OrderQueryS return qs.w(qs.db.Where("revert_express_no IN (?)", revertExpressNo)) } +// RevertExpressNoLike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressNoLike(revertExpressNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_no LIKE ?", revertExpressNo)) +} + +// RevertExpressNoLt is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressNoLt(revertExpressNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_no < ?", revertExpressNo)) +} + +// RevertExpressNoLte is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressNoLte(revertExpressNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_no <= ?", revertExpressNo)) +} + // RevertExpressNoNe is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertExpressNoNe(revertExpressNo string) OrderQuerySet { @@ -3561,6 +4431,12 @@ func (qs OrderQuerySet) RevertExpressNoNotIn(revertExpressNo ...string) OrderQue return qs.w(qs.db.Where("revert_express_no NOT IN (?)", revertExpressNo)) } +// RevertExpressNoNotlike is an autogenerated method +// nolint: dupl +func (qs OrderQuerySet) RevertExpressNoNotlike(revertExpressNo string) OrderQuerySet { + return qs.w(qs.db.Where("revert_express_no NOT LIKE ?", revertExpressNo)) +} + // RevertStoreIdEq is an autogenerated method // nolint: dupl func (qs OrderQuerySet) RevertStoreIdEq(revertStoreId uint64) OrderQuerySet { @@ -3941,6 +4817,13 @@ func (u OrderUpdater) SetGameCardId(gameCardId uint64) OrderUpdater { return u } +// SetGameCardSerialNumber is an autogenerated method +// nolint: dupl +func (u OrderUpdater) SetGameCardSerialNumber(gameCardSerialNumber string) OrderUpdater { + u.fields[string(OrderDBSchema.GameCardSerialNumber)] = gameCardSerialNumber + return u +} + // SetID is an autogenerated method // nolint: dupl func (u OrderUpdater) SetID(ID uint32) OrderUpdater { @@ -4116,6 +4999,7 @@ var OrderDBSchema = struct { Uid OrderDBSchemaField GameCardId OrderDBSchemaField GameCardGoodsId OrderDBSchemaField + GameCardSerialNumber OrderDBSchemaField StoreId OrderDBSchemaField UserAddressId OrderDBSchemaField DeliveryType OrderDBSchemaField @@ -4150,6 +5034,7 @@ var OrderDBSchema = struct { Uid: OrderDBSchemaField("uid"), GameCardId: OrderDBSchemaField("game_card_id"), GameCardGoodsId: OrderDBSchemaField("game_card_goods_id"), + GameCardSerialNumber: OrderDBSchemaField("game_card_serial_number"), StoreId: OrderDBSchemaField("store_id"), UserAddressId: OrderDBSchemaField("user_address_id"), DeliveryType: OrderDBSchemaField("delivery_type"), @@ -4188,6 +5073,7 @@ func (o *Order) Update(db *gorm.DB, fields ...OrderDBSchemaField) error { "uid": o.Uid, "game_card_id": o.GameCardId, "game_card_goods_id": o.GameCardGoodsId, + "game_card_serial_number": o.GameCardSerialNumber, "store_id": o.StoreId, "user_address_id": o.UserAddressId, "delivery_type": o.DeliveryType, diff --git a/model/order.go b/model/order.go index 3b5c7ec..62ad263 100644 --- a/model/order.go +++ b/model/order.go @@ -44,7 +44,7 @@ type Order struct { PickupCode string `json:"pickup_code"` // 取货码 CardStatus uint8 `json:"card_status"` // 1-待取货中 2-游玩中 3-归还中 4-已完成 5-已取消 DeliveryTime time.Time `json:"delivery_time"` // 发货时间 - ReceiptTime time.Time `json:"receipt_time"` // 收货时间 + ReceiptTime time.Time `json:"receipt_time"` // 收货时间 签收时间 PayTime time.Time `json:"pay_time"` // 支付时间 PayStatus uint8 `json:"pay_status"` // 支付状态 1-未支付 2-已支付 OrderSn string `json:"order_sn" gorm:"type:varchar(255);not null;COMMENT:'订单编号'"` // 订单编号 diff --git a/model/share_card.go b/model/share_card.go index 306f819..4f507fc 100644 --- a/model/share_card.go +++ b/model/share_card.go @@ -1,6 +1,7 @@ package model import ( + "errors" "fmt" "github.com/codinl/go-logger" "mh-server/lib/utils" @@ -181,6 +182,7 @@ type ShareCardRetrieve struct { AddressId uint32 `json:"address_id" gorm:"index"` // 收货地址 RefundOrderSn string `json:"refund_order_sn" gorm:"index"` // 订单编号退费 PickupCode string `json:"pickup_code"` // 取货码 + ReceiptTime time.Time `json:"receipt_time"` // 签收时间 Store Store `json:"store" gorm:"-"` UserAddress UserAddress `json:"user_address" gorm:"-"` ShareCardRetrieveCards []ShareCardRetrieveCard `json:"share_card_retrieve_cards" gorm:"-"` @@ -240,12 +242,14 @@ type ShareCardRetrieveCard struct { RetrieveGameCardGoodsId uint32 `json:"retrieve_game_card_goods_id" gorm:"index"` // 收回卡id Remark string `json:"remark"` - OriginalCardType string `json:"retrieve_card_type" gorm:"index"` // -公共卡 -用户共享 回收前的卡类型 原卡类型 - AllotUserShareCardId uint32 `json:"allot_user_share_card_id"` // 分配用户共享卡id + OriginalCardType string `json:"retrieve_card_type" gorm:"index"` // -公共卡 -用户共享 回收前的卡类型 原卡类型 + AllotUserShareCardId uint32 `json:"allot_user_share_card_id"` // 分配用户共享卡id + ReceiptTime time.Time `json:"receipt_time"` // 签收时间 GameCard GameCard `json:"game_card" gorm:"-"` Store Store `json:"store" gorm:"-"` ShareCardRetrieve ShareCardRetrieve `json:"share_card_retrieve" gorm:"-"` + //TotalVm uint32 `json:"total_vm"` // 累计积分 //ShareCardBillGameId uint32 `json:"share_card_bill_game_id" gorm:"index"` // share_card_retrieve_card @@ -663,7 +667,12 @@ func (m *ShareCardRetrieveCreateReq) RetrieveCreate() (*ShareCardRetrieve, error //for i, _ := range userShareCards { // gameIds = append(gameIds, uint64(userShareCards[i].GameCardId)) //} - + for i, _ := range userShareCards { + if userShareCards[i].CreatedAt.AddDate(0, 6, 0).After(time.Now()) { + logger.Error("user share before 6 month") + return nil, errors.New("before_6_month") + } + } //var gameCardGoodsStocks []GameCardGoodsStock //err = NewGameCardGoodsStockQuerySet(DB).StoreIdEq(uint64(m.StoreId)).GameCardIdIn(gameIds...).All(&gameCardGoodsStocks) //if err != nil { diff --git a/router/router_app.go b/router/router_app.go index c38969b..676e626 100644 --- a/router/router_app.go +++ b/router/router_app.go @@ -203,10 +203,11 @@ func ConfigAppRouter(r gin.IRouter) { shareCard.POST("retrieve_card/detail", controller.ShareCardRetrieveDetail) // 我的共享卡收回详情 shareCard.POST("retrieve_card/confirm", controller.ShareCardRetrieveConfirm) // 我的共享卡收回确认 - shareCard.POST("card_issue/add", controller.CardIssueCreate) // 我的共享卡问题反馈 - shareCard.POST("card_issue/cancel", controller.CardIssueCancel) // 我的共享卡问题反馈 - shareCard.POST("card_issue/list", controller.CardIssueList) // 我的共享卡问题反馈列表 - shareCard.POST("card_issue/info", controller.CardIssueInfo) // 我的共享卡问题反馈详情 + shareCard.POST("card_issue/add", controller.CardIssueCreate) // 我的共享卡问题反馈 + shareCard.POST("card_issue/cancel", controller.CardIssueCancel) // 我的共享卡问题反馈 + shareCard.POST("card_issue/list", controller.CardIssueList) // 我的共享卡问题反馈列表 + shareCard.POST("card_issue/info", controller.CardIssueInfo) // 我的共享卡问题反馈详情 + shareCard.POST("card_issue/deliver", controller.CardIssueDeliver) // 我的共享卡问题反馈详情 //shoppingCart.POST("del", controller.ShoppingCartDel) //