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 }