From f7da9306eb62a7ccda30a002f2d4242c4e52cfa3 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 20 七月 2023 10:19:57 +0800
Subject: [PATCH] fix
---
api/v1/followRecord.go | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/api/v1/followRecord.go b/api/v1/followRecord.go
index 1da6277..497592f 100644
--- a/api/v1/followRecord.go
+++ b/api/v1/followRecord.go
@@ -6,7 +6,6 @@
"aps_crm/model/response"
"aps_crm/pkg/contextx"
"aps_crm/pkg/ecode"
- "aps_crm/service"
"github.com/gin-gonic/gin"
"strconv"
"time"
@@ -128,42 +127,42 @@
func checkFollowRecordParams(followRecord request.FollowRecord) (int, *model.FollowRecord) {
var followRecordModel model.FollowRecord
- if followRecord.ClientId != 0 {
- // check client exist
- if service.CheckClientExist(followRecord.ClientId) != ecode.OK {
- return ecode.ClientNotExist, &followRecordModel
- }
- }
-
- if followRecord.ContactId != 0 {
- // check contact exist
- if service.CheckContactExist(followRecord.ContactId) != ecode.OK {
- return ecode.ContactNotExist, &followRecordModel
- }
- }
-
- if followRecord.SalesLeadsId != 0 {
- // check sales leads exist
- if service.CheckSalesLeadsExist(followRecord.SalesLeadsId) != ecode.OK {
- return ecode.SalesLeadsNotExist, &followRecordModel
- }
- }
-
- // check member id
- if followRecord.MemberId == 0 {
- // todo check member exist
- return ecode.InvalidParams, &followRecordModel
- }
-
- // check number
- if followRecord.Number == "" {
- return ecode.InvalidParams, &followRecordModel
- }
-
- // check follow content
- if followRecord.Content == "" {
- return ecode.InvalidParams, &followRecordModel
- }
+ //if followRecord.ClientId != 0 {
+ // // check client exist
+ // if service.CheckClientExist(followRecord.ClientId) != ecode.OK {
+ // return ecode.ClientNotExist, &followRecordModel
+ // }
+ //}
+ //
+ //if followRecord.ContactId != 0 {
+ // // check contact exist
+ // if service.CheckContactExist(followRecord.ContactId) != ecode.OK {
+ // return ecode.ContactNotExist, &followRecordModel
+ // }
+ //}
+ //
+ //if followRecord.SalesLeadsId != 0 {
+ // // check sales leads exist
+ // if service.CheckSalesLeadsExist(followRecord.SalesLeadsId) != ecode.OK {
+ // return ecode.SalesLeadsNotExist, &followRecordModel
+ // }
+ //}
+ //
+ //// check member id
+ //if followRecord.MemberId == 0 {
+ // // todo check member exist
+ // return ecode.InvalidParams, &followRecordModel
+ //}
+ //
+ //// check number
+ //if followRecord.Number == "" {
+ // return ecode.InvalidParams, &followRecordModel
+ //}
+ //
+ //// check follow content
+ //if followRecord.Content == "" {
+ // return ecode.InvalidParams, &followRecordModel
+ //}
// check follow time
t, err := checkTimeFormat(followRecord.FollowTime)
@@ -200,8 +199,23 @@
// 妫�鏌ユ椂闂存牸寮�
func checkTimeFormat(t string) (time.Time, error) {
if t == "" {
- t = "1970-01-01 00:00:00"
+ t = "1970-01-01T00:00:00+08:00"
}
- return time.Parse("2006-01-02 15:04:05", t)
+ location, err := time.LoadLocation("Asia/Shanghai")
+ if err != nil {
+ return time.Time{}, err
+ }
+
+ tt, err := time.Parse("2006-01-02T15:04:05.000Z", t)
+ if err == nil {
+ return tt.In(location), nil
+ }
+
+ tt, err = time.Parse("2006-01-02T15:04:05-07:00", t)
+ if err == nil {
+ return tt.In(location), nil
+ }
+
+ return time.Time{}, err
}
--
Gitblit v1.8.0