已签收

db/logistics.go

@@ -180,6 +180,7 @@ func GetRegion(ctx context.Context, regionCode int) string {
 	cityCode := conv.MustString(regionCode, "")[0:4] + "00"
 	var city *gorm_model.InfoRegion
 	db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(cityCode, 0)).First(&city)
+	fmt.Printf(province.RegionName + city.RegionName + infoRegion.RegionName)
 	return province.RegionName + city.RegionName + infoRegion.RegionName
 }
 

db/sectask.go

@@ -44,8 +44,10 @@ func GetSecTaskList(ctx context.Context, selectionId string, taskStatus int, sea
 		taskStages = []int{6}
 		break
 	case 7:
-		taskStages = []int{7, 8, 9, 10}
+		taskStages = []int{7}
 		break
+	case 8:
+		taskStages = []int{8, 9, 10}
 	case 9:
 		taskStages = []int{9}
 		break
@@ -71,16 +73,15 @@ func GetSecTaskList(ctx context.Context, selectionId string, taskStatus int, sea
 		return nil, 0, err
 	}
 
-	fmt.Println("secTaskInfoList：", &secTaskInfoList)
+	fmt.Printf("secTaskInfoList：%+v", secTaskInfoList)
 	newSecTaskInfoList := pack.GormSecTaskListToHttpSecTaskList(secTaskInfoList)
-	fmt.Println("newSecTaskInfoList：", &newSecTaskInfoList)
+	fmt.Printf("newSecTaskInfoList：%+v", newSecTaskInfoList)
 
-	for i, secTask := range newSecTaskInfoList {
-		if secTask.RegionCode != 0 {
-			newSecTaskInfoList[i].DetailAddr = GetRegion(ctx, secTask.RegionCode)
-		}
-		newSecTaskInfoList[i].DetailAddr += secTask.DetailAddr
-	}
+	//for i, secTask := range newSecTaskInfoList {
+	//	if secTask.RegionCode != 0 {
+	//		newSecTaskInfoList[i].DetailAddr = GetRegion(ctx, secTask.RegionCode) + newSecTaskInfoList[i].DetailAddr
+	//	}
+	//}
 	var resSecTaskInfoList []*http_model.SecTaskInfo
 	if searchValue != "" {
 		for _, v := range newSecTaskInfoList {
@@ -95,7 +96,7 @@ func GetSecTaskList(ctx context.Context, selectionId string, taskStatus int, sea
 	} else {
 		resSecTaskInfoList = newSecTaskInfoList
 	}
-	fmt.Println("resSecTaskInfoList: ", resSecTaskInfoList)
+	fmt.Println("resSecTaskInfoList: ", &resSecTaskInfoList)
 	return resSecTaskInfoList, total, nil
 }