Merge branch 'feat/coupon' into dev

dotbitHQ · Nov 8, 2023 · 852f1de · 852f1de
2 parents 941936d + d9dcc6f
commit 852f1de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/dao/t_coupon_info.go b/dao/t_coupon_info.go
@@ -116,7 +116,7 @@ func (d *DbDao) FindCouponCodeList(cid string, page, pageSize int) (res []*table
 		}
 		return
 	}
-	if err = db.Where("status=?", tables.CouponStatusUsed).Count(&used).Error; err != nil {
+	if err = d.db.Model(&tables.CouponInfo{}).Where("cid=? and status=?", cid, tables.CouponStatusUsed).Count(&used).Error; err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return
 		}
@@ -128,7 +128,6 @@ func (d *DbDao) FindCouponCodeList(cid string, page, pageSize int) (res []*table
 		}
 		return
 	}
-
 	for idx, v := range res {
 		res[idx].Code, err = encrypt.AesDecrypt(v.Code, config.Cfg.Das.Coupon.EncryptionKey)
 		if err != nil {

diff --git a/http_server/handle/check_permissions.go b/http_server/handle/check_permissions.go
@@ -15,7 +15,7 @@ import (
 
 type ReqCheckPermissions struct {
 	core.ChainTypeAddress
-	Account string `json:"account"`
+	Account string `json:"account" binding:"required"`
 }
 
 func (h *HttpHandle) CheckPermissions(ctx *gin.Context) {