权限相关

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -63,8 +63,6 @@ public class KylinPerformanceVo {
     private String projectId;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
-    @ApiModelProperty(value = "主办方id")
-    private String sponsorId;
     // OSS
     @ApiModelProperty(value = "演出详情")
     private String details;
@@ -141,7 +139,6 @@ public class KylinPerformanceVo {
         this.notice = performance.getNotice();
         this.approvalUrl = performance.getApprovalUrl();
         this.rejectTxt = performance.getRejectTxt();
-        this.sponsorId = performance.getSponsorId();
     }
 
     public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime, LocalDateTime sellTime, int isAdvance, int isDiscount, int payCountdownMinute) {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketExpressModuleVo.java

@@ -12,8 +12,8 @@ public class KylinTicketExpressModuleVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "票id")
     private String ticketId;
 
-    @ApiModelProperty(value = "快递模板id")
-    private List<String> expressModuleIdList;
+    @ApiModelProperty(value = "快递模板codeList")
+    private List<String> produceCodeList;
 
     private static final KylinTicketExpressModuleVo obj = new KylinTicketExpressModuleVo();
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,6 +24,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,36 +59,28 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
     @Autowired
     MongoTemplate mongoTemplate;
-
     @Autowired
     private MongoConverter mongoConverter;
-
     @Autowired
     private PerformanceVoUtils performanceVoUtils;
-
     @Autowired
     private DataUtils dataUtils;
-
     @Autowired
     private KylinPerformancesMapper performancesMapper;
-
     @Autowired
     private KylinPerformanceStatusMapper performanceStatusMapper;
-
     @Autowired
     private KylinPerformanceRelationsMapper performanceRelationsMapper;
-
     @Autowired
     private KylinTicketsMapper ticketsMapper;
-
     @Autowired
     private KylinTicketStatusMapper ticketStatusMapper;
-
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
-
     @Autowired
     private KylinOrderImportMapper orderImportMapper;
+    @Autowired
+    IMerchantAuthorizationRecordsService merchantAuthorizationRecordsService;
 
     @Override
     public KylinPerformanceMisVo performanceDetails(String performancesId) {
@@ -149,6 +143,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                         }
                     }
                     performanceVoUtils.performanceVoStatus(performancesId);
+                    //权限
+                    KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+                    KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
+                    merchantAuthorizationRecordsService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
                 } else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
                     log.info(" PERFORMANCE  演出审核 修改");
 
@@ -158,12 +156,15 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     KylinPerformanceMisVo vo = performanceVoUtils.getPerformanceMisVo(performancesId);
                     performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, vo, updatedAt, auditStatus);
 //                    if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
-                        performanceVoUtils.performanceVoStatus(performancesId);
+                    performanceVoUtils.performanceVoStatus(performancesId);
 //                    }
                     delOrderTicketsRedis(vo);
                 }
-
                 dataUtils.delPerformanceRedis(performancesId);
+                //权限
+                KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+                KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
+                merchantAuthorizationRecordsService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
             } else if (status == 4) {
                 log.info(" PERFORMANCE  演出审核 拒绝");
                 auditStatus = 2;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/docu/db_merchant.sql

@@ -264,7 +264,7 @@ create table kylin_ticket_express_module
 (
     mid        bigint unsigned auto_increment primary key,
     ticket_id  varchar(64) default '' comment '票种id',
-    express_module_id  varchar(64) default '' comment '快递模板id',
+    produce_code  varchar(64) default '' comment '快递模板code',
     created_at datetime ,
     updated_at datetime ,
     comment    text

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

 package com.liquidnet.service.merchant.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.*;
@@ -24,7 +22,6 @@ import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
-import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
 import com.liquidnet.service.merchant.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -69,8 +66,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
     IKylinTicketsPartnerService ticketsPartnerService;
     @Autowired
     IKylinTicketTimesPartnerService ticketTimesPartnerService;
-    @Autowired
-    IMerchantAuthorizationRecordsService merchantAuthorizationRecordsService;
 
     @Override
     public String step1(PerformanceStep1Param step1Param) {
@@ -255,7 +250,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                                     now, performanceId, now, now
                             ));
                 }
-                merchantAuthorizationRecordsService.authorizationInit(performanceId, merchantId, performancePartnerVo.getFieldId(), performancePartnerVo.getSponsorId());
                 return ResponseDto.success("操作成功");
             } else { //保存
                 performancePartnerVo.setStatus(0);
@@ -383,7 +377,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                             KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(ticketItem.getTicketsId());
                             redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
                             sqlsDataE.add(new Object[]{ticketItem.getTicketsId()});
-                            for (String mVo : moduleVo.getExpressModuleIdList())
+                            for (String mVo : moduleVo.getProduceCodeList())
                                 sqlsDataF.add(new Object[]{
                                         ticketItem.getTicketsId(), mVo, now, now
                                 });
@@ -395,7 +389,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
 
                     performanceUtils.performanceVoStatus(performanceId, null);
                 }
-                merchantAuthorizationRecordsService.authorizationInit(performanceId, merchantId, performancePartnerVo.getFieldId(), performancePartnerVo.getSponsorId());
                 return ResponseDto.success("操作完成");
             } else { //保存
                 performancePartnerVo.setStatus(0);
@@ -646,7 +639,6 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                                     2, performancesId, now, now
                             ));
                 }
-                merchantAuthorizationRecordsService.authorizationInit(performancesId,merchantId,vo.getFieldId(),vo.getSponsorId());
                 mongoMerchantUtils.updatePerformancePartnerVoById(performancePartnerVo);
                 log.info(UserPathDto.setPartnerData("0", "withdraw", "performancesId=" + performancesId, "撤回成功"));
                 return ResponseDto.success("撤回成功");

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

 package com.liquidnet.service.merchant.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -16,22 +14,15 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
-import com.liquidnet.service.kylin.entity.*;
-import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
 import com.liquidnet.service.merchant.util.*;
-import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -431,7 +422,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             }
             KylinTicketExpressModuleVo expressModuleVo = KylinTicketExpressModuleVo.getNew();
             expressModuleVo.setTicketId(ticketId);
-            expressModuleVo.setExpressModuleIdList(expressModuleIdList);
+            expressModuleVo.setProduceCodeList(expressModuleIdList);
             redisMerchantUtils.setTEMPVo(ticketId, expressModuleVo);
         }
         return true;

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

 package com.liquidnet.service.merchant.util;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -13,15 +12,10 @@ import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
-import com.mongodb.BasicDBObject;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -390,7 +384,7 @@ public class PerformanceUtils {
                     KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId());
                     redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo);
                     del9.add(new Object[]{tickets.getTicketsId()});
-                    for (String mVo:moduleVo.getExpressModuleIdList())
+                    for (String mVo:moduleVo.getProduceCodeList())
                     insert9.add(new Object[]{
                             tickets.getTicketsId(),mVo,updatedAt,updatedAt
                     });