授权

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

+package com.liquidnet.service.merchant.constant;
+
+public class MerchantPermissionConst {
+
+    // 某演出通过审核后，分配演出权限，场地方审核演出为'待审核的演出'与'演出'不同
+    public enum PerformancePermission {
+        READ("1", "查看"),
+        EDIT("2", "编辑"),
+        SUBMIT("3", "提交"),
+        ONLINE("4", "上线"),
+        OFFLINE("5", "下线"),
+        SALES("6", "销售"),
+        CHECK("7", "验票"),
+        ACCREDIT("8", "授权");
+
+        private final String id;
+        private final String name;
+
+        PerformancePermission(String id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantAuthorizationPermissionsVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.LocalDateTime;
+
+public class MerchantAuthorizationPermissionsVo implements java.io.Serializable {
+    private static final long serialVersionUID = -771282476240311975L;
+
+    @ApiModelProperty(value = "authorization_permission_id")
+    private String authorizationPermissionId;
+
+    @ApiModelProperty(value = "authorization_record_id")
+    private String authorizationRecordId;
+
+    @ApiModelProperty(value = "permission_id")
+    private String permissionId;
+
+    @ApiModelProperty(value = "授权开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime startTime;
+    @ApiModelProperty(value = "授权结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime endTime;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
+}

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantAuthorizationRecordsVo.java

 package com.liquidnet.service.merchant.dto.vo;
 
-public class MerchantAuthorizationRecordsVo {
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.LocalDateTime;
+
+public class MerchantAuthorizationRecordsVo implements java.io.Serializable{
+    private static final long serialVersionUID = 5851793907387626205L;
+
+    @ApiModelProperty(value = "authorization_record_id")
+    private String authorizationRecordId;
+
+    @ApiModelProperty(value = "演出ID")
+    private String performanceId;
+
+    @ApiModelProperty(value = "权利人演出角色 creator|sponsor|fielder|checker")
+    private String uidRole;
+
+    @ApiModelProperty(value = "权利人")
+    private String uid;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "授权人演出角色 creator|sponsor|fielder")
+    private String cuidRole;
+
+    @ApiModelProperty(value = "授权人")
+    private String cuid;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime deletedAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
 }

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantPermissionVo.java

 package com.liquidnet.service.merchant.dto.vo;
 
-public class MerchantPermissionVo {
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
 
+import java.time.LocalDateTime;
 
+public class MerchantPermissionVo implements java.io.Serializable{
+    private static final long serialVersionUID = -1693974333583118507L;
+
+    @ApiModelProperty(value = "permission_id", example = "查询、编辑、提审、上线、下线、统计、验票、授权")
+    private String permissionId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime createdAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime updatedAt;
 
 }

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

 package com.liquidnet.service.merchant.service;
 
 public interface IMerchantAuthorizationRecordsService {
-
-    void authorizationInit(String performanceId, String cuid, String fieldId, String sponsorId);
-
     void checkerAdd(String cuid, String performanceId, String uid, boolean statistics);
 
     void checkerDel(String cuid, String performanceId, String uid);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantSponsorAppliesController.java

@@ -63,8 +63,6 @@ public class MerchantSponsorAppliesController extends BaseController {
         MerchantSponsorApplies sponsorApplies = merchantSponsorAppliesAdminService.getOne(sponsorAppliesLambdaQueryWrapper);
         mmap.put("sponsorApplyInfo", sponsorApplies);
 
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
         return prefix + "/details";
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/IMerchantAuthorizationPermissionsAdminService.java

+package com.liquidnet.client.admin.zhengzai.merchant.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
+
+public interface IMerchantAuthorizationPermissionsAdminService extends IService<MerchantAuthorizationPermissions> {
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/IMerchantAuthorizationRecordsAdminService.java

+package com.liquidnet.client.admin.zhengzai.merchant.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.merchant.entity.MerchantAuthorizationRecords;
+
+public interface IMerchantAuthorizationRecordsAdminService extends IService<MerchantAuthorizationRecords> {
+
+    void authorizationInit(String performanceId, String cuid, String fieldId, String sponsorId);
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/impl/MerchantAuthorizationPermissionsAdminServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantAuthorizationPermissionsAdminService;
+import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
+import com.liquidnet.service.merchant.mapper.MerchantAuthorizationPermissionsMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class MerchantAuthorizationPermissionsAdminServiceImpl extends ServiceImpl<MerchantAuthorizationPermissionsMapper, MerchantAuthorizationPermissions> implements IMerchantAuthorizationPermissionsAdminService {
+
+}

liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantAuthorizationPermissions.java

@@ -39,6 +39,16 @@ public class MerchantAuthorizationPermissions implements Serializable {
      */
     private String permissionId;
 
+    /**
+     * 授权开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 授权结束时间
+     */
+    private LocalDateTime endTime;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

liquidnet-bus-do/liquidnet-service-merchant-do/src/main/java/com/liquidnet/service/merchant/entity/MerchantAuthorizationRecords.java

@@ -64,16 +64,6 @@ public class MerchantAuthorizationRecords implements Serializable {
      */
     private String cuid;
 
-    /**
-     * 授权开始时间
-     */
-    private LocalDateTime startTime;
-
-    /**
-     * 授权结束时间
-     */
-    private LocalDateTime endTime;
-
     private LocalDateTime deletedAt;
 
     private LocalDateTime createdAt;

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

@@ -207,8 +207,6 @@ create table merchant_authorization_records
     name                    varchar(255) default '' not null comment '姓名',
     cuid_role               varchar(255) default '' not null comment '授权人演出角色[creator|sponsor|fielder]',
     cuid                    varchar(64)             not null comment '授权人',
-    start_time              datetime                null comment '授权开始时间',
-    end_time                datetime                null comment '授权结束时间',
     deleted_at              timestamp               null,
     created_at              timestamp               null,
     updated_at              timestamp               null
@@ -244,6 +242,8 @@ create table merchant_authorization_permissions
     authorization_permission_id varchar(64) not null comment 'authorization_permission_id',
     authorization_record_id     varchar(64) not null comment 'authorization_record_id',
     permission_id               varchar(64) not null comment 'permission_id',
+    start_time                  datetime    null comment '授权开始时间',
+    end_time                    datetime    null comment '授权结束时间',
     created_at                  timestamp   null,
     updated_at                  timestamp   null
 ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '演出授权关联权限表';

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

+package com.liquidnet.service.merchant.service.impl;
+
+import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
+
+public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthorizationRecordsService {
+    @Override
+    public void checkerAdd(String cuid, String performanceId, String uid, boolean statistics) {
+
+    }
+
+    @Override
+    public void checkerDel(String cuid, String performanceId, String uid) {
+
+    }
+
+    @Override
+    public void checkers(String cuid, String performanceId) {
+
+    }
+}