add release v4.1.4

api/config.sample.toml

@@ -79,6 +79,7 @@ TikaHost = "http://tika:9998"
    From = "test@163.com" # 发件邮箱人地址
    Password = "" #邮箱 stmp 服务授权码
 
+# 支付宝商户支付
 [AlipayConfig]
   Enabled = false # 启用支付宝支付通道
   SandBox = false # 是否启用沙盒模式
@@ -89,6 +90,7 @@ TikaHost = "http://tika:9998"
   AlipayPublicKey = "certs/alipay/alipayPublicCert.crt" # 支付宝公钥证书
   RootCert = "certs/alipay/alipayRootCert.crt" # 支付宝根证书
 
+# 虎皮椒支付
 [HuPiPayConfig]
   Enabled = false
   AppId = ""

api/handler/admin/order_handler.go

@@ -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

api/store/model/order.go

@@ -2,7 +2,6 @@ package model
 
 import (
 	"geekai/core/types"
-	"gorm.io/gorm"
 )
 
 // Order 充值订单
@@ -20,5 +19,4 @@ type Order struct {
 	PayTime   int64
 	PayWay    string // 支付渠道
 	PayType   string // 支付类型
-	DeletedAt gorm.DeletedAt
 }