增加订单超时系统配置,WebFooter 增加公安备案号

This commit is contained in:
GeekMaster
2025-09-05 10:42:02 +08:00
parent 52d297624d
commit 26f3db09a7
8 changed files with 72 additions and 32 deletions

View File

@@ -259,25 +259,28 @@ func (h *AdminJimengHandler) UpdateConfig(c *gin.Context) {
// 保存配置
tx := h.DB.Begin()
value := utils.JsonEncode(&req)
config := model.Config{Name: types.ConfigKeyJimeng, Value: value}
var exist model.Config
tx.Where("name", types.ConfigKeyJimeng).First(&exist)
err := tx.FirstOrCreate(&config).Error
if err != nil {
resp.ERROR(c, "保存配置失败: "+err.Error())
return
}
if config.Id > 0 {
config.Value = value
err = tx.Updates(&config).Error
if exist.Id > 0 {
exist.Value = value
err := tx.Updates(&exist).Error
if err != nil {
resp.ERROR(c, "更新配置失败: "+err.Error())
return
}
} else {
exist.Name = types.ConfigKeyJimeng
exist.Value = value
err := tx.Create(&exist).Error
if err != nil {
resp.ERROR(c, "创建配置失败: "+err.Error())
return
}
}
// 更新服务中的客户端配置
err = h.jimengClient.UpdateConfig(req)
err := h.jimengClient.UpdateConfig(req)
if err != nil {
resp.ERROR(c, err.Error())
tx.Rollback()

View File

@@ -129,8 +129,8 @@ func (h *OrderHandler) Clear(c *gin.Context) {
}
deleteIds := make([]uint, 0)
for _, order := range orders {
// 只删除 5 分钟内的未支付订单
if time.Now().After(order.CreatedAt.Add(time.Minute * 5)) {
// 只删除超时的未支付订单
if time.Now().After(order.CreatedAt.Add(time.Minute * time.Duration(h.App.SysConfig.Base.OrderPayTimeout))) {
deleteIds = append(deleteIds, order.Id)
}
}