Browse Source

创建商品订单

kobe6258 5 months ago
parent
commit
a9382967ac

+ 4 - 1
domian/report/ht_report_service.go

@@ -51,10 +51,13 @@ func GetHTReportIdsByPermissionIdsWithRiskLevel(permissionIds []int, riskLevel s
 	//现加入没有产品的报告
 	productList, err = productDao.GetProductListBySourceIds(ids, productDao.Report)
 	for _, report := range reports {
+		find := false
 		for _, product := range productList {
 			if product.SourceID == report.ID {
-				continue
+				find = true
 			}
+		}
+		if !find {
 			orgIds = append(orgIds, report.OrgID)
 		}
 	}

+ 8 - 8
service/media/media_service.go

@@ -88,11 +88,11 @@ func RangeSearchByAnalyst(mediaType string, analystId int, userId int) (total in
 	}
 	//获取产品风险等级
 	if userProfile.RiskLevel == user.RiskUnTest {
-		logger.Error("客户未做风险等级测评,mobile:%d", userProfile.Mobile)
+		logger.Error("客户未做风险等级测评,mobile:%v", userProfile.Mobile)
 		return
 	}
 	if userProfile.RiskLevelStatus == user.RiskExpired {
-		logger.Error("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+		logger.Error("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 		return
 	}
 	mapping, mappingErr := permissionService.GetRiskMappingByCustomerRiskLevel(userProfile.RiskLevel)
@@ -130,11 +130,11 @@ func RangeSearch(mediaType string, isLogin bool, userId int) (total int64, lates
 		}
 		//获取产品风险等级
 		if userProfile.RiskLevel == user.RiskUnTest {
-			logger.Error("客户未做风险等级测评,mobile:%d", userProfile.Mobile)
+			logger.Error("客户未做风险等级测评,mobile:%v", userProfile.Mobile)
 			return
 		}
 		if userProfile.RiskLevelStatus == user.RiskExpired {
-			logger.Error("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+			logger.Error("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 			return
 		}
 		mapping, mappingErr := permissionService.GetRiskMappingByCustomerRiskLevel(userProfile.RiskLevel)
@@ -188,11 +188,11 @@ func GetTotalPageCountByPermissionIds(mediaType string, permissionIds []int, isL
 		}
 		//获取产品风险等级
 		if userProfile.RiskLevel == user.RiskUnTest {
-			logger.Error("客户未做风险等级测评,mobile:%d", userProfile.Mobile)
+			logger.Error("客户未做风险等级测评,mobile:%v", userProfile.Mobile)
 			return
 		}
 		if userProfile.RiskLevelStatus == user.RiskExpired {
-			logger.Error("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+			logger.Error("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 			return
 		}
 		mapping, mappingErr := permissionService.GetRiskMappingByCustomerRiskLevel(userProfile.RiskLevel)
@@ -321,12 +321,12 @@ func matchRiskLevel(userId int, media mediaService.MediaDTO) (riskLevelMatch str
 	}
 	//比较风险等级
 	if userProfile.RiskLevelStatus == user.RiskUnTest {
-		logger.Info("客户风险等级未测试,mobile:%d", userProfile.Mobile)
+		logger.Info("客户风险等级未测试,mobile:%v", userProfile.Mobile)
 		riskLevelMatch = RiskLevelUnTest
 		return
 	}
 	if userProfile.RiskLevelStatus == user.RiskExpired {
-		logger.Info("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+		logger.Info("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 		riskLevelMatch = RiskLevelExpired
 		return
 	}

+ 5 - 5
service/report/report_service.go

@@ -106,7 +106,7 @@ func matchRiskLevel(userId int, report reportService.ReportDTO) (riskLevelMatch
 		return
 	}
 	if userProfile.RiskLevelStatus == user.RiskExpired {
-		logger.Info("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+		logger.Info("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 		riskLevelMatch = RiskLevelExpired
 		return
 	}
@@ -445,11 +445,11 @@ func RangeSearchByAnalyst(analystName string, userId int) (total int64, latestId
 	}
 	//获取产品风险等级
 	if userProfile.RiskLevel == user.RiskUnTest {
-		logger.Error("客户未做风险等级测评,mobile:%d", userProfile.Mobile)
+		logger.Error("客户未做风险等级测评,mobile:%v", userProfile.Mobile)
 		return
 	}
 	if userProfile.RiskLevelStatus == user.RiskExpired {
-		logger.Error("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+		logger.Error("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 		return
 	}
 	mapping, mappingErr := permissionService.GetRiskMappingByCustomerRiskLevel(userProfile.RiskLevel)
@@ -1019,11 +1019,11 @@ func checkUserRisk(permissionIds []int, isLogin bool, userId int) (filterPermiss
 		}
 		//获取产品风险等级
 		if userProfile.RiskLevel == user.RiskUnTest {
-			logger.Error("客户未做风险等级测评,mobile:%d", userProfile.Mobile)
+			logger.Error("客户未做风险等级测评,mobile:%v", userProfile.Mobile)
 			return
 		}
 		if userProfile.RiskLevelStatus == user.RiskExpired {
-			logger.Error("客户风险等级已过期,mobile:%d", userProfile.Mobile)
+			logger.Error("客户风险等级已过期,mobile:%v", userProfile.Mobile)
 			return
 		}
 		mapping, mappingErr := permissionService.GetRiskMappingByCustomerRiskLevel(userProfile.RiskLevel)