|
|
@@ -68,37 +68,16 @@ func (l *ByPushHistoryLogic) ByPushHistory(in *bxsubscribe.SubscribeInfosReq) (*
|
|
|
UserType: in.UserType,
|
|
|
}
|
|
|
//主体处理(fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户)
|
|
|
-<<<<<<< HEAD
|
|
|
if in.UserType == model.MemberFlag || in.UserType == model.SubVipFlag {
|
|
|
if in.PositionType == 1 {
|
|
|
-=======
|
|
|
- infoCount := int64(0)
|
|
|
- if in.UserType == model.MemberFlag {
|
|
|
- infoCount = IC.MainMysql.CountBySql("select count(id) from entniche_wait_empower where ent_id=? and end_time>NOW() and product_type like '%大会员%' ", in.EntId)
|
|
|
- } else if in.UserType == model.SubVipFlag {
|
|
|
- infoCount = IC.MainMysql.CountBySql("select count(id) from entniche_wait_empower where ent_id=? and end_time>NOW() and product_type like '%VIP订阅%' ", in.EntId)
|
|
|
- }
|
|
|
- if infoCount > 0 {
|
|
|
- in.UserType = model.EntnicheFlag
|
|
|
- vipType = model.EntnicheFlag
|
|
|
- //主体等于企业的
|
|
|
- spqp.BuySubject = 1
|
|
|
- }
|
|
|
-
|
|
|
- if in.IsEnt == true {
|
|
|
- newCount := IC.MainMysql.CountBySql("select count(id) from entniche_info where id =? and status=1", spqp.EntId)
|
|
|
- if newCount > 0 {
|
|
|
->>>>>>> master
|
|
|
in.UserType = model.EntnicheFlag
|
|
|
vipType = model.EntnicheFlag
|
|
|
}
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
+
|
|
|
if in.UserType == model.EntnicheFlag {
|
|
|
spqp.UserId = common.InterfaceToStr(spqp.EntUserId)
|
|
|
}
|
|
|
->>>>>>> master
|
|
|
logx.Info("数据导出查询参数", in)
|
|
|
if selectIds := strings.TrimSpace(in.SelectIds); selectIds != "" {
|
|
|
spqp.SelectInfoIds = strings.Split(selectIds, ",")
|
