v1.1.0 新增通知、暂时性2折

app/user/cmd/api/internal/logic/notification/getnotificationslogic.go

@@ -0,0 +1,56 @@
+package notification
+
+import (
+	"context"
+	"github.com/jinzhu/copier"
+	"github.com/pkg/errors"
+	"qnc-server/common/xerr"
+	"time"
+
+	"qnc-server/app/user/cmd/api/internal/svc"
+	"qnc-server/app/user/cmd/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetNotificationsLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetNotificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetNotificationsLogic {
+	return &GetNotificationsLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetNotificationsLogic) GetNotifications() (resp *types.GetNotificationsResp, err error) {
+	// 获取今天的日期
+	now := time.Now()
+
+	// 获取开始和结束日期的时间戳
+	todayStart := now.Format("2006-01-02") + " 00:00:00"
+	todayEnd := now.Format("2006-01-02") + " 23:59:59"
+
+	// 构建查询条件
+	builder := l.svcCtx.GlobalNotificationsModel.SelectBuilder().
+		Where("status = ?", "active").
+		Where("(start_date IS NULL OR start_date <= ?)", todayEnd). // start_date 是 NULL 或者小于等于今天结束时间
+		Where("(end_date IS NULL OR end_date >= ?)", todayStart)    // end_date 是 NULL 或者大于等于今天开始时间
+
+	notificationsModelList, findErr := l.svcCtx.GlobalNotificationsModel.FindAll(l.ctx, builder, "")
+	if findErr != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "全局通知, 查找通知失败, err:%+v", findErr)
+	}
+
+	var notifications []types.Notification
+	copyErr := copier.Copy(&notifications, &notificationsModelList)
+	if copyErr != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "全局通知, 复制结构体失败, err:%+v", copyErr)
+	}
+
+	return &types.GetNotificationsResp{Notifications: notifications}, nil
+}

app/user/cmd/api/internal/logic/pay/paymentlogic.go

@@ -8,12 +8,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
+	"math"
 	"qnc-server/app/user/cmd/api/internal/svc"
 	"qnc-server/app/user/cmd/api/internal/types"
 	"qnc-server/app/user/model"
 	"qnc-server/common/ctxdata"
 	"qnc-server/common/xerr"
 	"qnc-server/pkg/lzkit/crypto"
+	"time"
 )
 
 type PaymentLogic struct {
@@ -70,10 +72,29 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成订单, 获取用户信息失败: %+v", err)
 	}
+
+	currentTime := time.Now()
+
+	var mhour int
 	if user.Inside == 1 {
-		amount = 0.01
+		mhour = 0
 	} else {
-		amount = product.SellPrice
+		mhour = 12
+	}
+	// 设置时间范围：2025年1月1日中午12点到2025年1月2日中午12点
+	startTime := time.Date(2025, 1, 1, mhour, 0, 0, 0, time.Local)
+	endTime := time.Date(2025, 1, 2, 12, 0, 0, 0, time.Local)
+
+	if currentTime.After(startTime) && currentTime.Before(endTime) {
+		// 打两折
+		amount = product.SellPrice * 0.2
+		amount = math.Round(amount*100) / 100
+	} else {
+		if user.Inside == 1 {
+			amount = 0.01
+		} else {
+			amount = product.SellPrice
+		}
 	}
 	var createOrderErr error
 	if req.PayMethod == "wechatpay" {