From 055d0e6f4808e0ab04c83abd5f44a9468f4c50ee Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Tue, 30 Jul 2024 17:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/svc/svc_order_track_save.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/svc/svc_order_track_save.go b/app/svc/svc_order_track_save.go index a17825f..64ef76d 100644 --- a/app/svc/svc_order_track_save.go +++ b/app/svc/svc_order_track_save.go @@ -64,6 +64,7 @@ func commCheckUser(eg *xorm.Engine, existOrd model.OrdList, ords map[string]md.O return } existOrd.BenefitAll = utils.FloatFormat(existOrd.BenefitAll, 2) + pvdList1 := []string{md.PVD_ELM, md.PVD_T3_CAR, md.PVD_WALLACE, md.PVD_TOURISM, md.PVD_DELIVERY, md.PVD_NEAR, md.PVD_FLOWERCAKE, md.PVD_PIZZA, md.PVD_HWMOVIE, md.PVD_CINEMA, md.PVD_KFC, md.PVD_HEYTEA, md.PVD_BURGERKING, md.PVD_STARBUCKS, md.PVD_MCDONALD, md.PVD_NAYUKI, md.PVD_LUCKIN, md.PVD_TO_KFC, md.PVD_PAGODA, md.PVD_KING_FLOWER, md.PVD_DIDI_ONLINE_CAR, md.PVD_DIDI_FREIGHT, md.PVD_DIDI_ENERGY, md.PVD_OILSTATION, md.PVD_DIDI_CHAUFFEUR} pvdList := []string{"tik_tok_team_order", md.PVD_JDOwn, md.PVD_JD, "csjp", "csjp_live", md.PVD_TIKTOKLIFE, md.PVD_ELM, md.PVD_STATIONMEITUANLM, md.PVD_MEITUANLMSTART, md.PVD_MEITUANLM, md.PVD_MEITUAN, md.PVD_T3_CAR, md.PVD_WALLACE, md.PVD_TOURISM, md.PVD_DELIVERY, md.PVD_NEAR, md.PVD_FLOWERCAKE, md.PVD_TIKTOK, md.PVD_PIZZA, md.PVD_TIKTOKLIVE, md.PVD_KUAISHOU, md.PVD_KUAISHOULIVE, md.PVD_MEITUAN, md.PVD_MEITUANLM, md.PVD_CINEMA, md.PVD_KFC, md.PVD_HEYTEA, md.PVD_BURGERKING, md.PVD_STARBUCKS, md.PVD_MCDONALD, md.PVD_NAYUKI, md.PVD_LUCKIN, md.PVD_TO_KFC, md.PVD_PAGODA, md.PVD_KING_FLOWER, md.PVD_DIDI_ONLINE_CAR, md.PVD_DIDI_FREIGHT, md.PVD_DIDI_ENERGY, md.PVD_OILSTATION, md.PVD_DIDI_CHAUFFEUR} fmt.Println("===============================111111111111111111111111111111") fmt.Println((existOrd.Uid == 0 && pid != "" && pidToUser[pid] != nil && (pvd == md.PVD_TB || pvd == "ele"))) @@ -96,6 +97,11 @@ func commCheckUser(eg *xorm.Engine, existOrd model.OrdList, ords map[string]md.O isTikTokTrue = true } } + isTodelete := false + if (existOrd.BenefitAll == 0 && ords[existOrd.PvdOid].Commission > 0) && utils.InArr(pvd, pvdList1) { + isCheck = true + isTodelete = true + } if isTikTokTrue || (pvd == md.PVD_VIP && existOrd.BenefitAll > 0 && isVipSet == 1 && (existOrd.UserCommission == 0 || relateAmount == 0)) || (existOrd.Uid == 0 && pid != "" && pidToUser[pid] != nil && (pvd == md.PVD_TB || pvd == "ele")) || ((pvd == md.PVD_TB12 || pvd == md.PVD_TB13 || pvd == md.PVD_TB14 || pvd == md.PVD_TB3 || pvd == md.PVD_TB || pvd == md.PVD_TBBYPAY || pvd == md.PVD_TBBYCREATETIME || pvd == md.PVD_TBBYSETTLE || pvd == md.PVD_JD || pvd == md.PVD_VIP || pvd == md.PVD_PDD || pvd == md.PVD_ELM) && (existOrd.BenefitAll != ords[existOrd.PvdOid].Commission || (ords[existOrd.PvdOid].Commission == 0 && existOrd.UserCommission > 0))) || ((existOrd.BenefitAll != ords[existOrd.PvdOid].Commission || existOrd.BenefitAll == 0) && utils.InArr(pvd, pvdList)) || isCheck == true { if !strings.Contains(pid, "cloud") && !strings.Contains(pid, "share") && !strings.Contains(pid, "self") && !strings.Contains(pid, "free") && !strings.Contains(pid, "actself") && !strings.Contains(pid, "wechatactselfnew") && !strings.Contains(pid, "wechatactself") && !strings.Contains(pid, "wechatactshare") { return @@ -287,6 +293,9 @@ func commCheckUser(eg *xorm.Engine, existOrd model.OrdList, ords map[string]md.O if isTikTokTrue || (pvd == md.PVD_VIP && oldBenefitAll > 0 && isVipSet == 1 && (oldUserCommission == 0 || relateAmount == 0)) || ((oldBenefitAll != ords[existOrd.PvdOid].Commission) || (oldUserCommission > 0 && ords[existOrd.PvdOid].Commission == 0)) || ((oldBenefitAll != ords[existOrd.PvdOid].Commission || oldBenefitAll == 0) && utils.InArr(pvd, pvdList)) { isDelete = true } + if isTodelete { + isDelete = true + } if existOrd.IsFastSign > 0 { isDelete = false }