优化代码,修改jj()返回niuID后续赎牛牛可自定义回复

Author: xyy0411

niu/main.go

@@ -27,6 +27,12 @@ var (
 
 	errCancelFail = errors.New("遇到不可抗力因素，注销失败！")
 
+	// ErrAuctioned 已被拍卖无法赎回
+	ErrAuctioned = errors.New("你的牛牛已经被拍卖无法赎回")
+
+	// ErrCanceled 已被注销无法赎回
+	ErrCanceled = errors.New("你的牛牛已经被注销无法赎回")
+
 	// ErrInvalidProductID 商品ID无效
 	ErrInvalidProductID = errors.New("商品id不存在")
 
@@ -241,37 +247,38 @@ func Register(gid, uid int64) (string, error) {
 }
 
 // JJ ...
-func JJ(gid, uid, adduser int64, prop string) (message string, adduserLength float64, err error) {
+func JJ(gid, uid, adduser int64, prop string) (message string, adduserLength float64, niuID uuid.UUID, err error) {
 	globalLock.Lock()
 	defer globalLock.Unlock()
 
 	myniuniu, err := getUserByID(gid, uid)
 	if err != nil {
-		return "", 0, ErrNoNiuNiu
+		return "", 0, uuid.Nil, ErrNoNiuNiu
 	}
 
 	adduserniuniu, err := getUserByID(gid, adduser)
 	if err != nil {
-		return "", 0, ErrAdduserNoNiuNiu
+		return "", 0, uuid.Nil, ErrAdduserNoNiuNiu
 	}
 
 	if uid == adduser {
-		return "", 0, ErrCannotFight
+		return "", 0, uuid.Nil, ErrCannotFight
 	}
 
 	message, err = myniuniu.processJJ(adduserniuniu, prop)
 	if err != nil {
-		return "", 0, err
+		return "", 0, uuid.Nil, err
 	}
 
 	if err = tableFor(gid, ur).Where("user_id =?", uid).Update("length", myniuniu.Length).Error; err != nil {
-		return "", 0, err
+		return "", 0, uuid.Nil, err
 	}
 
 	if err = tableFor(gid, ur).Where("user_id =?", adduser).Update("length", adduserniuniu.Length).Error; err != nil {
-		return "", 0, err
+		return "", 0, uuid.Nil, err
 	}
 
+	niuID = adduserniuniu.NiuID
 	adduserLength = adduserniuniu.Length
 
 	return
@@ -294,7 +301,7 @@ func Cancel(gid, uid int64) (string, error) {
 }
 
 // Redeem 赎牛牛
-func Redeem(gid, uid int64, lastLength float64) error {
+func Redeem(gid, uid int64, r Rm) error {
 	globalLock.Lock()
 	defer globalLock.Unlock()
 
@@ -305,7 +312,19 @@ func Redeem(gid, uid int64, lastLength float64) error {
 
 	money := wallet.GetWalletOf(uid)
 
-	price := 150
+	var niuManager niuNiuManager
+	if err = db.Model(&niuNiuManager{}).Where("niu_id = ?", r.NiuID).First(&niuManager).Error; err != nil {
+		return err
+	}
+
+	switch niuManager.Status {
+	case 1:
+		return ErrAuctioned
+	case 2:
+		return ErrCanceled
+	}
+
+	price := int(hitGlue(r.Length))*100 + 150
 
 	if money < price {
 		var builder strings.Builder
@@ -324,7 +343,7 @@ func Redeem(gid, uid int64, lastLength float64) error {
 		return err
 	}
 
-	return tableFor(gid, ur).Where("user_id = ?", uid).Update("length", lastLength).Error
+	return tableFor(gid, ur).Where("user_id = ?", uid).Update("length", r.Length).Error
 }
 
 // Store 牛牛商店

niu/models.go

@@ -17,6 +17,13 @@ var (
 	jjPorps     = []string{"击剑神器", "击剑神稽"}
 )
 
+type Rm struct {
+	NiuID     uuid.UUID
+	TimeLimit time.Time
+	Count     int
+	Length    float64
+}
+
 type users []*userInfo
 
 type niuNiuManager struct {
@@ -115,9 +122,9 @@ func (u *userInfo) useWeiGe() (string, float64) {
 	reduce := math.Abs(hitGlue(niuniu))
 	niuniu += reduce
 	return randomChoice([]string{
-		fmt.Sprintf("哈哈，你这一用道具，牛牛就像是被激发了潜能，增加了%.2fcm！看来今天是个大日子呢！", reduce),
+		fmt.Sprintf("哈哈，你这一用伟哥，牛牛就像是被激发了潜能，增加了%.2fcm！看来今天是个大日子呢！", reduce),
 		fmt.Sprintf("你这是用了什么神奇的道具？牛牛竟然增加了%.2fcm，简直是牛气冲天！", reduce),
-		fmt.Sprintf("使用道具后，你的牛牛就像是开启了加速模式，一下增加了%.2fcm，这成长速度让人惊叹！", reduce),
+		fmt.Sprintf("使用伟哥后，你的牛牛就像是开启了加速模式，一下增加了%.2fcm，这成长速度让人惊叹！", reduce),
 	}), niuniu
 }
 
@@ -127,7 +134,7 @@ func (u *userInfo) useMeiYao() (string, float64) {
 	niuniu -= reduce
 	return randomChoice([]string{
 		fmt.Sprintf("你使用媚药,咿呀咿呀一下使当前长度发生了一些变化，当前长度%.2fcm", niuniu),
-		fmt.Sprintf("看来你追求的是‘微观之美’，故意使用道具让牛牛凹进去了%.2fcm！", reduce),
+		fmt.Sprintf("看来你追求的是‘微观之美’，故意使用媚药让牛牛凹进去了%.2fcm！", reduce),
 		fmt.Sprintf("缩小奇迹’在你身上发生了，牛牛凹进去了%.2fcm，你的选择真是独特！", reduce),
 	}), niuniu
 }
@@ -266,6 +273,17 @@ func (u *userInfo) purchaseItem(productID, quantity int) (money int, err error)
 
 	money *= quantity
 
+	switch productID {
+	case 1:
+		u.WeiGe += quantity
+	case 2:
+		u.MeiYao += quantity
+	case 3:
+		u.Artifact += quantity
+	case 4:
+		u.ShenJi += quantity
+	}
+
 	return
 }