更新

app/db/model/guide_order.go

@@ -22,4 +22,5 @@ type GuideOrder struct {
 	IsShare            int    `json:"is_share" xorm:"default 0 INT(1)"`
 	Ext                string `json:"ext" xorm:"VARCHAR(3000)"`
 	Gid                string `json:"gid" xorm:"VARCHAR(255)"`
+	TeamType           string `json:"team_type" xorm:"VARCHAR(255)"`
 }

app/task/svc/svc_tik_tok_csjp.go

@@ -5,6 +5,7 @@ import (
 	"applet/app/db/model"
 	offical "applet/app/db/official"
 	"applet/app/utils"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git/third_tikTok_team_goods"
 	"fmt"
 	"strings"
 	"time"
@@ -124,8 +125,8 @@ func OrdersTikTokGet(nextPositionIndex string, pageSize int, sTime, eTime int64,
 		"order_type": utils.IntToStr(distributionType),
 	}
 	//if cfg.Prd == false {
-	//	tikTokArgs["start_time"] = "2023-09-18 15:59:00"
-	//	tikTokArgs["end_time"] = "2023-09-18 16:02:00"
+	//	tikTokArgs["start_time"] = "1717150834"
+	//	tikTokArgs["end_time"] = "1717151434"
 	//}
 
 	order := CsjpOrder(tikTokArgs)
@@ -133,6 +134,7 @@ func OrdersTikTokGet(nextPositionIndex string, pageSize int, sTime, eTime int64,
 	list, ok := order["order"].([]map[string]string)
 
 	if ok {
+		ids := make([]int64, 0)
 		for _, v := range list {
 			if utils.StrToInt(v["uid"]) == 0 {
 				continue
@@ -177,6 +179,7 @@ func OrdersTikTokGet(nextPositionIndex string, pageSize int, sTime, eTime int64,
 				Img:            v["product_img"],
 				IsShare:        orderType,
 				Gid:            v["product_id"],
+				TeamType:       v["team_type"],
 			}
 			if utils.StrToInt(v["lm_js_time"]) > 0 {
 				ord.PlatformSettleTime = utils.StrToInt(v["lm_js_time"])
@@ -197,6 +200,14 @@ func OrdersTikTokGet(nextPositionIndex string, pageSize int, sTime, eTime int64,
 				}
 				db.ZhimengDb.Where("id=?", one.Id).AllCols().Update(ord)
 			}
+			if v["team_type"] == "novajo" {
+				ids = append(ids, utils.StrToInt64(ord.PvdOid))
+			}
+		}
+		if len(ids) > 0 {
+			tiktokTeamNovajoId := offical.SysCfgByKeyStr("tikTok_team_novajo_id")
+			tiktokTeamNovajoSecret := offical.SysCfgByKeyStr("tikTok_team_novajo_secret")
+			third_tikTok_team_goods.GetOrder(tiktokTeamNovajoId, tiktokTeamNovajoSecret, ids)
 		}
 		return &list, cursor, nil
 	}

app/task/svc/svc_tik_tok_task.go

@@ -64,17 +64,61 @@ func GetTaskDetail(appId string, tmp []int64) {
 		kujiangMap[utils.IntToStr(v.BookId)] = v
 	}
 	xinghes := map[string]string{
-		"7367316323904372772": "https://pan.baidu.com/s/1kf58ZCgI0BgCLQapMfrTbQ?pwd=cceg",
-		"7367710375317520399": "https://pan.baidu.com/s/1aEaDUhSM-4VDTxn40wXm3A?pwd=6e8b",
+		"7373480427329159203": "https://pan.baidu.com/s/1-OYIB1RmTXl3SeynP3Dy7Q?pwd=d2tx",
+		"7372912752035119144": "https://pan.baidu.com/s/1ICIGA5SBCXNwugJM3IxaoA?pwd=eae0",
+		"7372349272928403482": "https://pan.baidu.com/s/1zms9c0CG07-2kZVFKxYzVw?pwd=fie2",
+		"7372080132082778152": "https://pan.baidu.com/s/125VKEkXRa3FkgTdR7gqhvw?pwd=wrbx",
+		"7372009394361401344": "https://pan.baidu.com/s/1acDqOnZEfv6IIFEAUl5ffQ?pwd=1nyb",
+		"7372013980895985701": "https://pan.baidu.com/s/1azZYwHx1jWLjtz8gc2leFA?pwd=a53c",
+		"7371376162850750501": "https://pan.baidu.com/s/14vjCx7AKi0gIsljs-0XGuw?pwd=ib54",
+		"7371371539645661211": "https://pan.baidu.com/s/1Xy0x6qlQDjR7LIjkX01nGA?pwd=oik9",
+		"7371366982576308287": "https://pan.baidu.com/s/1VjwcogPOHuy25te9zEBERw?pwd=29sq",
+		"7371001858434793526": "https://pan.baidu.com/s/1lcXNSZ9z6be83v4UehkM-w?pwd=oy0r",
+		"7371001571926081590": "https://pan.baidu.com/s/1ETttvHJd2_fDNuJRuCaKsQ?pwd=dv28",
+		"7370904753900945460": "https://pan.baidu.com/s/1PVM9Jpaf93V_--0d1UW9Dg?pwd=bogh",
+		"7370911902962221119": "https://pan.baidu.com/s/1DQAvDk8zE0glH81TRvQhfg?pwd=ye4u",
+		"7370857345389297699": "https://pan.baidu.com/s/1MhJYTpXqUgPnOrJ2mvVClQ?pwd=mo78",
+		"7369875298587836455": "https://pan.baidu.com/s/1P5mGA0QKiRcHHgE1Bzz1cg?s4pn",
+		"7369875429492113419": "https: //pan.baidu.com/s/1ZHldm5KDXka_5arInJiDQw?pwd=avqw",
+		"7369888148781809698": "https://pan.baidu.com/s/1ErZRBvvMOQlaZcyuDHfB_g?pwd=lo2y",
+		"7369813564837642281": "https://pan.baidu.com/s/1-Ks0ArP_8mKIsNgDAqI7PA?pwd=d86a",
+		"7369751707867283506": "https://pan.baidu.com/s/14qOLJey1bWEA0pqFF6xhgw?pwd=5cmc",
+		"7369503459801956371": "https://pan.baidu.com/s/1vyXKrJeuvx5x4w-acbVa6A?pwd=qugd",
+		"7369391591624163364": "https://pan.baidu.com/s/1eM2tbZ8yj6zIDqovSO49_A?pwd=aqg2",
+		"7369392341066498111": "https://pan.baidu.com/s/12t76uMp_3sn8hdMDoXwppg?pwd=tpfe",
+		"7369148051795017740": "https://pan.baidu.com/s/13_S-8fE21nqSofjgx_rWKw?pwd=uns8",
+		"7369059651461283894": "https://pan.baidu.com/s/1Fqbpz35M8dwxX8tFhpyQhQ?pwd=uexq",
+		"7369037096285175808": "https://pan.baidu.com/s/1_Y2LnJeAG1-QJUCNegiKuA?pwd=jcjv",
+		"7368762632674803751": "https://pan.baidu.com/s/1bjiyXlw_sMQ9YR4YALu3ZQ?pwd=aic8",
+		"7368679769661079564": "https://pan.baidu.com/s/1Rrqm6C_VCP9pTLIiytJFew?pwd=0w3y",
+		"7368678622070489139": "https://pan.baidu.com/s/1ImxFZxOihIxmpKs7FQNC-A?pwd=6dgz",
+		"7368653781052981283": "https://pan.baidu.com/s/15jtQvEYxQujqY3C_zeE_fA?pwd=mcy5",
 		"7368329261691961371": "https://pan.baidu.com/s/171ZRDKRRU3aP7ZMBDy0vsQ?pwd=sipq",
+		"7368324603678031882": "https://pan.baidu.com/s/1B5Qh3vs3Ivfk8rTLCc1tng?pwd=emws",
+		"7367710375317520399": "https://pan.baidu.com/s/1aEaDUhSM-4VDTxn40wXm3A?pwd=6e8b",
+		"7367316323904372772": "https://pan.baidu.com/s/1kf58ZCgI0BgCLQapMfrTbQ?pwd=cceg",
 		"7366906746314555404": "https://pan.baidu.com/s/1MNfbPba3Nt2pTnHTfBUEBA?pwd=ew3v",
+		"7366486018851209235": "https://pan.baidu.com/s/1QWF63ao80TT3BAMV0-QpRA?pwd=rcs5",
+		"7366151010714157097": "https://pan.baidu.com/s/1055EkwtBxPM0Sw6L5gOCFw?pwd=1sq9",
 		"7366102746245726248": "https://pan.baidu.com/s/1WzXSrkemz0Hm0DTNcmTpxA?pwd=y2j0",
 		"7365004815451062312": "https://pan.baidu.com/s/1q2XYO3GraSEvdX2F3JcX4Q?pwd=glby",
+		"7364352540936290358": "https://pan.baidu.com/s/11JDyHl97egRjDKxnH9D7rQ?pwd=mr0l",
+		"7363525995279745035": "https://pan.baidu.com/s/1te89FR6rULnXV7g5BaRIPA?pwd=hx47",
+		"7363532419464429619": "https://pan.baidu.com/s/1JBXBddSdLeZn-BOFYCjQrA?pwd=y1iu",
+		"7363505120711098368": "https://pan.baidu.com/s/1iAP5OSU46CFz0vyOYGOBCA?pwd=ft2t",
+		"7363505153716125731": "https://pan.baidu.com/s/1Lpuc4iUBWxndb1xTcRoicQ?pwd=390v",
+		"7363505437439918121": "https://pan.baidu.com/s/1Y_RnixE05gaMptBrhC0DQw?pwd=n3ni",
 		"7363157598629068819": "https://pan.baidu.com/s/1NPtnl5EBK7jRRgk7kSStPg?pwd=86p6",
+		"7363157659111211027": "https://pan.baidu.com/s/1PO8ulobc-54is1QBikJSEQ?pwd=gfek",
 		"7362021099053383714": "https://pan.baidu.com/s/19mqfaAt5zovNO1sb0e-bxw?pwd=qae9",
+		"7361723753094610980": "https://pan.baidu.com/s/1oybfSKC4FUWGw81DH6wqXw?pwd=a83p",
+		"7361713709670006810": "https://pan.baidu.com/s/1r0EAT_q6DKFatnbwXZfeTw?pwd=7h74",
 		"7361659856501129279": "https://pan.baidu.com/s/1XtOabN5ZGsxG9x_CjF2Aig?pwd=ztet",
-		"7361209400553521167": "https://pan.baidu.com/s/10BSo8P9wcxgYa-Li3dUiGA?pwd=6vlf",
+		"7361314021947015222": "https://pan.baidu.com/s/1Wq3RyPsSUw1PBXqPD7nHCA?pwd=hxip",
 		"7360937011936510006": "https://pan.baidu.com/s/1WlN5HLmcaADy0jGdiCaGFQ?pwd=tiwb",
+		"7359423244304269350": "https://pan.baidu.com/s/1_c4cXt25ky2yDOXm2kmL5A?pwd=bcrq",
+		"7359058838047162368": "https://pan.baidu.com/s/1HkBnlRR27JBKsQheTJxmcQ?pwd=3kcd",
+		"7358681447030390784": "https://pan.baidu.com/s/1oWMuF5itpF77lls_vSGqJA?pwd=p3wc",
 		"7358322670871576616": "https://pan.baidu.com/s/13RET87iAbgZlj-jn5mUwUg?pwd=y9rd",
 		"7357194974695391268": "https://pan.baidu.com/s/1cBU9PIXW99Y5W1XhvdPIpA?pwd=uxc6",
 		"7356840659325583414": "https://pan.baidu.com/s/1znMbDDAnIRQ7PwtiznOvTQ?pwd=9nj7",

go.mod

@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20230707081910-52e70aa52998
-	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240308071437-64a50844e720
+	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240531095238-f42743eb0c52
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5
 	github.com/boombuler/barcode v1.0.1