add release v4.1.4

This commit is contained in:
RockYang
2024-09-20 15:50:04 +08:00
parent c522248d39
commit 4df1c7a136
12 changed files with 68 additions and 53 deletions

View File

@@ -15,6 +15,7 @@ import (
"geekai/store/vo"
"geekai/utils"
"geekai/utils/resp"
"time"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
@@ -102,7 +103,7 @@ func (h *OrderHandler) Remove(c *gin.Context) {
return
}
err := h.DB.Unscoped().Where("id = ?", id).Delete(&model.Order{}).Error
err := h.DB.Where("id = ?", id).Delete(&model.Order{}).Error
if err != nil {
resp.ERROR(c, err.Error())
return
@@ -112,8 +113,20 @@ func (h *OrderHandler) Remove(c *gin.Context) {
}
func (h *OrderHandler) Clear(c *gin.Context) {
err := h.DB.Unscoped().Where("status <> ?", 2).Where("pay_time", 0).Delete(&model.Order{}).Error
var orders []model.Order
err := h.DB.Where("status <> ?", 2).Where("pay_time", 0).Find(&orders).Error
if err != nil {
resp.ERROR(c, err.Error())
return
}
deleteIds := make([]uint, 0)
for _, order := range orders {
// 只删除 15 分钟内的未支付订单
if time.Now().After(order.CreatedAt.Add(time.Minute * 15)) {
deleteIds = append(deleteIds, order.Id)
}
}
err = h.DB.Where("id IN ?", deleteIds).Delete(&model.Order{}).Error
if err != nil {
resp.ERROR(c, err.Error())
return