From d5ffbbd7d6b4c69164ea6a0d7ee4b35376b5b414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= <zi__mm@163.com>
Date: Mon, 17 Mar 2025 10:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=93=E5=B1=95=E5=8F=82=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/biz/cmb.go                  | 29 +++++++++++++++++++---
 internal/pkg/helper/datetime.go      |  2 +-
 internal/pkg/helper/datetime_test.go | 37 ++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/internal/biz/cmb.go b/internal/biz/cmb.go
index 8cc21ba..f1dcde6 100644
--- a/internal/biz/cmb.go
+++ b/internal/biz/cmb.go
@@ -3,6 +3,7 @@ package biz
 import (
 	"context"
 	"fmt"
+	"github.com/go-kratos/kratos/v2/log"
 	"time"
 	err2 "voucher/api/err"
 	v1 "voucher/api/v1"
@@ -112,6 +113,24 @@ func (v *VoucherBiz) CmbProductQuery(ctx context.Context, productNo string) (rep
 			return fmt.Errorf("批次号:%s,微信错误返回:%v", product.BatchNo, err)
 		}
 
+		log.Warnf("微信查询券详情返回:%v", wechatResp)
+
+		inputFormat := time.RFC3339
+
+		beginTime := ""
+		if wechatResp.AvailableBeginTime != nil {
+			// 解析开始时间
+			availableBeginTime, _ := time.Parse(inputFormat, *wechatResp.AvailableBeginTime)
+			beginTime = availableBeginTime.Format(time.DateTime)
+		}
+
+		endTime := ""
+		if wechatResp.AvailableEndTime != nil {
+			// 解析结束时间
+			availableEndTime, _ := time.Parse(inputFormat, *wechatResp.AvailableEndTime)
+			endTime = availableEndTime.Format(time.DateTime)
+		}
+
 		reps = &v1.CmbQueryProductReply{
 			RespCode:       vo.CmbResponseStatusSuccess.GetValue(),
 			RespMsg:        "成功",
@@ -121,8 +140,8 @@ func (v *VoucherBiz) CmbProductQuery(ctx context.Context, productNo string) (rep
 			MinAmount:      "",
 			AvailableType:  "",
 			AvailableDays:  "", // 动态有效期天数
-			StartTime:      *wechatResp.AvailableBeginTime,
-			EndTime:        *wechatResp.AvailableEndTime,
+			StartTime:      beginTime,
+			EndTime:        endTime,
 			AvailableStock: "",
 			Detail:         *wechatResp.Description,
 		}
@@ -134,10 +153,12 @@ func (v *VoucherBiz) CmbProductQuery(ctx context.Context, productNo string) (rep
 		reps.AvailableStock = fmt.Sprintf("%d", availableStock)
 
 		if wechatResp.StartTime != nil {
-			reps.SaleStartTime = *wechatResp.StartTime
+			s, _ := time.Parse(inputFormat, *wechatResp.StartTime)
+			reps.SaleStartTime = s.Format(time.DateTime)
 		}
 		if wechatResp.StopTime != nil {
-			reps.SaleEndTime = *wechatResp.StopTime
+			e, _ := time.Parse(inputFormat, *wechatResp.StopTime)
+			reps.SaleEndTime = e.Format(time.DateTime)
 		}
 
 		reps.AvailableType = vo.CmbAvailableTypeFixed.GetValue()
diff --git a/internal/pkg/helper/datetime.go b/internal/pkg/helper/datetime.go
index c89cd50..e067c31 100755
--- a/internal/pkg/helper/datetime.go
+++ b/internal/pkg/helper/datetime.go
@@ -32,7 +32,7 @@ func Parse(inputTime string) (time.Time, error) {
 		return time.Time{}, err
 	}
 	// 解析时间字符串并指定时区
-	parsedTime, err := time.ParseInLocation("2006-01-02 15:04:05", inputTime, loc)
+	parsedTime, err := time.ParseInLocation(DefaultFormatLayout, inputTime, loc)
 	if err != nil {
 		return time.Time{}, err
 	}
diff --git a/internal/pkg/helper/datetime_test.go b/internal/pkg/helper/datetime_test.go
index 4d2546a..5c5d61f 100644
--- a/internal/pkg/helper/datetime_test.go
+++ b/internal/pkg/helper/datetime_test.go
@@ -1,7 +1,9 @@
 package helper
 
 import (
+	"fmt"
 	"testing"
+	"time"
 )
 
 func TestParse(t *testing.T) {
@@ -64,3 +66,38 @@ func TestIsInSameNaturalMonth(t *testing.T) {
 	b := IsInSameNaturalMonth(startTime, endTime)
 	t.Log(b) // false
 }
+
+func TestRFC3339(t *testing.T) {
+	// 输入的时间字符串
+	availableBeginTimeStr := "2025-03-07T00:00:00+08:00"
+	availableEndTimeStr := "2025-06-05T23:59:59+08:00"
+
+	// 定义输入时间字符串的格式
+	inputFormat := time.RFC3339
+
+	// 解析开始时间
+	availableBeginTime, err := time.Parse(inputFormat, availableBeginTimeStr)
+	if err != nil {
+		fmt.Printf("解析开始时间出错: %v\n", err)
+		return
+	}
+
+	// 解析结束时间
+	availableEndTime, err := time.Parse(inputFormat, availableEndTimeStr)
+	if err != nil {
+		fmt.Printf("解析结束时间出错: %v\n", err)
+		return
+	}
+
+	// 定义输出时间的格式
+	outputFormat := "2006-01-02 15:04:05"
+
+	// 格式化开始时间
+	formattedBeginTime := availableBeginTime.Format(outputFormat)
+	// 格式化结束时间
+	formattedEndTime := availableEndTime.Format(outputFormat)
+
+	// 输出格式化后的时间
+	fmt.Printf("格式化后的开始时间: %s\n", formattedBeginTime)
+	fmt.Printf("格式化后的结束时间: %s\n", formattedEndTime)
+}