|
|
@@ -96,8 +96,14 @@ func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.Activ
|
|
|
var amOrPm string
|
|
|
if havePm {
|
|
|
//前端传过来的是 2：00PM 这里转成 14:00 PM
|
|
|
- resultTime = resultTime.Add(12 * time.Hour)
|
|
|
- activityTime = resultTime.Format(utils.FormatDateTime)
|
|
|
+ slicePm := strings.Split(v.TitmeHM, ":")
|
|
|
+ for sk, sv := range slicePm {
|
|
|
+ // 如果是中午 12:30 PM 就不做任何处理
|
|
|
+ if sk == 0 && sv != "12" {
|
|
|
+ resultTime = resultTime.Add(12 * time.Hour)
|
|
|
+ activityTime = resultTime.Format(utils.FormatDateTime)
|
|
|
+ }
|
|
|
+ }
|
|
|
amOrPm = "PM"
|
|
|
} else {
|
|
|
amOrPm = "AM"
|
xingzai