From 01bb79a26cdd43673165fb6098baa7360043564c Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Fri, 16 May 2025 15:58:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AF=B9=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=9B=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8D=E5=8F=91=E7=9F=AD=E4=BF=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=80=80=E4=BF=9D=E8=AF=81=E9=87=91=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E4=BF=9D=E8=AF=81=E9=87=91=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=BC=80=E5=8F=91=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E4=B8=8D=E6=94=AF=E6=8C=81=E9=80=80=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/usermanage/user.go | 11 ++++++
 cmd/api/server.go                 | 58 +++++++++++++++----------------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/app/admin/apis/usermanage/user.go b/app/admin/apis/usermanage/user.go
index 402cf77..d8f9a54 100644
--- a/app/admin/apis/usermanage/user.go
+++ b/app/admin/apis/usermanage/user.go
@@ -11,6 +11,7 @@ import (
 	"go-admin/pkg/jwtauth"
 	"go-admin/tools"
 	"go-admin/tools/app"
+	"go-admin/tools/config"
 	"net/http"
 	"strings"
 	"time"
@@ -540,6 +541,11 @@ func ArticleDel(c *gin.Context) {
 
 // AutoDepositRefund 每天早上9点30分退前一天的保证金
 func AutoDepositRefund() {
+	if config.ApplicationConfig.Mode == "dev" {
+		logger.Info("****开发环境不支持自动退保证金****")
+		fmt.Println("****开发环境不支持自动退保证金****")
+	}
+
 	logger.Info("**** start AutoDepositRefund ****")
 	fmt.Println("**** start AutoDepositRefund ****")
 	// 查询待审核的订单
@@ -858,6 +864,11 @@ func NotarizeUserDepositRefund(c *gin.Context) {
 		return
 	}
 
+	if config.ApplicationConfig.Mode == "dev" {
+		logger.Info("****开发环境不支持退保证金****")
+		fmt.Println("****开发环境不支持退保证金****")
+	}
+
 	fmt.Println("DepositRefundRecordId:", req.DepositRefundRecordId)
 	var depositRefund models.DepositRefundRecord
 	err := orm.Eloquent.Table("deposit_refund_record").Where("id = ?", req.DepositRefundRecordId).Find(&depositRefund).Error
diff --git a/cmd/api/server.go b/cmd/api/server.go
index beddb39..760c3d0 100644
--- a/cmd/api/server.go
+++ b/cmd/api/server.go
@@ -100,23 +100,6 @@ func run() error {
 		//	fmt.Println("err:", err)
 		//}
 
-		err := s.Every(1).Minute().Do(models.DeliveryStorePickStatusUpdate)
-		if err != nil {
-			fmt.Println("err:", err)
-		}
-
-		err = s.Every(1).Day().At("10:30").Do(models.MemberExpirationReminder)
-		//err = s.Every(1).Minute().Do(models.MemberExpirationReminder)
-		if err != nil {
-			fmt.Println("err:", err)
-		}
-
-		err = s.Every(1).Day().At("12:01").Do(models.ExpireMemberSMSSend)
-		//err = s.Every(1).Minute().Do(models.MemberExpirationReminder)
-		if err != nil {
-			fmt.Println("err:", err)
-		}
-
 		// 2024-03-11 跟产品确认共享卡功能已隐藏，暂时注释该部分代码
 		//// 生效共享卡
 		//err = s.Every(1).Day().At("05:00").Do(models.ShareCardProfitEffectCard)
@@ -134,6 +117,11 @@ func run() error {
 		//	fmt.Println("err:", err)
 		//}
 
+		err := s.Every(1).Minute().Do(models.DeliveryStorePickStatusUpdate)
+		if err != nil {
+			fmt.Println("err:", err)
+		}
+
 		// 用户收回卡绑定卡
 		err = s.Every(1).Day().At("00:00").Do(models.ShareCardRetrieveCardSetStockCardCron)
 		if err != nil {
@@ -165,12 +153,6 @@ func run() error {
 			fmt.Println("err:", err)
 		}
 
-		// 用户续费
-		err = s.Every(1).Day().At("19:00").Do(models.SendMessageMemberRenewal)
-		if err != nil {
-			fmt.Println("err:", err)
-		}
-
 		// 管理端首页
 		err = s.Every(1).Day().At("1:00").Do(models.IndexMemberStatistic)
 		if err != nil {
@@ -189,12 +171,6 @@ func run() error {
 			fmt.Println("err:", err)
 		}
 
-		// 每天上午10:00退前一天的保证金
-		err = s.Every(1).Day().At("10:00").Do(usermanage.AutoDepositRefund)
-		if err != nil {
-			fmt.Println("err:", err)
-		}
-
 		// 每天凌晨00:30更新用户优惠券
 		err = s.Every(1).Day().At("00:30").Do(models.UpdateUserCoupon)
 		if err != nil {
@@ -208,6 +184,30 @@ func run() error {
 		}
 
 		if config.ApplicationConfig.Mode != "dev" {
+			err = s.Every(1).Day().At("10:30").Do(models.MemberExpirationReminder)
+			//err = s.Every(1).Minute().Do(models.MemberExpirationReminder)
+			if err != nil {
+				fmt.Println("err:", err)
+			}
+
+			err = s.Every(1).Day().At("12:01").Do(models.ExpireMemberSMSSend)
+			//err = s.Every(1).Minute().Do(models.MemberExpirationReminder)
+			if err != nil {
+				fmt.Println("err:", err)
+			}
+
+			// 用户续费
+			err = s.Every(1).Day().At("19:00").Do(models.SendMessageMemberRenewal)
+			if err != nil {
+				fmt.Println("err:", err)
+			}
+
+			// 每天上午10:00退前一天的保证金
+			err = s.Every(1).Day().At("10:00").Do(usermanage.AutoDepositRefund)
+			if err != nil {
+				fmt.Println("err:", err)
+			}
+
 			// 检测小程序商城有无待发货订单
 			err = s.Every(1).Day().At("09:00").Do(models.CheckOnDeliverMall)
 			if err != nil {