diff --git a/controller/game_card.go b/controller/game_card.go index e436109..98f2a3a 100644 --- a/controller/game_card.go +++ b/controller/game_card.go @@ -91,7 +91,10 @@ func GameCardInfo(c *gin.Context) { RespJson(c, status.InternalServerError, nil) return } - + user := model.GetUserByUid(uc.Uid) + if user.IsMember() { + info.RealPrice = 0 + } userCollection := model.GameCardUserCollection(uint64(uc.Uid), req.GameId) ret := map[string]interface{}{ @@ -320,7 +323,6 @@ func PushWXPayNotice(c *gin.Context) { // //RespJson(c, status.InternalServerError, nil) // return //} - // //orderRefund := wxpay.OrderRefund{ // //OutTradeNo: outTradeNo, // OutTradeNo: notify.OutTradeNo, @@ -344,12 +346,14 @@ func PushWXPayNotice(c *gin.Context) { // return //} - _, err := model.NewOrderQuerySet(model.DB).IDEq(order.ID).GetUpdater().SetCardStatus(OrderCardStatusCancel).UpdateNum() + _, err := model.NewOrderQuerySet(model.DB).IDEq(order.ID).GetUpdater().SetCardStatus(OrderCardStatusCancel). + UpdateNum() if err != nil { logger.Error("err:", err) return } - _, err = model.NewOrderCardQuerySet(model.DB).OrderIdEq(order.ID).GetUpdater().SetCardStatus(OrderCardStatusCancel).UpdateNum() + _, err = model.NewOrderCardQuerySet(model.DB).OrderIdEq(order.ID).GetUpdater(). + SetCardStatus(OrderCardStatusCancel).UpdateNum() if err != nil { logger.Error("err:", err) return @@ -561,7 +565,7 @@ func PushWXPayNotice(c *gin.Context) { logger.Error("update deposit num is 0") } } else if notifyInfo.Attach == wxpay.WxPayBuyGoods { - _, err := model.NewGoodsOrderQuerySet(model.DB).SerialNoEq(notifyInfo.OutTradeNo).GetUpdater(). + _, err = model.NewGoodsOrderQuerySet(model.DB).SerialNoEq(notifyInfo.OutTradeNo).GetUpdater(). SetPayTime(time.Now()). SetPayStatus(model.PayStatusOK). SetState(model.GoodsOrderStateOnDeliver).UpdateNum() @@ -589,6 +593,7 @@ func PushWXPayNotice(c *gin.Context) { UserAddressId: uint32(goodsOrder.AddressId), OrderType: 2, OrderId: goodsOrder.OrderId, + StoreId: 13, } err = sub.Add() if err != nil { @@ -596,7 +601,7 @@ func PushWXPayNotice(c *gin.Context) { } fundRecord.Uid = uint32(goodsOrder.Uid) fundRecord.FundType = model.FundTypeBuyGoods - fundRecord.Remark = "积分兑换快递费" + fundRecord.Remark = "商城购买" } else if notifyInfo.Attach == wxpay.WxPayUpgradeMember { record := &model.UserOpenMemberRecord{OpenNo: notifyInfo.OutTradeNo} err := record.GetByOpenNo() @@ -799,22 +804,29 @@ func PushWXPayRefundNotice(c *gin.Context) { logger.Error("count refund id err:", err) return } + plaintextJson, _ := json.Marshal(plaintext) + fmt.Println("plaintextJson:", string(plaintextJson)) + if count == 0 { openMemberRecord := new(model.UserOpenMemberRecord) - err = model.NewUserOpenMemberRecordQuerySet(model.DB).OpenNoEq(plaintext.OutTradeNo).One(openMemberRecord) + err = model.NewUserOpenMemberRecordQuerySet(model.DB).OpenNoEq(plaintext.OutRefundNo).One(openMemberRecord) if err != nil { logger.Error("user open member record err:", err) return } + //fundType := model.FundTypeExpressFeeRefund + //if openMemberRecord.OrderType == 6 { + // fundType = model.FundTypeBuyGoodsRefund + //} fundRecord := &model.FundRecord{ Uid: openMemberRecord.Uid, - FundType: model.FundTypeExpressFeeRefund, + FundType: GetFundRecordFundType(openMemberRecord.OrderType), Amount: int64(plaintext.Amount.Refund) * (-1), TransactionId: plaintext.TransactionId, OutTradeNo: plaintext.OutTradeNo, RefundId: plaintext.RefundId, Status: 2, - Remark: "邮费退款", + Remark: GetFundRecordRemark(openMemberRecord.OrderType), } err = model.DB.Create(fundRecord).Error if err != nil { @@ -829,6 +841,30 @@ func PushWXPayRefundNotice(c *gin.Context) { //logger.Error("xml Request.Body1:", string(body)) } +func GetFundRecordRemark(orderType uint32) string { + switch orderType { + case 5: + return "邮费退款" + case 7: + return "商城购买取消订单" + case 8: + return "商城购买退货" + } + return "" +} + +func GetFundRecordFundType(orderType uint32) string { + switch orderType { + case 5: + return model.FundTypeExpressFeeRefund + case 7: + return model.FundTypeBuyGoodsCancel + case 8: + return model.FundTypeBuyGoodsRefund + } + return "" +} + func PayCallBackHandle(notify wxpay.WechatNotifyInfo, payKey string) (string, error) { m, err := struct2Map(notify) diff --git a/controller/mall.go b/controller/mall.go index 406e16e..b78aa78 100644 --- a/controller/mall.go +++ b/controller/mall.go @@ -244,7 +244,7 @@ func MallOrderCreate(c *gin.Context) { UserAddressId: order.AddressId, OrderType: 2, OrderId: order.OrderId, - StoreId: 0, + StoreId: 13, } err = sub.Add() if err != nil { diff --git a/controller/order.go b/controller/order.go index f9be8f1..5634437 100644 --- a/controller/order.go +++ b/controller/order.go @@ -228,8 +228,8 @@ func RentCardOrderCreate(c *gin.Context) { RespJson(c, status.InternalServerError, nil) return } - fmt.Println("Deposit:", user.Deposit) - fmt.Println("MemberDeposit:", memberConfig.MemberDeposit) + //fmt.Println("Deposit:", user.Deposit) + //fmt.Println("MemberDeposit:", memberConfig.MemberDeposit) if user.Deposit != memberConfig.MemberDeposit { logger.Error(errors.New("user deposit 0")) RespJson(c, status.OrderUnpaidDeposit, nil) @@ -343,22 +343,22 @@ func RentCardOrderCreate(c *gin.Context) { RespJson(c, status.OrderStockOut, nil) return } - if user.OpenMemberChannel == model.OpenMemberChannelStorePromotion { - go func() { - exist, err := model.QueryRecordExist(fmt.Sprintf("SELECT * FROM `order` WHERE uid = %d", uc.Uid)) - if err != nil { - logger.Error("order exist err:", err) - return - } - - if !exist && user.OpenMemberTime.Format(model.DateTimeFormat) == time.Now().Format(model.DateTimeFormat) { - _, err = model.NewUserQuerySet(model.DB).UidEq(uc.Uid).GetUpdater().SetStoreId(uint64(req.StoreId)).UpdateNum() - if err != nil { - logger.Error("update user err:", err) - } - } - }() - } + //if user.OpenMemberChannel == model.OpenMemberChannelStorePromotion { + // go func() { + // exist, err := model.QueryRecordExist(fmt.Sprintf("SELECT * FROM `order` WHERE uid = %d", uc.Uid)) + // if err != nil { + // logger.Error("order exist err:", err) + // return + // } + // + // if !exist && user.OpenMemberTime.Format(model.DateTimeFormat) == time.Now().Format(model.DateTimeFormat) { + // _, err = model.NewUserQuerySet(model.DB).UidEq(uc.Uid).GetUpdater().SetStoreId(uint64(req.StoreId)).UpdateNum() + // if err != nil { + // logger.Error("update user err:", err) + // } + // } + // }() + //} //fmt.Println("PayPrice:", order.PayPrice) if req.Price == 0 { @@ -507,6 +507,7 @@ func RentCardOrderCreate(c *gin.Context) { } RespOK(c, ret) + return } //func ExpressFeeRefund(c *gin.Context) { diff --git a/model/autogenerated_mall.go b/model/autogenerated_mall.go index 0362f4b..7b19d84 100644 --- a/model/autogenerated_mall.go +++ b/model/autogenerated_mall.go @@ -377,6 +377,12 @@ func (qs DeliverTaskQuerySet) OrderAscByID() DeliverTaskQuerySet { return qs.w(qs.db.Order("id ASC")) } +// OrderAscByOrderType is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderAscByOrderType() DeliverTaskQuerySet { + return qs.w(qs.db.Order("order_type ASC")) +} + // OrderAscByState is an autogenerated method // nolint: dupl func (qs DeliverTaskQuerySet) OrderAscByState() DeliverTaskQuerySet { @@ -437,6 +443,12 @@ func (qs DeliverTaskQuerySet) OrderDescByID() DeliverTaskQuerySet { return qs.w(qs.db.Order("id DESC")) } +// OrderDescByOrderType is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderDescByOrderType() DeliverTaskQuerySet { + return qs.w(qs.db.Order("order_type DESC")) +} + // OrderDescByState is an autogenerated method // nolint: dupl func (qs DeliverTaskQuerySet) OrderDescByState() DeliverTaskQuerySet { @@ -467,6 +479,62 @@ func (qs DeliverTaskQuerySet) OrderDescByUserAddressId() DeliverTaskQuerySet { return qs.w(qs.db.Order("user_address_id DESC")) } +// OrderTypeEq is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeEq(orderType uint32) DeliverTaskQuerySet { + return qs.w(qs.db.Where("order_type = ?", orderType)) +} + +// OrderTypeGt is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeGt(orderType uint32) DeliverTaskQuerySet { + return qs.w(qs.db.Where("order_type > ?", orderType)) +} + +// OrderTypeGte is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeGte(orderType uint32) DeliverTaskQuerySet { + return qs.w(qs.db.Where("order_type >= ?", orderType)) +} + +// OrderTypeIn is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeIn(orderType ...uint32) DeliverTaskQuerySet { + if len(orderType) == 0 { + qs.db.AddError(errors.New("must at least pass one orderType in OrderTypeIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("order_type IN (?)", orderType)) +} + +// OrderTypeLt is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeLt(orderType uint32) DeliverTaskQuerySet { + return qs.w(qs.db.Where("order_type < ?", orderType)) +} + +// OrderTypeLte is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeLte(orderType uint32) DeliverTaskQuerySet { + return qs.w(qs.db.Where("order_type <= ?", orderType)) +} + +// OrderTypeNe is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeNe(orderType uint32) DeliverTaskQuerySet { + return qs.w(qs.db.Where("order_type != ?", orderType)) +} + +// OrderTypeNotIn is an autogenerated method +// nolint: dupl +func (qs DeliverTaskQuerySet) OrderTypeNotIn(orderType ...uint32) DeliverTaskQuerySet { + if len(orderType) == 0 { + qs.db.AddError(errors.New("must at least pass one orderType in OrderTypeNotIn")) + return qs.w(qs.db) + } + return qs.w(qs.db.Where("order_type NOT IN (?)", orderType)) +} + // StateEq is an autogenerated method // nolint: dupl func (qs DeliverTaskQuerySet) StateEq(state string) DeliverTaskQuerySet { @@ -774,6 +842,13 @@ func (u DeliverTaskUpdater) SetID(ID uint32) DeliverTaskUpdater { return u } +// SetOrderType is an autogenerated method +// nolint: dupl +func (u DeliverTaskUpdater) SetOrderType(orderType uint32) DeliverTaskUpdater { + u.fields[string(DeliverTaskDBSchema.OrderType)] = orderType + return u +} + // SetState is an autogenerated method // nolint: dupl func (u DeliverTaskUpdater) SetState(state string) DeliverTaskUpdater { @@ -844,6 +919,7 @@ var DeliverTaskDBSchema = struct { Uid DeliverTaskDBSchemaField UserAddressId DeliverTaskDBSchemaField State DeliverTaskDBSchemaField + OrderType DeliverTaskDBSchemaField StoreId DeliverTaskDBSchemaField DeliverTime DeliverTaskDBSchemaField DeliverStoreId DeliverTaskDBSchemaField @@ -856,6 +932,7 @@ var DeliverTaskDBSchema = struct { Uid: DeliverTaskDBSchemaField("uid"), UserAddressId: DeliverTaskDBSchemaField("user_address_id"), State: DeliverTaskDBSchemaField("state"), + OrderType: DeliverTaskDBSchemaField("order_type"), StoreId: DeliverTaskDBSchemaField("store_id"), DeliverTime: DeliverTaskDBSchemaField("deliver_time"), DeliverStoreId: DeliverTaskDBSchemaField("deliver_store_id"), @@ -872,6 +949,7 @@ func (o *DeliverTask) Update(db *gorm.DB, fields ...DeliverTaskDBSchemaField) er "uid": o.Uid, "user_address_id": o.UserAddressId, "state": o.State, + "order_type": o.OrderType, "store_id": o.StoreId, "deliver_time": o.DeliverTime, "deliver_store_id": o.DeliverStoreId, diff --git a/model/coupon.go b/model/coupon.go new file mode 100644 index 0000000..c9d10a1 --- /dev/null +++ b/model/coupon.go @@ -0,0 +1,31 @@ +package model + +import "time" + +const ( + CouponTypeDeduction = "deduction" +) + +type Coupon struct { + Model + Name string `json:"name"` + Describe string `json:"describe" gorm:"type:text;"` // 描述 + CouponType string `json:"coupon_type"` + Value uint32 `json:"value"` + OutCount uint32 `json:"out_count"` // 用户已领取数量 + UsedCount uint32 `json:"used_count"` // 用户已使用数量 + ActiveStart time.Time `json:"active_start"` // 有效期开始 + ActiveEnd time.Time `json:"active_end"` // 有效期结束 零值永不结束 +} + +type UserCoupon struct { + Model + + Uid uint32 `json:"uid"` + CouponId uint32 `json:"coupon_id"` + CouponType string `json:"coupon_type"` + Value uint32 `json:"value"` + State uint32 `json:"state"` // + ActiveStart time.Time `json:"active_start"` // 有效期开始 + ActiveEnd time.Time `json:"active_end"` // 有效期结束 零值永不结束 +} diff --git a/model/game_card.go b/model/game_card.go index acd83a0..f490863 100644 --- a/model/game_card.go +++ b/model/game_card.go @@ -74,6 +74,13 @@ type CardInfo struct { Count uint32 `json:"count"` } +func (m *User) IsMember() bool { + if m.MemberLevel == 2 || m.MemberLevel == 4 || m.MemberLevel == 5 { + return true + } + return false +} + func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId, uid uint32) ([]GameCard, uint32, error) { var ( cards []GameCard = make([]GameCard, 0) @@ -145,8 +152,9 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId qs = qs.IDIn(gameIds...) } + var user *User if uid != 0 { - user := GetUserByUid(uid) + user = GetUserByUid(uid) if user.MemberExpire.After(time.Now()) && user.MemberExpire.AddDate(0, 0, -14).Before(time.Now()) { qs = qs.RealPriceLte(30000) @@ -183,6 +191,9 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId if ok { cards[i].StockCount = stock } + if user != nil && user.IsMember() { + cards[i].RealPrice = 0 + } } return cards, totalPage, nil } diff --git a/model/mall.go b/model/mall.go index 9955e17..b969e0b 100644 --- a/model/mall.go +++ b/model/mall.go @@ -470,6 +470,7 @@ func (m *GoodsOrderDetailReq) OrderDetail(uid uint32) (*GoodsOrder, error) { // log.Error().Msgf("goods cat err:%#v", err) //} //goods.GoodsCat = cat + attributes := []GoodsAttribute{goodsAttribute} GoodsAttributeListSetSpecValues(attributes) combo, err := GetCombo(order.GoodsAttributeComboId) @@ -863,6 +864,7 @@ type DeliverTask struct { Uid uint32 `json:"uid" gorm:"index"` UserAddressId uint32 `json:"user_address_id" gorm:"index"` // 用户地址 State string `json:"state"` // 状态 + OrderType uint32 `json:"order_type"` // 1-借卡 2-商城购买 3-收回卡 StoreId uint32 `json:"store_id"` // DeliverTime time.Time `json:"deliver_time"` // 发货时间 DeliverStoreId uint32 `json:"deliver_store_id" gorm:"index"` // 发货门店 @@ -912,15 +914,71 @@ func (m *DeliverTaskSub) Add() error { // return nil //} + //var deliver DeliverTask + //err := NewDeliverTaskQuerySet(DB).UserAddressIdEq(m.UserAddressId). + // StateEq(DeliverTaskStateOnDeliver).OrderTypeEq(1).One(&deliver) + //if err != nil && err != RecordNotFound { + // log.Error().Msgf("deliver err:%#v", err) + // return err + //} + // + //if err == RecordNotFound || (deliver.StoreId != 0 && deliver.StoreId != m.StoreId) { + // + // begin := DB.Begin() + // deliver = DeliverTask{ + // Uid: m.Uid, + // UserAddressId: m.UserAddressId, + // State: DeliverTaskStateOnDeliver, + // StoreId: m.StoreId, + // } + // err = begin.Create(&deliver).Error + // if err != nil { + // begin.Rollback() + // log.Error().Msgf("create deliver task err:%#v", err) + // return err + // } + // + // m.DeliverTaskId = deliver.ID + // m.State = DeliverTaskStateOnDeliver + // err = begin.Create(m).Error + // if err != nil { + // begin.Rollback() + // log.Error().Msgf("create deliver task sub err:%#v", err) + // return err + // } + // err = begin.Commit().Error + // if err != nil { + // begin.Rollback() + // log.Error().Msgf("commit deliver task sub err:%#v", err) + // return err + // } + // return nil + //} + // + //m.DeliverTaskId = deliver.ID + //m.State = DeliverTaskStateOnDeliver + // + //err = DB.Create(m).Error + //if err != nil { + // log.Error().Msgf("create deliver task sub err:%#v", err) + // return err + //} + //if deliver.StoreId == 0 { + // err = NewDeliverTaskQuerySet(DB).IDEq(deliver.ID).GetUpdater().SetStoreId(m.StoreId).Update() + // if err != nil { + // logger.Error("deliver task err:", err) + // } + //} + var deliver DeliverTask err := NewDeliverTaskQuerySet(DB).UserAddressIdEq(m.UserAddressId). - StateEq(DeliverTaskStateOnDeliver).One(&deliver) + StateEq(DeliverTaskStateOnDeliver).OrderTypeEq(m.OrderType).StoreIdEq(m.StoreId).One(&deliver) if err != nil && err != RecordNotFound { log.Error().Msgf("deliver err:%#v", err) return err } - if err == RecordNotFound || (deliver.StoreId != 0 && deliver.StoreId != m.StoreId) { + if err == RecordNotFound { begin := DB.Begin() deliver = DeliverTask{ @@ -928,6 +986,7 @@ func (m *DeliverTaskSub) Add() error { UserAddressId: m.UserAddressId, State: DeliverTaskStateOnDeliver, StoreId: m.StoreId, + OrderType: m.OrderType, } err = begin.Create(&deliver).Error if err != nil { @@ -938,6 +997,7 @@ func (m *DeliverTaskSub) Add() error { m.DeliverTaskId = deliver.ID m.State = DeliverTaskStateOnDeliver + //m.OrderType = deliver.OrderType err = begin.Create(m).Error if err != nil { begin.Rollback() @@ -961,12 +1021,13 @@ func (m *DeliverTaskSub) Add() error { log.Error().Msgf("create deliver task sub err:%#v", err) return err } - if deliver.StoreId == 0 { - err = NewDeliverTaskQuerySet(DB).IDEq(deliver.ID).GetUpdater().SetStoreId(m.StoreId).Update() - if err != nil { - logger.Error("deliver task err:", err) - } - } + //if deliver.StoreId == 0 { + // err = NewDeliverTaskQuerySet(DB).IDEq(deliver.ID).GetUpdater().SetStoreId(m.StoreId).Update() + // if err != nil { + // logger.Error("deliver task err:", err) + // } + //} + return nil } diff --git a/model/model_test.go b/model/model_test.go index 06e40a2..df09275 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -150,52 +150,63 @@ func InitDBProd() { DBProd.LogMode(false) DBProd.SingularTable(true) DBProd.AutoMigrate( - //&RedeemCode{}, - //&UserRedeemCode{}, - //&GameCardGoods{}, + //&RedeemCode{}, + //&UserRedeemCode{}, + //&GameCardGoods{}, - //&UserShareCardBill{}, - //&ShareCardBillGame{}, - //&UserShareCard{}, - //&ShareCardVmRecord{}, - //&UserShareCardVm{}, - //&ShareCardDateVm{}, - //&ShareCardGameVm{}, - //&ShareCardRetrieve{}, - //&ShareCardRetrieveCard{}, - //&GameCardLabel{}, - //&CardIssueFeedback{}, + //&UserShareCardBill{}, + //&ShareCardBillGame{}, + //&UserShareCard{}, + //&ShareCardVmRecord{}, + //&UserShareCardVm{}, + //&ShareCardDateVm{}, + //&ShareCardGameVm{}, + //&ShareCardRetrieve{}, + //&ShareCardRetrieveCard{}, + //&GameCardLabel{}, + //&CardIssueFeedback{}, - //&GameCard{}, - //&FundRecord{}, - //&User{}, + //&GameCard{}, + //&FundRecord{}, + //&User{}, - //&GameCard{}, - //&FundRecord{}, - //&User{}, - //&UserAttendance{}, - //&UserAttendanceRecord{}, + //&GameCard{}, + //&FundRecord{}, + //&User{}, + //&UserAttendance{}, + //&UserAttendanceRecord{}, - //&Store{}, - //&GameCard{}, - //&GameCardGoods{}, - //&GameCardGoodsStock{}, - //&User{}, - //&Order{}, - //&OrderCard{}, - // - //&OperationLog{}, - //&CooperativeBusiness{}, - //&CooperativeMemberDeduct{}, - //&CooperativeAssistantMemberDeduct{}, - // - //&CooperativeMemberPromotion{}, - //&CooperativeMemberPromotionStore{}, - //&CooperativeMemberPromotionDay{}, - //&CooperativeMemberPromotionStoreDay{}, - //&InviteMemberReport{}, - //&CooperativeDeductSettle{}, - //&XcxRole{}, + //&Store{}, + //&GameCard{}, + //&GameCardGoods{}, + //&GameCardGoodsStock{}, + //&User{}, + //&Order{}, + //&OrderCard{}, + // + //&OperationLog{}, + //&CooperativeBusiness{}, + //&CooperativeMemberDeduct{}, + //&CooperativeAssistantMemberDeduct{}, + // + //&CooperativeMemberPromotion{}, + //&CooperativeMemberPromotionStore{}, + //&CooperativeMemberPromotionDay{}, + //&CooperativeMemberPromotionStoreDay{}, + //&InviteMemberReport{}, + //&CooperativeDeductSettle{}, + //&XcxRole{}, + + &Goods{}, + &GoodsCat{}, + &GoodsAttribute{}, + &GoodsAttributeCombo{}, + &Spec{}, + &SpecValue{}, + &GoodsOrder{}, + &OperationLog{}, + &DeliverTask{}, + &DeliverTaskSub{}, ) if err := DBProd.DB().Ping(); err != nil { @@ -1156,7 +1167,8 @@ func TestAddMemberPromotion(t *testing.T) { func AddMemberPromotion() { InitTestDB() - sql := fmt.Sprintf("UPDATE cooperative_member_promotion SET gold_count=gold_count+1 WHERE date=%s AND cooperative_business_id=%d", "2022-04", 1) + sql := fmt.Sprintf( + "UPDATE cooperative_member_promotion SET gold_count=gold_count+1 WHERE date=%s AND cooperative_business_id=%d", "2022-04", 1) err := DBDev.Exec(sql).Error if err != nil { logger.Error("err:", err) @@ -1345,3 +1357,15 @@ func NumStringSort(n string) (string, error) { return ns[:len(ns)-1], nil } + +func TestBtys(t *testing.T) { + s := strings.Split("91 123 34 105 100 34 58 49 53 57 57 44 34 99 114 101 97 116 101 100 65 116 34 58 34 50 48 50 50 45 48 54 45 48 56 84 49 49 58 52 54 58 51 53 43 48 56 58 48 48 34 44 34 117 105 100 34 58 53 54 52 48 50 56 54 44 34 103 97 109 101 95 99 97 114 100 95 105 100 34 58 48 44 34 103 97 109 101 95 99 97 114 100 95 103 111 111 100 115 95 105 100 34 58 48 44 34 103 97 109 101 95 99 97 114 100 95 115 101 114 105 97 108 95 110 117 109 98 101 114 34 58 34 98 50 50 50 49 49 49 34 44 34 115 116 111 114 101 95 105 100 34 58 50 57 44 34 117 115 101 114 95 97 100 100 114 101 115 115 95 105 100 34 58 48 44 34 100 101 108 105 118 101 114 121 95 116 121 112 101 34 58 49 44 34 99 111 117 110 116 34 58 49 44 34 112 105 99 107 117 112 95 99 111 100 101 34 58 34 229 183 178 229 143 150 232 180 167 34 44 34 99 97 114 100 95 115 116 97 116 117 115 34 58 52 44 34 100 101 108 105 118 101 114 121 95 116 105 109 101 34 58 34 50 48 50 50 45 48 54 45 48 56 84 49 49 58 52 55 58 53 56 43 48 56 58 48 48 34 44 34 114 101 99 101 105 112 116 95 116 105 109 101 34 58 34 48 48 48 49 45 48 49 45 48 49 84 48 48 58 48 48 58 48 48 90 34 44 34 112 97 121 95 116 105 109 101 34 58 34 50 48 50 50 45 48 54 45 48 56 84 49 49 58 52 54 58 51 53 43 48 56 58 48 48 34 44 34 112 97 121 95 115 116 97 116 117 115 34 58 50 44 34 111 114 100 101 114 95 115 110 34 58 34 55 56 49 57 50 51 66 54 50 56 34 44 34 112 97 121 95 112 114 105 99 101 34 58 48 44 34 112 111 115 116 97 103 101 34 58 48 44 34 101 120 112 114 101 115 115 95 99 111 109 112 97 110 121 34 58 34 34 44 34 101 120 112 114 101 115 115 95 99 111 109 112 97 110 121 95 110 111 34 58 34 34 44 34 101 120 112 114 101 115 115 95 110 111 34 58 34 34 44 34 101 120 112 114 101 115 115 95 100 117 114 97 116 105 111 110 34 58 48 44 34 114 101 118 101 114 116 95 115 116 111 114 101 95 105 100 34 58 48 44 34 114 101 118 101 114 116 95 116 105 109 101 34 58 34 48 48 48 49 45 48 49 45 48 49 84 48 48 58 48 48 58 48 48 90 34 44 34 114 101 118 101 114 116 95 101 120 112 114 101 115 115 95 99 111 109 112 97 110 121 34 58 34 34 44 34 114 101 118 101 114 116 95 101 120 112 114 101 115 115 95 99 111 109 112 97 110 121 95 110 111 34 58 34 34 44 34 114 101 118 101 114 116 95 101 120 112 114 101 115 115 95 110 111 34 58 34 34 44 34 114 101 118 101 114 116 95 101 120 112 114 101 115 115 95 100 117 114 97 116 105 111 110 34 58 48 44 34 99 111 111 112 101 114 97 116 105 118 101 95 98 117 115 105 110 101 115 115 95 105 100 34 58 49 48 44 34 99 111 111 112 101 114 97 116 105 118 101 95 110 97 109 101 34 58 34 34 44 34 103 97 109 101 95 99 97 114 100 95 115 101 114 105 97 108 95 110 117 109 98 101 114 115 34 58 110 117 108 108 44 34 111 114 100 101 114 95 99 97 114 100 115 34 58 110 117 108 108 125 93", " ") + + b := make([]byte, 0) + for i, _ := range s { + by, _ := strconv.Atoi(s[i]) + b = append(b, byte(by)) + } + + fmt.Println("byte:", string(b)) +} diff --git a/model/user.go b/model/user.go index 1f14a28..5117234 100644 --- a/model/user.go +++ b/model/user.go @@ -137,6 +137,8 @@ const ( FundTypeDepositRefund = "deposit_refund" // 退押金 FundTypeExpressFeeRefund = "express_fee_refund" // 退邮费 FundTypeBuyGoods = "buy_goods" // 购买商品 + FundTypeBuyGoodsCancel = "buy_goods_cancel" // 购买商品取消订单 + FundTypeBuyGoodsRefund = "buy_goods_refund" // 购买商品退货 ) @@ -246,7 +248,7 @@ func UserUpdate(user *User) error { return nil } -//OrderType: 1-物流支付 2-取消物流租卡 3-滞纳金 4-收回卡 5-退物流费 6-商城购物 7-购买商品取消订单 +//OrderType: 1-物流支付 2-取消物流租卡 3-滞纳金 4-收回卡 5-退物流费 6-商城购物 7-购买商品取消订单 8-购买商品订单退货 // gen:qs type UserOpenMemberRecord struct { diff --git a/router/router_app.go b/router/router_app.go index e56383b..51e0627 100644 --- a/router/router_app.go +++ b/router/router_app.go @@ -35,7 +35,6 @@ func ConfigAppRouter(r gin.IRouter) { api.POST("aliyun/sts_token", controller.AliyunStsTokenGet) // 阿里云上传图片token // api.GET("wx_cs/message", controller.CustomerServiceMessageCheck) // 客服校验 // api.POST("wx_cs/message", controller.CustomerServiceMessage) // 客服 - // } // 用户鉴权 @@ -71,7 +70,6 @@ func ConfigAppRouter(r gin.IRouter) { user := api.Group("user") { - user.Use(auth.UserAccessAuth) // user.POST("data", controller.UserData) // 用户数据 user.POST("user_info/upload", controller.UserInfoUpload) // 上传用户信息 @@ -219,7 +217,7 @@ func ConfigAppRouter(r gin.IRouter) { 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) // + //shoppingCart.POST("del", controller.ShoppingCartDel) } cooperative := api.Group("cooperative_business") {