|
|
@@ -51,12 +51,12 @@ func ConvertActivityTitmeYMD(TitmeYMD string) (titmeYMDNew string) {
|
|
|
func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
|
|
|
titmeHMNew = titmeHM
|
|
|
var hNum int
|
|
|
- //var amOrPm string
|
|
|
+ var amOrPm string
|
|
|
if strings.Contains(titmeHM, "PM") {
|
|
|
hNum = 12
|
|
|
- //amOrPm = "PM"
|
|
|
+ amOrPm = "PM"
|
|
|
} else {
|
|
|
- //amOrPm = "AM"
|
|
|
+ amOrPm = "AM"
|
|
|
}
|
|
|
titmeHM = strings.Replace(titmeHM, "AM", "", -1)
|
|
|
titmeHM = strings.Replace(titmeHM, "PM", "", -1)
|
|
|
@@ -66,7 +66,7 @@ func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
|
|
|
}
|
|
|
hourNum, _ := strconv.Atoi(sliceHm[0])
|
|
|
minute := sliceHm[1]
|
|
|
- titmeHMNew = strconv.Itoa(hNum+hourNum) + ":" + minute
|
|
|
+ titmeHMNew = strconv.Itoa(hNum+hourNum) + ":" + minute + amOrPm
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -82,7 +82,8 @@ func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.Activ
|
|
|
v.TitmeYMD = strings.Replace(v.TitmeYMD, "年", "-", -1)
|
|
|
v.TitmeYMD = strings.Replace(v.TitmeYMD, "月", "-", -1)
|
|
|
v.TitmeYMD = strings.Replace(v.TitmeYMD, "日", " ", -1)
|
|
|
- ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{TIME}}", v.TitmeYMD+v.TitmeHM, -1)
|
|
|
+ weeknum := utils.StrDateTimeToWeek(v.TitmeYMD + " 00:00:00")
|
|
|
+ ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{TIME}}", v.TitmeYMD+"("+weeknum+")"+v.TitmeHM, -1)
|
|
|
if utils.CheckStrHaveLetter(company) {
|
|
|
ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{LANGUAGE}}", "中文", -1)
|
|
|
} else {
|
xingzai