添加套餐标签生成

src/main/java/com/platomix/userprofile/handler/core/XxhTagHandler.java

@@ -43,11 +43,14 @@ public class XxhTagHandler extends AbstractTagHandler{
 		StrBuilder sqlBuilder = new StrBuilder();
 		sqlBuilder.appendLn(super.buildTableSql(ZT_TABLE_NAME, "MONTH_ID", "DEVICE_NUMBER"));
 		sqlBuilder.append("select ").append("'"+month+"'").appendLn(" as MONTH_ID,").append("DEVICE_NUMBER,");
-		int year = LocalDate.now().getYear();
 		
 		//大网标签-入网时长
-		appendTagIntime(year, sqlBuilder, tagListMap);
-		sqlBuilder.appendLn(",");
+		appendTagIntime(sqlBuilder, tagListMap);
+		sqlBuilder.appendLn(",");	
+		
+		//大网标签-套餐
+		String taocanSql = userprofileTagService.genSelectSql("套餐", "PRODUCT_CLASS_DESC", null, null);
+		sqlBuilder.append(taocanSql).appendLn(",");
 		
 		//大网标签-套餐价格
 		appendTagPackagePic(sqlBuilder, tagListMap);
@@ -101,7 +104,7 @@ public class XxhTagHandler extends AbstractTagHandler{
 	 * 入网时长
 	 * @return
 	 */
-	public void appendTagIntime(int year, StrBuilder sqlBuilder, Map<String, List<UserprofileTag>> tagListMap) {
+	public void appendTagIntime(StrBuilder sqlBuilder, Map<String, List<UserprofileTag>> tagListMap) {
 		/**
 		 * (case when (${yearStr}- floor(INNET_MONTHS*0.0001))>=20 then 'A112_07_001'
 			when  (${yearStr}- floor(INNET_MONTHS*0.0001))>=10 and (2020- floor(INNET_MONTHS*0.0001))<20 then 'A112_07_002'
@@ -111,6 +114,7 @@ public class XxhTagHandler extends AbstractTagHandler{
 			when  (${yearStr}- floor(INNET_MONTHS*0.0001))<1 and (2020- floor(INNET_MONTHS*0.0001))>=0 then 'A112_07_006'
 			else 'A112_07_007' end) TAG_INTIME ,
 		 */
+		int year = LocalDate.now().getYear();
 		String function = "("+year+" - floor(INNET_MONTHS*0.0001))";
 		
 		String sql = genBucketSql("tag_intime", function, function, tagListMap.get("tag_intime"));