Merge pull request #28 from Seelly/master

feature(voucher):seckillvocuher

.hz

@@ -1,6 +1,6 @@
 // Code generated by hz. DO NOT EDIT.
 
-hz version: v0.9.0
+hz version: v0.9.1
 handlerDir: ""
 modelDir: ""
 routerDir: ""

biz/dal/mysql/voucher.go

@@ -2,16 +2,41 @@ package mysql
 
 import (
 	"context"
+	"errors"
+	"gorm.io/gorm"
 	"xzdp/biz/model/voucher"
 )
 
-func QueryVoucherByID(ctx context.Context, id int64) ([]*voucher.Voucher, error) {
-	var voucherList []*voucher.Voucher
+func QueryShopVoucherByShopID(ctx context.Context, id int64) ([]*voucher.SeckillVoucher, error) {
+	var voucherList []*voucher.SeckillVoucher
 
-	err = DB.WithContext(ctx).Where("shop_id = ?", id).Find(&voucherList).Error
+	err = DB.WithContext(ctx).Raw("select v.*,s.stock,s.begin_time,s.end_time from tb_voucher v left join tb_seckill_voucher s on s.voucher_id = v.id where v.shop_id = ?", id).
+		Find(&voucherList).Error
 	if err != nil {
 		return nil, err
 	}
 
 	return voucherList, nil
 }
+
+func QueryVoucherByID(ctx context.Context, id int64) (*voucher.SeckillVoucher, error) {
+	var seckillVoucher voucher.SeckillVoucher
+	err = DB.WithContext(ctx).Where("voucher_id = ?", id).Order("create_time desc").Limit(1).Find(&seckillVoucher).Error
+	return &seckillVoucher, err
+}
+
+func QueryVoucherOrderByVoucherID(ctx context.Context, userId int64, id int64) (*voucher.VoucherOrder, error) {
+	var voucherOrder voucher.VoucherOrder
+	if !errors.Is(DB.WithContext(ctx).Where("voucher_id = ? and user_id=?", id, userId).Limit(1).Find(&voucherOrder).Error, gorm.ErrRecordNotFound) {
+		return nil, errors.New("重复下单")
+	}
+	return &voucherOrder, nil
+}
+
+func UpdateVoucherStock(ctx context.Context, id int64) error {
+	return DB.WithContext(ctx).Model(&voucher.SeckillVoucher{}).Where("voucher_id = ?", id).Update("stock", gorm.Expr("stock - ?", 1)).Error
+}
+
+func CreateVoucherOrder(ctx context.Context, voucherOrder *voucher.VoucherOrder) error {
+	return DB.WithContext(ctx).Create(voucherOrder).Error
+}

biz/dal/redis/id_worker.go

@@ -7,12 +7,13 @@ import (
 )
 
 func NextId(ctx context.Context, prefix string) (int64, error) {
+	beginTimeStamp := int64(constants.BEGIN_TIMESTAMP)
 	now := time.Now().Unix()
-	dateKey := time.Now().Format("2006-01-02")
-
-	count, err := RedisClient.Incr(ctx, constants.ID_KEY+prefix+":"+dateKey).Result()
+	timeStamp := now - beginTimeStamp
+	dateKey := time.Unix(now, 0).Format("2006-01-02")
+	count, err := RedisClient.Incr(ctx, constants.ICRID_KEY+prefix+":"+dateKey).Result()
 	if err != nil {
 		return 0, err
 	}
-	return (now << 32) | count, nil
+	return (timeStamp << constants.COUNT_BIT) | count, nil
 }

biz/handler/voucher/voucher_service.go

@@ -2,6 +2,7 @@ package voucher
 
 import (
 	"context"
+	"errors"
 	"strconv"
 
 	"github.com/cloudwego/hertz/pkg/app"
@@ -36,3 +37,25 @@ func VoucherList(ctx context.Context, c *app.RequestContext) {
 
 	utils.SendSuccessResponse(ctx, c, consts.StatusOK, resp)
 }
+
+// SeckillVoucher .
+// @router /voucher-order/seckill/:id [POST]
+func SeckillVoucher(ctx context.Context, c *app.RequestContext) {
+	var err error
+	voucherString := c.Param("id")
+	if voucherString == "" {
+		utils.SendErrResponse(ctx, c, consts.StatusOK, errors.New("参数错误"))
+		return
+	}
+	voucherID, err := strconv.ParseInt(voucherString, 10, 64)
+	if err != nil {
+		utils.SendErrResponse(ctx, c, consts.StatusOK, err)
+		return
+	}
+	resp, err := service.NewSeckillVoucherService(ctx, c).Run(&voucherID)
+	if err != nil {
+		utils.SendErrResponse(ctx, c, consts.StatusOK, err)
+		return
+	}
+	utils.SendSuccessResponse(ctx, c, consts.StatusOK, resp)
+}