|
@@ -96,7 +96,7 @@ public class XxhOrderTagHandler extends AbstractTagHandler {
|
|
|
sqlBuilder.append(belongToSql).appendLn(",");
|
|
|
|
|
|
//权益领取
|
|
|
- String vipSql = userprofileTagService.genSelectSql("权益领取", "VIP_SPNAME", "VIPID", null);
|
|
|
+ String vipSql = userprofileTagService.genSelectSql("权益领取", "VIP_PTYPE", "VIP_PTYPE", null);
|
|
|
sqlBuilder.append(vipSql).appendLn(",");
|
|
|
|
|
|
//渠道大类
|
|
@@ -145,7 +145,7 @@ public class XxhOrderTagHandler extends AbstractTagHandler {
|
|
|
"with toDate(concat(SUBSTRING(toString(THEMONTH),1,4),'-' ,SUBSTRING(toString(THEMONTH),5,2),'-01')) as mstr").appendLn(
|
|
|
"select THEMONTH ,USERID,PROVINCE,AREA,ORDERTIME,CANCELTIME,ENDTIME,").appendLn(
|
|
|
"ifNull(CHANNEL,'') as CHANNEL ,BELONGTO,").appendLn(
|
|
|
- "s1.CPID,SPID,SPNAME ,d.CPTYPE ,d.CATEGORYNAME,d.CPTYPE2 ,d.CATEGORYNAME2 ,VIPID, VIP_SPNAME,MAXFLOW,PRICE,").appendLn(
|
|
|
+ "s1.CPID,SPID,SPNAME ,d.CPTYPE ,d.CATEGORYNAME,d.CPTYPE2 ,d.CATEGORYNAME2 , VIP_PTYPE,MAXFLOW,PRICE,").appendLn(
|
|
|
"ORDERTIME,CANCELTIME,ORDER_TIME2,CANCELTIME2,").appendLn(
|
|
|
"dateDiff('month', ORDERTIME,mstr) DIFF_MONYH,").appendLn(
|
|
|
"dateDiff('month', if(CANCELTIME='1970-01-01',addMonths(mstr,1),CANCELTIME),mstr) DIFF_CANCEL_MONYH,").appendLn(
|
|
@@ -166,7 +166,7 @@ public class XxhOrderTagHandler extends AbstractTagHandler {
|
|
|
" multiIf(ORDER_TIME1<2017,'2017L',ORDER_TIME1>2027,'2027R',toString(ORDER_TIME1)) as ORDER_TIME2,").appendLn(
|
|
|
" toYear(CANCELTIME) as CANCELTIME1,").appendLn(
|
|
|
" multiIf(CANCELTIME1<2017 and CANCELTIME1!=1970,'2017L',toString(CANCELTIME1)) as CANCELTIME2,").appendLn(
|
|
|
- " LLCP,VIPID, if(VIPID='','未领取',VIP_SPNAME) as VIP_SPNAME,").appendLn(
|
|
|
+ " LLCP, if(VIP_PTYPE='','未领取',VIP_PTYPE) as VIP_PTYPE,").appendLn(
|
|
|
" if(o2.USERID='',-1,FLOW) as FLOW,").appendLn(
|
|
|
" o1.USERID USERID1,").appendLn(
|
|
|
" o2.USERID USERID2,")
|
|
@@ -188,13 +188,11 @@ public class XxhOrderTagHandler extends AbstractTagHandler {
|
|
|
" on o1.USERID=o2.USERID and o1.SPID=o2.SPID").appendLn(
|
|
|
" left join").appendLn(
|
|
|
" (").appendLn(
|
|
|
- " select USERVAL,VIPID,if(`ds.VIPID`=='','',ds.SPNAME) as VIP_SPNAME").appendLn(
|
|
|
+ " select if(USERTYPE in ('1','2'),REMARK,USERVAL) as USERID,if(ds.VIPID='','',ds.PTYPE) as VIP_PTYPE").appendLn(
|
|
|
" from ads.ETL_TL_VIP_LOG a1").appendLn(
|
|
|
- " left join (select * from ads.DIM_SXXHY where SETID =1) ds").appendLn(
|
|
|
- " on a1.VIPID =ds.VIPID").append(
|
|
|
- " where THEDAY >='"+theLeftDay+"' and THEDAY<'"+theRightDay+"'").appendLn(lrUserIdSql).appendLn(
|
|
|
-// " --and VIPID in(select VIPID from ads.DIM_SXXHY where SETID =1)").appendLn(
|
|
|
- " ) o3 on o1.USERID=o3.USERVAL")
|
|
|
+ " left join ads.DIM_VIPID ds on a1.VIPID =ds.VIPID").appendLn(
|
|
|
+ " where RESULTCODE='0' and USERID is not null and THEDAY >='"+theLeftDay+"' and THEDAY<'"+theRightDay+"'").appendLn(lrUserIdSql).appendLn(
|
|
|
+ " ) o3 on o1.USERID=o3.USERID")
|
|
|
//--new 2022-06-27 快手激活 当月退订 高频退订标签
|
|
|
.appendLn(" left join (")
|
|
|
.appendLn(" select USERID,SPID ,toDate(ORDERTIME) as ORDERDATE from ads.TD_KUAISHOU_ACTIVATE")
|