From 1cb90ef6f3ef720226eb7c31567e53686a49e530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= Date: Tue, 18 Mar 2025 10:50:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=89=B9=E6=AC=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/cmb.go | 12 ++---------- internal/biz/order.go | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/internal/biz/cmb.go b/internal/biz/cmb.go index a09c6b5..c5c121b 100644 --- a/internal/biz/cmb.go +++ b/internal/biz/cmb.go @@ -133,22 +133,14 @@ func (v *VoucherBiz) CmbProductQuery(ctx context.Context, productNo string) (rep // 解析开始时间 availableBeginTime, _ := time.Parse(inputFormat, *wechatResp.AvailableBeginTime) reps.StartTime = availableBeginTime.Format(time.DateTime) + reps.SaleStartTime = reps.StartTime } if wechatResp.AvailableEndTime != nil { // 解析结束时间 availableEndTime, _ := time.Parse(inputFormat, *wechatResp.AvailableEndTime) reps.EndTime = availableEndTime.Format(time.DateTime) - } - - if wechatResp.StartTime != nil { - s, _ := time.Parse(inputFormat, *wechatResp.StartTime) - reps.SaleStartTime = s.Format(time.DateTime) - } - - if wechatResp.StopTime != nil { - e, _ := time.Parse(inputFormat, *wechatResp.StopTime) - reps.SaleEndTime = e.Format(time.DateTime) + reps.SaleEndTime = reps.EndTime } reps.Amount = fmt.Sprintf("%d", *wechatResp.StockUseRule.FixedNormalCoupon.CouponAmount) diff --git a/internal/biz/order.go b/internal/biz/order.go index 3e544db..6585a27 100644 --- a/internal/biz/order.go +++ b/internal/biz/order.go @@ -53,8 +53,8 @@ func (v *VoucherBiz) orderRetry(ctx context.Context, order *bo.OrderBo) error { voucherNo, err := v.WechatCpnRepo.Order(ctx, order) if err != nil { - if err2 := v.fail(ctx, order, err.Error()); err2 != nil { - return err2 + if err3 := v.fail(ctx, order, err.Error()); err3 != nil { + return err3 } return err }