xg

api/internal/service/CoopHistoryService.go

@@ -64,43 +64,6 @@ func GetPrList(req *types.CoopHistoryReq) (result []*ResultData, size_1, size_2,
 	// firstparty：甲方 supplier：供应商 adiffb：同甲异业 middleman：中间人 agency：招标代理机构 sup_sub: 上下级
 	// 1、同甲异业数据/ 3、招标代理机构渠道
 	if pTmp.BuyerId != "" {
-		r1, r2 := GetData(propertyForm, pTmp.BuyerId)
-		if r1 != nil && len(r1) > 0 {
-			size_1 = int64(len(r1))
-			if req.ChannelType == "0" || req.ChannelType == "1" {
-				for _, m := range r1 {
-					near, zbtime := LastTimeCoop(pTmp.BuyerId, common.ObjToString(m["name"]), "adiffb")
-					tmp := ResultData{
-						SourceType:  "adiffb",
-						EntName:     common.ObjToString(m["name"]),
-						ProjectNum:  common.IntAll(m["coop_size"]),
-						TotalAmount: common.Float64All(m["coop_amount"]),
-						RecentTime:  zbtime,
-						NearlyYears: near,
-						BuyerId:     pTmp.BuyerId,
-					}
-					result = append(result, &tmp)
-				}
-			}
-		}
-		if r2 != nil && len(r2) > 0 {
-			size_3 = int64(len(r2))
-			if req.ChannelType == "0" || req.ChannelType == "3" {
-				for _, m := range r2 {
-					near, zbtime := LastTimeCoop(pTmp.BuyerId, common.ObjToString(m["name"]), "agency")
-					tmp := ResultData{
-						SourceType:  "agency",
-						EntName:     common.ObjToString(m["name"]),
-						ProjectNum:  common.IntAll(m["coop_size"]),
-						TotalAmount: common.Float64All(m["coop_amount"]),
-						RecentTime:  zbtime,
-						NearlyYears: near,
-						BuyerId:     pTmp.BuyerId,
-					}
-					result = append(result, &tmp)
-				}
-			}
-		}
 		// 中间人可介绍业主
 		var r3 []map[string]interface{}
 		r3 = FindMiddleman([]string{fmt.Sprintf("'%s'", pTmp.BuyerId)}, req.PositionId, r3)
@@ -139,7 +102,43 @@ func GetPrList(req *types.CoopHistoryReq) (result []*ResultData, size_1, size_2,
 				}
 			}
 		}
-
+		r1, r2 := GetData(propertyForm, pTmp.BuyerId)
+		if r1 != nil && len(r1) > 0 {
+			size_1 = int64(len(r1))
+			if req.ChannelType == "0" || req.ChannelType == "1" {
+				for _, m := range r1 {
+					near, zbtime := LastTimeCoop(pTmp.BuyerId, common.ObjToString(m["name"]), "adiffb")
+					tmp := ResultData{
+						SourceType:  "adiffb",
+						EntName:     common.ObjToString(m["name"]),
+						ProjectNum:  common.IntAll(m["coop_size"]),
+						TotalAmount: common.Float64All(m["coop_amount"]),
+						RecentTime:  zbtime,
+						NearlyYears: near,
+						BuyerId:     pTmp.BuyerId,
+					}
+					result = append(result, &tmp)
+				}
+			}
+		}
+		if r2 != nil && len(r2) > 0 {
+			size_3 = int64(len(r2))
+			if req.ChannelType == "0" || req.ChannelType == "3" {
+				for _, m := range r2 {
+					near, zbtime := LastTimeCoop(pTmp.BuyerId, common.ObjToString(m["name"]), "agency")
+					tmp := ResultData{
+						SourceType:  "agency",
+						EntName:     common.ObjToString(m["name"]),
+						ProjectNum:  common.IntAll(m["coop_size"]),
+						TotalAmount: common.Float64All(m["coop_amount"]),
+						RecentTime:  zbtime,
+						NearlyYears: near,
+						BuyerId:     pTmp.BuyerId,
+					}
+					result = append(result, &tmp)
+				}
+			}
+		}
 	}
 	return
 }