From 3bc349cf5ffa096a70e2c69c6419186f2ee13a12 Mon Sep 17 00:00:00 2001 From: li Date: Thu, 21 Apr 2022 17:03:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/game_card.go | 5 + controller/mall.go | 11 +- controller/order.go | 14 +- controller/user.go | 6 +- controller/user_share_card.go | 2 +- lib/status/status.go | 2 +- lib/wxpay/wx_pay.go | 4 +- model/autogenerated_share_card.go | 350 ++++++++++++++++++++++++++++++ model/history_browsing.go | 4 +- model/share_card.go | 5 +- router/router_app.go | 10 +- 11 files changed, 384 insertions(+), 29 deletions(-) diff --git a/controller/game_card.go b/controller/game_card.go index c8a4464..8354a58 100644 --- a/controller/game_card.go +++ b/controller/game_card.go @@ -598,6 +598,11 @@ func PushWXPayNotice(c *gin.Context) { if err != nil { logger.Error("update pay state err:", err) } + _, err = model.NewShareCardRetrieveCardQuerySet(model.DB).ShareCardRetrieveIdEq(record.OrderId).GetUpdater(). + SetPayState(2).UpdateNum() + if err != nil { + logger.Error("update pay state err:", err) + } } logger.Debug("微信推动支付通知") diff --git a/controller/mall.go b/controller/mall.go index 27a6256..bbfd80e 100644 --- a/controller/mall.go +++ b/controller/mall.go @@ -133,8 +133,8 @@ func MallOrderCreate(c *gin.Context) { DeliveryStatus: model.DeliveryStatusUnDeliver, } - // TODO 减少库存 - // TODO 确认下是在支付后减少，还是下单后？ + // 减少库存 + // 确认下是在支付后减少，还是下单后 if req.PayType == model.PayTypeVm { var userVm model.UserVm err = model.NewUserVmQuerySet(model.DB).UidEq(uc.Uid).One(&userVm) @@ -302,10 +302,9 @@ func MallOrderPay(c *gin.Context) { tx := model.TransactionBegin() - // TODO 减少库存 - // TODO 确认下是在支付后减少，还是下单后？ - - // TODO 减少用户积分 + // 减少库存 + // 确认下是在支付后减少，还是下单后？ + // 减少用户积分 // 更新支付状态 err = model.NewGoodsOrderQuerySet(tx). diff --git a/controller/order.go b/controller/order.go index 3617400..273adeb 100644 --- a/controller/order.go +++ b/controller/order.go @@ -71,7 +71,7 @@ func RentCardOrderList(c *gin.Context) { } req.Uid = uc.Uid - orderCardList, totalPage, err := req.GetOrderCardList() // TODO + orderCardList, totalPage, err := req.GetOrderCardList() if err != nil { logger.Error("err:", err) RespJson(c, status.InternalServerError, nil) @@ -263,7 +263,7 @@ func RentCardOrderCreate(c *gin.Context) { defer orderCreateLocker.Unlock() isRentCount, err := rentCard.IsHaveUnreturnedOrders(cardCount) - //unreturnedOrders, err := model.IsHaveUnreturnedOrders(uc.Uid) // TODO + //unreturnedOrders, err := model.IsHaveUnreturnedOrders(uc.Uid) // if err != nil { logger.Error("err:", err) RespJson(c, status.InternalServerError, nil) @@ -292,7 +292,7 @@ func RentCardOrderCreate(c *gin.Context) { reqJson, _ := json.Marshal(&req) fmt.Println("reqJson:", string(reqJson)) - // TODO 邮费 + // 邮费 orderSn := model.GetOrderSn() order := model.Order{ @@ -302,7 +302,7 @@ func RentCardOrderCreate(c *gin.Context) { UserAddressId: uint64(req.UserAddressId), DeliveryType: req.DeliveryType, Count: 1, - PickupCode: model.GetPickupCode(), // TODO 取货码 + PickupCode: model.GetPickupCode(), // 取货码 CardStatus: model.OrderCardStatusUnPick, PayStatus: model.PayStatusUnPay, PayTime: time.Now(), @@ -311,7 +311,7 @@ func RentCardOrderCreate(c *gin.Context) { Postage: req.ExpressFee, } - //TODO 以支付成功作为订单下单成功的依据，不是订单创建 已修改 + // 以支付成功作为订单下单成功的依据，不是订单创建 已修改 //var gameCardGoodsStock model.GameCardGoodsStock //err = model.NewGameCardGoodsStockQuerySet(model.DB).StoreIdEq(req.StoreId).GameCardIdEq(req.GameCardId).One(&gameCardGoodsStock) //if err != nil { @@ -415,7 +415,7 @@ func RentCardOrderCreate(c *gin.Context) { // RespJson(c, status.InternalServerError, nil) // return //} - // TODO 订单回调成功减库存 + // 订单回调成功减库存 //err = model.GameCardGoodsInventoryReduction(req.GameCardList, req.StoreId, begin) //if err != nil { // begin.Rollback() @@ -705,7 +705,7 @@ func OrderAmount(c *gin.Context) { // //user := model.GetUserByUid(uc.Uid) // // var order model.Order -// //TODO 支付金额 地址id +// // 支付金额 地址id // err := model.NewOrderQuerySet(model.DB).OrderSnEq(req.OrderSn).One(&order) // if err != nil { // logger.Error(err) diff --git a/controller/user.go b/controller/user.go index 219fa83..de87e77 100644 --- a/controller/user.go +++ b/controller/user.go @@ -235,10 +235,10 @@ func OpenMember(c *gin.Context) { } //totalFee := uint32(MemberFee + DepositFee) - ////totalFee = uint32(3) // TODO 测试 + ////totalFee = uint32(3) // TODO 测试 上线修改 //if user.Deposit == 300 { // totalFee = MemberFee - // // //totalFee = uint32(1) // TODO 测试 + // // //totalFee = uint32(1) // TODO 测试 上线修改 //} fmt.Println("configInfo.MemberFee : configInfo.DepositFee", memberConfig.MemberFee, memberConfig.MemberDeposit) @@ -533,7 +533,7 @@ func PayDeposit(c *gin.Context) { RespJson(c, status.InternalServerError, nil) return } - //totalFee = 1 // TODO 测试 + //totalFee = 1 // 测试 webPay, err := wxpay.WebPay(orderSn, totalFee, user.WxOpenID, "N", wxpay.WxPayDeposit) if err != nil { diff --git a/controller/user_share_card.go b/controller/user_share_card.go index 656015b..c888f4f 100644 --- a/controller/user_share_card.go +++ b/controller/user_share_card.go @@ -372,7 +372,7 @@ func ShareCardRetrieveCreate(c *gin.Context) { count, err := model.NewShareCardRetrieveCardQuerySet(model.DB).SerialNumberIn(req.SerialNumbers...). //StateIn(model.RetrieveStateInCheck).Count() - StateNotIn(model.RetrieveStateCheckLose, model.RetrieveStateCancel).Count() + PayStateEq(2).StateNotIn(model.RetrieveStateCheckLose, model.RetrieveStateCancel).Count() if err != nil { logger.Error("share card retrieve card err:", err) RespJson(c, status.InternalServerError, nil) diff --git a/lib/status/status.go b/lib/status/status.go index 211cd10..6cb6851 100644 --- a/lib/status/status.go +++ b/lib/status/status.go @@ -94,7 +94,7 @@ const ( OrderOutRentCount = 500509 // 会员超过可借卡数 OrderStatusNotReturning = 500510 // 订单已完成 ShareCardBillStateCancelError = 500511 // 共享单状态不能取消 - ShareCardRetrieveExistAppliedCard = 500513 // 共享单状态不能取消 + ShareCardRetrieveExistAppliedCard = 500513 // 存在重复申请收回的卡 IssueFeedbackReceiptTimeOver48Hour = 500514 // 问题反馈 超过 48小时 CardRetrieveBefore6Month = 500515 // 用户收回卡需要半年后 IssueFeedbackRepetition = 500516 // 问题反馈已存在,不能重复反馈 diff --git a/lib/wxpay/wx_pay.go b/lib/wxpay/wx_pay.go index ec2fe0d..9d5d0a5 100644 --- a/lib/wxpay/wx_pay.go +++ b/lib/wxpay/wx_pay.go @@ -42,8 +42,8 @@ const ( WxPayMemberExpireDelay = "member_expire_delay" // 会员过期滞纳金 WxPayShareCardRetrieve = "share_card_retrieve" // 会员过期滞纳金 - //NotifyUrl = "https://switch.deovo.com:8001/api/v1/wxpay/notice" // TODO 数据库配置 生产 - //NotifyUrl = "https://dev.switch.deovo.com:8004/api/v1/wxpay/notice" // TODO 测试 + //NotifyUrl = "https://switch.deovo.com:8001/api/v1/wxpay/notice" // 数据库配置 生产 + //NotifyUrl = "https://dev.switch.deovo.com:8004/api/v1/wxpay/notice" // 测试 wxPayOrderRefundsUrl = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds" ) diff --git a/model/autogenerated_share_card.go b/model/autogenerated_share_card.go index 0e89afb..fa93ccb 100644 --- a/model/autogenerated_share_card.go +++ b/model/autogenerated_share_card.go @@ -1313,6 +1313,12 @@ func (qs CardIssueFeedbackQuerySet) OrderAscByStoreId() CardIssueFeedbackQuerySe return qs.w(qs.db.Order("store_id ASC")) } +// OrderAscByTransportType is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) OrderAscByTransportType() CardIssueFeedbackQuerySet { + return qs.w(qs.db.Order("transport_type ASC")) +} + // OrderAscByUid is an autogenerated method // nolint: dupl func (qs CardIssueFeedbackQuerySet) OrderAscByUid() CardIssueFeedbackQuerySet { @@ -1325,6 +1331,12 @@ func (qs CardIssueFeedbackQuerySet) OrderAscByUpdatedAt() CardIssueFeedbackQuery return qs.w(qs.db.Order("updated_at ASC")) } +// OrderAscByUserAddressId is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) OrderAscByUserAddressId() CardIssueFeedbackQuerySet { + return qs.w(qs.db.Order("user_address_id ASC")) +} + // OrderDescByCheckSysUid is an autogenerated method // nolint: dupl func (qs CardIssueFeedbackQuerySet) OrderDescByCheckSysUid() CardIssueFeedbackQuerySet { @@ -1487,6 +1499,12 @@ func (qs CardIssueFeedbackQuerySet) OrderDescByStoreId() CardIssueFeedbackQueryS return qs.w(qs.db.Order("store_id DESC")) } +// OrderDescByTransportType is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) OrderDescByTransportType() CardIssueFeedbackQuerySet { + return qs.w(qs.db.Order("transport_type DESC")) +} + // OrderDescByUid is an autogenerated method // nolint: dupl func (qs CardIssueFeedbackQuerySet) OrderDescByUid() CardIssueFeedbackQuerySet { @@ -1499,6 +1517,12 @@ func (qs CardIssueFeedbackQuerySet) OrderDescByUpdatedAt() CardIssueFeedbackQuer return qs.w(qs.db.Order("updated_at DESC")) } +// OrderDescByUserAddressId is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) OrderDescByUserAddressId() CardIssueFeedbackQuerySet { + return qs.w(qs.db.Order("user_address_id DESC")) +} + // ProblemEq is an autogenerated method // nolint: dupl func (qs CardIssueFeedbackQuerySet) ProblemEq(problem string) CardIssueFeedbackQuerySet { @@ -2043,6 +2067,62 @@ func (qs CardIssueFeedbackQuerySet) StoreIdNotIn(storeId ...uint32) CardIssueFee return qs.w(qs.db.Where("store_id NOT IN (?)", storeId)) } +// TransportTypeEq is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeEq(transportType uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("transport_type = ?", transportType)) +} + +// TransportTypeGt is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeGt(transportType uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("transport_type > ?", transportType)) +} + +// TransportTypeGte is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeGte(transportType uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("transport_type >= ?", transportType)) +} + +// TransportTypeIn is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeIn(transportType ...uint32) CardIssueFeedbackQuerySet { + if len(transportType) == 0 { + qs.db.AddError(errors.New("must at least pass one transportType in TransportTypeIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("transport_type IN (?)", transportType)) +} + +// TransportTypeLt is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeLt(transportType uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("transport_type < ?", transportType)) +} + +// TransportTypeLte is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeLte(transportType uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("transport_type <= ?", transportType)) +} + +// TransportTypeNe is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeNe(transportType uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("transport_type != ?", transportType)) +} + +// TransportTypeNotIn is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) TransportTypeNotIn(transportType ...uint32) CardIssueFeedbackQuerySet { + if len(transportType) == 0 { + qs.db.AddError(errors.New("must at least pass one transportType in TransportTypeNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("transport_type NOT IN (?)", transportType)) +} + // UidEq is an autogenerated method // nolint: dupl func (qs CardIssueFeedbackQuerySet) UidEq(uid uint32) CardIssueFeedbackQuerySet { @@ -2135,6 +2215,62 @@ func (qs CardIssueFeedbackQuerySet) UpdatedAtNe(updatedAt time.Time) CardIssueFe return qs.w(qs.db.Where("updated_at != ?", updatedAt)) } +// UserAddressIdEq is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdEq(userAddressId uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("user_address_id = ?", userAddressId)) +} + +// UserAddressIdGt is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdGt(userAddressId uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("user_address_id > ?", userAddressId)) +} + +// UserAddressIdGte is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdGte(userAddressId uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("user_address_id >= ?", userAddressId)) +} + +// UserAddressIdIn is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdIn(userAddressId ...uint32) CardIssueFeedbackQuerySet { + if len(userAddressId) == 0 { + qs.db.AddError(errors.New("must at least pass one userAddressId in UserAddressIdIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("user_address_id IN (?)", userAddressId)) +} + +// UserAddressIdLt is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdLt(userAddressId uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("user_address_id < ?", userAddressId)) +} + +// UserAddressIdLte is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdLte(userAddressId uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("user_address_id <= ?", userAddressId)) +} + +// UserAddressIdNe is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdNe(userAddressId uint32) CardIssueFeedbackQuerySet { + return qs.w(qs.db.Where("user_address_id != ?", userAddressId)) +} + +// UserAddressIdNotIn is an autogenerated method +// nolint: dupl +func (qs CardIssueFeedbackQuerySet) UserAddressIdNotIn(userAddressId ...uint32) CardIssueFeedbackQuerySet { + if len(userAddressId) == 0 { + qs.db.AddError(errors.New("must at least pass one userAddressId in UserAddressIdNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("user_address_id NOT IN (?)", userAddressId)) +} + // SetCheckSysUid is an autogenerated method // nolint: dupl func (u CardIssueFeedbackUpdater) SetCheckSysUid(checkSysUid string) CardIssueFeedbackUpdater { @@ -2324,6 +2460,13 @@ func (u CardIssueFeedbackUpdater) SetStoreId(storeId uint32) CardIssueFeedbackUp return u } +// SetTransportType is an autogenerated method +// nolint: dupl +func (u CardIssueFeedbackUpdater) SetTransportType(transportType uint32) CardIssueFeedbackUpdater { + u.fields[string(CardIssueFeedbackDBSchema.TransportType)] = transportType + return u +} + // SetUid is an autogenerated method // nolint: dupl func (u CardIssueFeedbackUpdater) SetUid(uid uint32) CardIssueFeedbackUpdater { @@ -2338,6 +2481,13 @@ func (u CardIssueFeedbackUpdater) SetUpdatedAt(updatedAt time.Time) CardIssueFee return u } +// SetUserAddressId is an autogenerated method +// nolint: dupl +func (u CardIssueFeedbackUpdater) SetUserAddressId(userAddressId uint32) CardIssueFeedbackUpdater { + u.fields[string(CardIssueFeedbackDBSchema.UserAddressId)] = userAddressId + return u +} + // Update is an autogenerated method // nolint: dupl func (u CardIssueFeedbackUpdater) Update() error { @@ -2395,6 +2545,8 @@ var CardIssueFeedbackDBSchema = struct { CheckTime CardIssueFeedbackDBSchemaField CheckSysUid CardIssueFeedbackDBSchemaField ReceiptTime CardIssueFeedbackDBSchemaField + TransportType CardIssueFeedbackDBSchemaField + UserAddressId CardIssueFeedbackDBSchemaField }{ ID: CardIssueFeedbackDBSchemaField("id"), @@ -2426,6 +2578,8 @@ var CardIssueFeedbackDBSchema = struct { CheckTime: CardIssueFeedbackDBSchemaField("check_time"), CheckSysUid: CardIssueFeedbackDBSchemaField("check_sys_uid"), ReceiptTime: CardIssueFeedbackDBSchemaField("receipt_time"), + TransportType: CardIssueFeedbackDBSchemaField("transport_type"), + UserAddressId: CardIssueFeedbackDBSchemaField("user_address_id"), } // Update updates CardIssueFeedback fields by primary key @@ -2461,6 +2615,8 @@ func (o *CardIssueFeedback) Update(db *gorm.DB, fields ...CardIssueFeedbackDBSch "check_time": o.CheckTime, "check_sys_uid": o.CheckSysUid, "receipt_time": o.ReceiptTime, + "transport_type": o.TransportType, + "user_address_id": o.UserAddressId, } u := map[string]interface{}{} for _, f := range fields { @@ -5789,6 +5945,18 @@ func (qs ShareCardRetrieveCardQuerySet) OrderAscByOriginalCardType() ShareCardRe return qs.w(qs.db.Order("original_card_type ASC")) } +// OrderAscByPayState is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) OrderAscByPayState() ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Order("pay_state ASC")) +} + +// OrderAscByReceiptTime is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) OrderAscByReceiptTime() ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Order("receipt_time ASC")) +} + // OrderAscByRemark is an autogenerated method // nolint: dupl func (qs ShareCardRetrieveCardQuerySet) OrderAscByRemark() ShareCardRetrieveCardQuerySet { @@ -5909,6 +6077,18 @@ func (qs ShareCardRetrieveCardQuerySet) OrderDescByOriginalCardType() ShareCardR return qs.w(qs.db.Order("original_card_type DESC")) } +// OrderDescByPayState is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) OrderDescByPayState() ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Order("pay_state DESC")) +} + +// OrderDescByReceiptTime is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) OrderDescByReceiptTime() ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Order("receipt_time DESC")) +} + // OrderDescByRemark is an autogenerated method // nolint: dupl func (qs ShareCardRetrieveCardQuerySet) OrderDescByRemark() ShareCardRetrieveCardQuerySet { @@ -6049,6 +6229,98 @@ func (qs ShareCardRetrieveCardQuerySet) OriginalCardTypeNotlike(originalCardType return qs.w(qs.db.Where("original_card_type NOT LIKE ?", originalCardType)) } +// PayStateEq is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateEq(payState uint32) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("pay_state = ?", payState)) +} + +// PayStateGt is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateGt(payState uint32) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("pay_state > ?", payState)) +} + +// PayStateGte is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateGte(payState uint32) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("pay_state >= ?", payState)) +} + +// PayStateIn is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateIn(payState ...uint32) ShareCardRetrieveCardQuerySet { + if len(payState) == 0 { + qs.db.AddError(errors.New("must at least pass one payState in PayStateIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("pay_state IN (?)", payState)) +} + +// PayStateLt is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateLt(payState uint32) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("pay_state < ?", payState)) +} + +// PayStateLte is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateLte(payState uint32) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("pay_state <= ?", payState)) +} + +// PayStateNe is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateNe(payState uint32) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("pay_state != ?", payState)) +} + +// PayStateNotIn is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) PayStateNotIn(payState ...uint32) ShareCardRetrieveCardQuerySet { + if len(payState) == 0 { + qs.db.AddError(errors.New("must at least pass one payState in PayStateNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("pay_state NOT IN (?)", payState)) +} + +// ReceiptTimeEq is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) ReceiptTimeEq(receiptTime time.Time) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("receipt_time = ?", receiptTime)) +} + +// ReceiptTimeGt is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) ReceiptTimeGt(receiptTime time.Time) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("receipt_time > ?", receiptTime)) +} + +// ReceiptTimeGte is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) ReceiptTimeGte(receiptTime time.Time) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("receipt_time >= ?", receiptTime)) +} + +// ReceiptTimeLt is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) ReceiptTimeLt(receiptTime time.Time) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("receipt_time < ?", receiptTime)) +} + +// ReceiptTimeLte is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) ReceiptTimeLte(receiptTime time.Time) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("receipt_time <= ?", receiptTime)) +} + +// ReceiptTimeNe is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveCardQuerySet) ReceiptTimeNe(receiptTime time.Time) ShareCardRetrieveCardQuerySet { + return qs.w(qs.db.Where("receipt_time != ?", receiptTime)) +} + // RemarkEq is an autogenerated method // nolint: dupl func (qs ShareCardRetrieveCardQuerySet) RemarkEq(remark string) ShareCardRetrieveCardQuerySet { @@ -6805,6 +7077,20 @@ func (u ShareCardRetrieveCardUpdater) SetOriginalCardType(originalCardType strin return u } +// SetPayState is an autogenerated method +// nolint: dupl +func (u ShareCardRetrieveCardUpdater) SetPayState(payState uint32) ShareCardRetrieveCardUpdater { + u.fields[string(ShareCardRetrieveCardDBSchema.PayState)] = payState + return u +} + +// SetReceiptTime is an autogenerated method +// nolint: dupl +func (u ShareCardRetrieveCardUpdater) SetReceiptTime(receiptTime time.Time) ShareCardRetrieveCardUpdater { + u.fields[string(ShareCardRetrieveCardDBSchema.ReceiptTime)] = receiptTime + return u +} + // SetRemark is an autogenerated method // nolint: dupl func (u ShareCardRetrieveCardUpdater) SetRemark(remark string) ShareCardRetrieveCardUpdater { @@ -6937,6 +7223,8 @@ var ShareCardRetrieveCardDBSchema = struct { Remark ShareCardRetrieveCardDBSchemaField OriginalCardType ShareCardRetrieveCardDBSchemaField AllotUserShareCardId ShareCardRetrieveCardDBSchemaField + ReceiptTime ShareCardRetrieveCardDBSchemaField + PayState ShareCardRetrieveCardDBSchemaField }{ ID: ShareCardRetrieveCardDBSchemaField("id"), @@ -6959,6 +7247,8 @@ var ShareCardRetrieveCardDBSchema = struct { Remark: ShareCardRetrieveCardDBSchemaField("remark"), OriginalCardType: ShareCardRetrieveCardDBSchemaField("original_card_type"), AllotUserShareCardId: ShareCardRetrieveCardDBSchemaField("allot_user_share_card_id"), + ReceiptTime: ShareCardRetrieveCardDBSchemaField("receipt_time"), + PayState: ShareCardRetrieveCardDBSchemaField("pay_state"), } // Update updates ShareCardRetrieveCard fields by primary key @@ -6985,6 +7275,8 @@ func (o *ShareCardRetrieveCard) Update(db *gorm.DB, fields ...ShareCardRetrieveC "remark": o.Remark, "original_card_type": o.OriginalCardType, "allot_user_share_card_id": o.AllotUserShareCardId, + "receipt_time": o.ReceiptTime, + "pay_state": o.PayState, } u := map[string]interface{}{} for _, f := range fields { @@ -7589,6 +7881,12 @@ func (qs ShareCardRetrieveQuerySet) OrderAscByPickupCode() ShareCardRetrieveQuer return qs.w(qs.db.Order("pickup_code ASC")) } +// OrderAscByReceiptTime is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) OrderAscByReceiptTime() ShareCardRetrieveQuerySet { + return qs.w(qs.db.Order("receipt_time ASC")) +} + // OrderAscByRefundOrderSn is an autogenerated method // nolint: dupl func (qs ShareCardRetrieveQuerySet) OrderAscByRefundOrderSn() ShareCardRetrieveQuerySet { @@ -7709,6 +8007,12 @@ func (qs ShareCardRetrieveQuerySet) OrderDescByPickupCode() ShareCardRetrieveQue return qs.w(qs.db.Order("pickup_code DESC")) } +// OrderDescByReceiptTime is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) OrderDescByReceiptTime() ShareCardRetrieveQuerySet { + return qs.w(qs.db.Order("receipt_time DESC")) +} + // OrderDescByRefundOrderSn is an autogenerated method // nolint: dupl func (qs ShareCardRetrieveQuerySet) OrderDescByRefundOrderSn() ShareCardRetrieveQuerySet { @@ -8011,6 +8315,42 @@ func (qs ShareCardRetrieveQuerySet) PickupCodeNotlike(pickupCode string) ShareCa return qs.w(qs.db.Where("pickup_code NOT LIKE ?", pickupCode)) } +// ReceiptTimeEq is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) ReceiptTimeEq(receiptTime time.Time) ShareCardRetrieveQuerySet { + return qs.w(qs.db.Where("receipt_time = ?", receiptTime)) +} + +// ReceiptTimeGt is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) ReceiptTimeGt(receiptTime time.Time) ShareCardRetrieveQuerySet { + return qs.w(qs.db.Where("receipt_time > ?", receiptTime)) +} + +// ReceiptTimeGte is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) ReceiptTimeGte(receiptTime time.Time) ShareCardRetrieveQuerySet { + return qs.w(qs.db.Where("receipt_time >= ?", receiptTime)) +} + +// ReceiptTimeLt is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) ReceiptTimeLt(receiptTime time.Time) ShareCardRetrieveQuerySet { + return qs.w(qs.db.Where("receipt_time < ?", receiptTime)) +} + +// ReceiptTimeLte is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) ReceiptTimeLte(receiptTime time.Time) ShareCardRetrieveQuerySet { + return qs.w(qs.db.Where("receipt_time <= ?", receiptTime)) +} + +// ReceiptTimeNe is an autogenerated method +// nolint: dupl +func (qs ShareCardRetrieveQuerySet) ReceiptTimeNe(receiptTime time.Time) ShareCardRetrieveQuerySet { + return qs.w(qs.db.Where("receipt_time != ?", receiptTime)) +} + // RefundOrderSnEq is an autogenerated method // nolint: dupl func (qs ShareCardRetrieveQuerySet) RefundOrderSnEq(refundOrderSn string) ShareCardRetrieveQuerySet { @@ -8568,6 +8908,13 @@ func (u ShareCardRetrieveUpdater) SetPickupCode(pickupCode string) ShareCardRetr return u } +// SetReceiptTime is an autogenerated method +// nolint: dupl +func (u ShareCardRetrieveUpdater) SetReceiptTime(receiptTime time.Time) ShareCardRetrieveUpdater { + u.fields[string(ShareCardRetrieveDBSchema.ReceiptTime)] = receiptTime + return u +} + // SetRefundOrderSn is an autogenerated method // nolint: dupl func (u ShareCardRetrieveUpdater) SetRefundOrderSn(refundOrderSn string) ShareCardRetrieveUpdater { @@ -8679,6 +9026,7 @@ var ShareCardRetrieveDBSchema = struct { AddressId ShareCardRetrieveDBSchemaField RefundOrderSn ShareCardRetrieveDBSchemaField PickupCode ShareCardRetrieveDBSchemaField + ReceiptTime ShareCardRetrieveDBSchemaField }{ ID: ShareCardRetrieveDBSchemaField("id"), @@ -8701,6 +9049,7 @@ var ShareCardRetrieveDBSchema = struct { AddressId: ShareCardRetrieveDBSchemaField("address_id"), RefundOrderSn: ShareCardRetrieveDBSchemaField("refund_order_sn"), PickupCode: ShareCardRetrieveDBSchemaField("pickup_code"), + ReceiptTime: ShareCardRetrieveDBSchemaField("receipt_time"), } // Update updates ShareCardRetrieve fields by primary key @@ -8727,6 +9076,7 @@ func (o *ShareCardRetrieve) Update(db *gorm.DB, fields ...ShareCardRetrieveDBSch "address_id": o.AddressId, "refund_order_sn": o.RefundOrderSn, "pickup_code": o.PickupCode, + "receipt_time": o.ReceiptTime, } u := map[string]interface{}{} for _, f := range fields { diff --git a/model/history_browsing.go b/model/history_browsing.go index 0e90c9d..4c5c5a0 100644 --- a/model/history_browsing.go +++ b/model/history_browsing.go @@ -29,7 +29,7 @@ func GetHistoryBrowsingList(uid uint32, page, pageSize int) ([]GameCard, uint32, page = 0 } - // TODO 查看商品添加浏览记录 + // 查看商品添加浏览记录 querySet := NewHistoryBrowsingQuerySet(DB).UidEq(uint64(uid)) count, err := querySet.Count() @@ -92,7 +92,7 @@ func HistoryBrowsingAdd(uid uint64, gameCardId uint64) error { } } - sql := fmt.Sprintf("UPDATE game_card SET view_count = view_count+1 WHERE id = %d",gameCardId) + sql := fmt.Sprintf("UPDATE game_card SET view_count = view_count+1 WHERE id = %d", gameCardId) err = DB.Exec(sql).Error if err != nil { logger.Error("err:", err) diff --git a/model/share_card.go b/model/share_card.go index d6a6762..1dd39cc 100644 --- a/model/share_card.go +++ b/model/share_card.go @@ -245,6 +245,7 @@ type ShareCardRetrieveCard struct { OriginalCardType string `json:"retrieve_card_type" gorm:"index"` // -公共卡 -用户共享 回收前的卡类型 原卡类型 AllotUserShareCardId uint32 `json:"allot_user_share_card_id"` // 分配用户共享卡id ReceiptTime time.Time `json:"receipt_time"` // 签收时间 + PayState uint32 `json:"pay_state"` // 1-未支付 2-已支付 GameCard GameCard `json:"game_card" gorm:"-"` Store Store `json:"store" gorm:"-"` @@ -654,7 +655,7 @@ func GetUserShareCardDateVmInfo(uid uint32) (ShareCardDateVm, error) { type ShareCardRetrieveCreateReq struct { SerialNumbers []string `json:"serial_numbers"` StoreId uint32 `json:"store_id"` // 门店id - RetrieveCardType uint32 `json:"retrieve_card_type"` // 1-送到门店 2-邮寄 TODO 修改 + RetrieveCardType uint32 `json:"retrieve_card_type"` // 1-送到门店 2-邮寄 修改 AddressId uint32 `json:"address_id"` // 收货地址 Amount uint32 `json:"amount"` // 金额 Uid uint32 `json:"uid"` @@ -671,7 +672,7 @@ func (m *ShareCardRetrieveCreateReq) RetrieveCreate() (*ShareCardRetrieve, error //for i, _ := range userShareCards { // gameIds = append(gameIds, uint64(userShareCards[i].GameCardId)) //} - // TODO 共享卡半年收回 + //// TODO 共享卡半年收回 测试上线修改 for i, _ := range userShareCards { if userShareCards[i].CreatedAt.AddDate(0, 6, 0).After(time.Now()) { logger.Error("user share before 6 month") diff --git a/router/router_app.go b/router/router_app.go index 98e4613..bacbb88 100644 --- a/router/router_app.go +++ b/router/router_app.go @@ -69,7 +69,7 @@ func ConfigAppRouter(r gin.IRouter) { user := api.Group("user") { - user.Use(auth.UserAccessAuth) // TODO + user.Use(auth.UserAccessAuth) // user.POST("data", controller.UserData) // 用户数据 user.POST("user_info/upload", controller.UserInfoUpload) // 上传用户信息 user.POST("user_info/tel", controller.UserTel) // 获取用户手机号 @@ -101,7 +101,7 @@ func ConfigAppRouter(r gin.IRouter) { { address.POST("detail", controller.UserAddressDetail) // 地址详情 - address.Use(auth.UserAccessAuth) // TODO + address.Use(auth.UserAccessAuth) // address.POST("add", controller.UserAddressAdd) // 新增地址 address.POST("update", controller.UserAddressUpdate) // 更新地址 @@ -112,7 +112,7 @@ func ConfigAppRouter(r gin.IRouter) { my := api.Group("user/my") { - my.Use(auth.UserAccessAuth) // TODO + my.Use(auth.UserAccessAuth) // my.POST("history_browsing", controller.HistoryBrowsingList) // 浏览记录 my.POST("history_browsing/del", controller.HistoryBrowsingDel) // 浏览记录删除 @@ -121,7 +121,7 @@ func ConfigAppRouter(r gin.IRouter) { my.POST("collection/cancel", controller.CollectionCancel) // 收藏删除 } - // TODO 订单 + // 订单 order := api.Group("order") { order.POST("amount", controller.OrderAmount) // 订单金额 @@ -130,7 +130,7 @@ func ConfigAppRouter(r gin.IRouter) { order.POST("express_company/list", controller.ExpressCompanyList) // 物流公司列表 order.POST("order/wx_pay/success", controller.WXPaySuccess) // 微信支付成功 order.POST("cancel", controller.OrderCancel) // 取消租卡 - order.Use(auth.UserAccessAuth) // TODO + order.Use(auth.UserAccessAuth) // order.POST("create", controller.RentCardOrderCreate) // 创建租卡 order.POST("pay", controller.OrderPay) // 租卡订单支付 order.POST("list", controller.RentCardOrderList) // 租卡订单列表