添加超级账号

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/constant/MerchantRedisConst.java

@@ -17,4 +17,7 @@ public class MerchantRedisConst {
 
     // 【主办申请】我的列表
     public static final String INFO_SPONSOR_APPLIES = PREFIX.concat("info:sponsor_applies:");
+
+    // 无敌账号
+    public static final String SUPER_ACCOUNT = PREFIX.concat("super:account:");
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/MongoMerchantUtils.java

@@ -205,9 +205,15 @@ public class MongoMerchantUtils {
      * @param permissionIds 权限id
      * @return
      */
-    public boolean judgeIsPermission(String performanceId, String merchantId,String[] permissionIds) {
-        return mongoTemplate.exists(Query.query(Criteria.where("performanceId").is(performanceId).and("permissionIds").in(permissionIds))
-                , MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
+    public boolean judgeIsPermission(String performanceId, String merchantId, String[] permissionIds) {
+        if (redisMerchantUtils.superAccount(merchantId)) {
+            return true;
+        } else {
+            return mongoTemplate.exists(Query.query(Criteria.where("performanceId").is(performanceId)
+                            .and("uid").is(merchantId)
+                            .and("permissionIds").in(permissionIds))
+                    , MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
+        }
     }
 
     public Document getObjectTicketVo(HashMap<String, Object> map, String ticketsId) {
@@ -228,19 +234,23 @@ public class MongoMerchantUtils {
             orderBy = Sort.Direction.ASC;
         }
 
-
-        //根据权限查询演出id
-        List<MerchantAuthorizationPerformanceVo> permissionVoList = mongoTemplate.find(Query.query(Criteria.where("uid").is(performancePartnerListParam.getMerchantId())
-                        .and("permissionIds").in(
-                        MerchantAuthorizationConst.PerformancePermission.READ.getId(),
-                        MerchantAuthorizationConst.PerformancePermission.SALES.getId(),
-                        MerchantAuthorizationConst.PerformancePermission.LINE.getId())
-                ),
-                MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
-        List<String> performanceIdList = permissionVoList.stream().map(MerchantAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList());
-
+        List<String> performanceIdList = null;
+        List<MerchantAuthorizationPerformanceVo> permissionVoList = ObjectUtil.getPermissionVoList();
+        if (!redisMerchantUtils.superAccount(performancePartnerListParam.getMerchantId())) {
+            //根据权限查询演出id
+            permissionVoList = mongoTemplate.find(Query.query(Criteria.where("uid").is(performancePartnerListParam.getMerchantId())
+                            .and("permissionIds").in(
+                            MerchantAuthorizationConst.PerformancePermission.READ.getId(),
+                            MerchantAuthorizationConst.PerformancePermission.SALES.getId(),
+                            MerchantAuthorizationConst.PerformancePermission.LINE.getId())
+                    ).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem()))
+                            .skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()))
+                            .limit(performancePartnerListParam.getSize()),
+                    MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
+            performanceIdList = permissionVoList.stream().map(MerchantAuthorizationPerformanceVo::getPerformanceId).collect(Collectors.toList());
+        }
         //查询演出
-        Criteria criteria = Criteria.where("performancesId").in(performanceIdList);
+        Criteria criteria = performanceIdList == null ? Criteria.where("performancesId").ne(null) : Criteria.where("performancesId").in(performanceIdList);
         if (performancePartnerListParam.getTitle() != null && !performancePartnerListParam.getTitle().isEmpty()) {
             criteria = criteria.and("title").regex(".*" + performancePartnerListParam.getTitle() + ".*");
         }
@@ -260,10 +270,7 @@ public class MongoMerchantUtils {
             }
         }
         List<KylinPerformanceVo> performanceVos = mongoTemplate.find(
-                Query.query(criteria)
-                        .with(Sort.by(orderBy, performancePartnerListParam.getOrderItem()))
-                        .skip(((performancePartnerListParam.getPage() - 1) * performancePartnerListParam.getSize()))
-                        .limit(performancePartnerListParam.getSize()),
+                Query.query(criteria),
                 KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
         //查询销量
         Aggregation aggregation = Aggregation.newAggregation(

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/ObjectUtil.java

@@ -27,11 +27,16 @@ public class ObjectUtil {
     private static final ArrayList<PerformancePartnerListDao> performancePartnerListDaoArrayList = new ArrayList<>();
     private static final ArrayList<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<>();
     private static final ArrayList<KylinPerformancePartnerListVo> performancePartnerListVo = new ArrayList<>();
+    private static final ArrayList<MerchantAuthorizationPerformanceVo> permissionVoList = new ArrayList<>();
 
     public static ArrayList<PerformancePartnerListDao> getPerformancePartnerListDaoArrayList() {
         return (ArrayList<PerformancePartnerListDao>) performancePartnerListDaoArrayList.clone();
     }
 
+    public static ArrayList<MerchantAuthorizationPerformanceVo> getPermissionVoList() {
+        return (ArrayList<MerchantAuthorizationPerformanceVo>) permissionVoList.clone();
+    }
+
     public static ArrayList<KylinPerformancePartnerListVo> getKylinPerformancePartnerListVo() {
         return (ArrayList<KylinPerformancePartnerListVo>) performancePartnerListVo.clone();
     }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/RedisMerchantUtils.java

@@ -6,6 +6,7 @@ import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
+import com.liquidnet.service.merchant.constant.MerchantRedisConst;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.service.MerchantRdmService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +73,7 @@ public class RedisMerchantUtils {
      * @return
      */
     public void delPerformanceVo(String performanceId) {
-        redisUtil.del(KylinRedisConst.PERFORMANCES+performanceId);
+        redisUtil.del(KylinRedisConst.PERFORMANCES + performanceId);
     }
 
     public KylinPerformanceVo getPerformanceVoNoMerchant(String performanceId) {
@@ -101,7 +102,7 @@ public class RedisMerchantUtils {
     /**
      * 设置 票种快递票模板关联vo [第三方非线上]
      *
-     * @param ticketId     票id
+     * @param ticketId 票id
      */
     public void setTEMPVo(String ticketId, KylinTicketExpressModuleVo vo) {
         redisUtil.set(KylinRedisConst.TICKET_EXPRESS_MODULE_P.concat(ticketId), vo);
@@ -109,15 +110,16 @@ public class RedisMerchantUtils {
 
     /**
      * 获取 票种快递票模板关联vo [第三方非线上]
+     *
      * @param ticketId
      * @return
      */
-    public KylinTicketExpressModuleVo getTEMPVo(String ticketId){
+    public KylinTicketExpressModuleVo getTEMPVo(String ticketId) {
         String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE_P.concat(ticketId);
         Object obj = redisUtil.get(redisKey);
-        if(obj!=null){
-            return (KylinTicketExpressModuleVo)obj;
-        }else{
+        if (obj != null) {
+            return (KylinTicketExpressModuleVo) obj;
+        } else {
             return null;
         }
     }
@@ -125,7 +127,7 @@ public class RedisMerchantUtils {
     /**
      * 设置 票种快递票模板关联vo [线上]
      *
-     * @param ticketId     票id
+     * @param ticketId 票id
      */
     public void setTEMVo(String ticketId, KylinTicketExpressModuleVo vo) {
         redisUtil.set(KylinRedisConst.TICKET_EXPRESS_MODULE.concat(ticketId), vo);
@@ -133,15 +135,16 @@ public class RedisMerchantUtils {
 
     /**
      * 获取 票种快递票模板关联vo [线上]
+     *
      * @param ticketId
      * @return
      */
-    public KylinTicketExpressModuleVo getTEMVo(String ticketId){
+    public KylinTicketExpressModuleVo getTEMVo(String ticketId) {
         String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE.concat(ticketId);
         Object obj = redisUtil.get(redisKey);
-        if(obj!=null){
-            return (KylinTicketExpressModuleVo)obj;
-        }else{
+        if (obj != null) {
+            return (KylinTicketExpressModuleVo) obj;
+        } else {
             return null;
         }
     }
@@ -247,6 +250,7 @@ public class RedisMerchantUtils {
 
     /**
      * 可选快递方式列表
+     *
      * @return
      */
     public List<KylinExpressModuleVo> expressList() {
@@ -258,4 +262,14 @@ public class RedisMerchantUtils {
             return (List<KylinExpressModuleVo>) obj;
         }
     }
+
+    /**
+     * 可选快递方式列表
+     *
+     * @return
+     */
+    public Boolean superAccount(String merchantId) {
+        String redisKey = MerchantRedisConst.SUPER_ACCOUNT.concat(merchantId);
+        return redisUtil.hasKey(redisKey);
+    }
 }