演出授权

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantAuthorizationPermissionParam.java

+package com.liquidnet.service.merchant.dto.param;
+
+import com.liquidnet.commons.lang.constant.LnsRegex;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+@ApiModel(value = "MerchantAuthorizationPermissionParam", description = "授权权限")
+@Data
+public class MerchantAuthorizationPermissionParam implements java.io.Serializable {
+    private static final long serialVersionUID = -8463419578205447151L;
+
+    @ApiModelProperty(position = 10, required = true, value = "权限ID")
+    @NotBlank
+    private String permissionId;
+
+    @ApiModelProperty(position = 11, required = false, value = "授权开始时间[yyyy-MM-dd HH:mm:ss]", example = "2021-05-10 20:20:20")
+    @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "时间格式有误")
+    private String startTime;
+    @ApiModelProperty(position = 12, required = false, value = "授权结束时间[yyyy-MM-dd HH:mm:ss]", example = "2021-05-17 20:20:20")
+    @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "时间格式有误")
+    private String endTime;
+}

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantAuthorizationRecordParam.java

+package com.liquidnet.service.merchant.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@ApiModel(value = "MerchantAuthorizationRecordParam", description = "授权验票统计入参")
+@Data
+public class MerchantAuthorizationRecordParam implements java.io.Serializable{
+    private static final long serialVersionUID = -673681507332688410L;
+
+    @ApiModelProperty(position = 10, required = true, value = "演出ID")
+    @NotBlank
+    private String performanceId;
+
+    @ApiModelProperty(position = 11, required = true, value = "权利人演出角色 checker，目前仅验票员")
+    @NotBlank
+    private String uidRole;
+    @ApiModelProperty(position = 12, required = true, value = "权利人UID")
+    @NotBlank
+    private String uid;
+    @ApiModelProperty(position = 13, required = true, value = "权利人手机号")
+    @NotBlank
+    private String mobile;
+    @ApiModelProperty(position = 14, required = true, value = "权利人姓名")
+    @NotBlank
+    private String name;
+
+    @ApiModelProperty(position = 15, required = true, value = "授权权限")
+    @NotEmpty
+    private List<MerchantAuthorizationPermissionParam> permissions;
+}

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantFieldApplyParam.java

@@ -30,7 +30,7 @@ public class MerchantFieldApplyParam implements java.io.Serializable {
     private String background;
     @ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字")
     private String description;
-    @ApiModelProperty(position = 15, required = true, value = "建立日期[YYYY-MM-DD]", example = "2021-05-17")
+    @ApiModelProperty(position = 15, required = true, value = "建立日期[yyyy-MM-dd]", example = "2021-05-17")
     @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "建立日期格式有误")
     private String builtDate;
 

liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantSponsorApplyParam.java

@@ -24,23 +24,28 @@ public class MerchantSponsorApplyParam implements java.io.Serializable  {
     @NotBlank(message = "名称不能为空")
     private String name;
     @ApiModelProperty(position = 12, required = true, value = "logo图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
-    @NotNull(message = "logo图不能为空")
+    @NotBlank(message = "logo图不能为空")
     private String logo;
     @ApiModelProperty(position = 13, required = true, value = "背景图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
-    @NotNull(message = "背景图不能为空")
+    @NotBlank(message = "背景图不能为空")
     private String background;
     @ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字")
     private String description;
 
     @ApiModelProperty(position = 15, required = true, value = "联系人姓名", example = "张三")
+    @NotBlank
     private String contactName;
     @ApiModelProperty(position = 16, required = true, value = "联系人身份证号码", example = "102030199012120101")
+    @NotBlank
     private String contactIdentity;
     @ApiModelProperty(position = 17, required = true, value = "联系人身份证正面照")
+    @NotBlank
     private String contactIdentityObverse;
     @ApiModelProperty(position = 18, required = true, value = "联系人身份证反面照")
+    @NotBlank
     private String contactIdentityReverse;
     @ApiModelProperty(position = 19, required = true, value = "联系人邮箱", example = "zhangsan@zhengzai.tv")
+    @NotNull
     private String contactEmail;
 
     @ApiModelProperty(position = 20, required = false, value = "企业名称")

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

 package com.liquidnet.service.merchant.service;
 
+import com.liquidnet.service.merchant.dto.param.MerchantAuthorizationRecordParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
 
 import java.util.List;
 
 public interface IMerchantAuthorizationRecordsService {
-    void performanceCheckerAdd(String cuid, String performanceId, String uid, String mobile, String name, boolean statistics);
+    String performanceCheckerAdd(String cuid, MerchantAuthorizationRecordParam parameter);
 
-    void performanceCheckerDel(String cuid, String performanceId, String uid);
+    void performanceCheckerDel(String cuid, String authorizationRecordId);
 
     List<MerchantAuthorizationRecordsVo> performanceCheckers(String cuid, String performanceId);
 }

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

@@ -4,11 +4,9 @@ import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 
 public interface IMerchantFieldAppliesService {
-
     String apply(String uid, MerchantFieldApplyParam parameter);
 
     void applyDel(String uid, String fieldApplyId);
 
     MerchantFieldAppliesVo applyInfo(String uid, String fieldApplyId);
-
 }

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

@@ -4,11 +4,9 @@ import com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam;
 import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
 
 public interface IMerchantSponsorAppliesService {
-
     String apply(String uid, MerchantSponsorApplyParam parameter);
 
     void applyDel(String uid, String sponsorApplyId);
 
     MerchantSponsorAppliesVo applyInfo(String uid, String sponsorApplyId);
-
 }

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

@@ -5,7 +5,5 @@ import com.liquidnet.service.merchant.dto.vo.MerchantStationsVo;
 import java.util.List;
 
 public interface IMerchantStationsService {
-
     List<MerchantStationsVo> stationsList(String uid);
-
 }

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

@@ -123,7 +123,7 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
             creatorAuthorizationPermissions.setAuthorizationRecordId(creatorAuthorizationRecords.getAuthorizationRecordId());
             creatorAuthorizationPermissions.setPermissionId(permissionId);
             creatorAuthorizationPermissions.setStartTime(now);
-            creatorAuthorizationPermissions.setEndTime(now.plusYears(99));
+            creatorAuthorizationPermissions.setEndTime(now.plusYears(10));
             creatorAuthorizationPermissions.setCreatedAt(now);
             authorizationPermissionsArrayList.add(creatorAuthorizationPermissions);
             // vo
@@ -242,7 +242,7 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 fielderAuthorizationPermissions.setAuthorizationRecordId(fielderAuthorizationRecords.getAuthorizationRecordId());
                 fielderAuthorizationPermissions.setPermissionId(permissionId);
                 fielderAuthorizationPermissions.setStartTime(now);
-                fielderAuthorizationPermissions.setEndTime(now.plusYears(99));
+                fielderAuthorizationPermissions.setEndTime(now.plusYears(10));
                 fielderAuthorizationPermissions.setCreatedAt(now);
                 authorizationPermissionsArrayList.add(fielderAuthorizationPermissions);
 
@@ -288,7 +288,7 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                         checkerAuthorizationPermissions.setAuthorizationRecordId(checkerAuthorizationRecords.getAuthorizationRecordId());
                         checkerAuthorizationPermissions.setPermissionId(permissionId);
                         checkerAuthorizationPermissions.setStartTime(now);
-                        checkerAuthorizationPermissions.setEndTime(now.plusYears(99));
+                        checkerAuthorizationPermissions.setEndTime(now.plusYears(10));
                         checkerAuthorizationPermissions.setCreatedAt(now);
                         authorizationPermissionsArrayList.add(checkerAuthorizationPermissions);
 
@@ -412,7 +412,7 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 sponsorAuthorizationPermissions.setAuthorizationRecordId(sponsorAuthorizationRecords.getAuthorizationRecordId());
                 sponsorAuthorizationPermissions.setPermissionId(permissionId);
                 sponsorAuthorizationPermissions.setStartTime(now);
-                sponsorAuthorizationPermissions.setEndTime(now.plusYears(99));
+                sponsorAuthorizationPermissions.setEndTime(now.plusYears(10));
                 sponsorAuthorizationPermissions.setCreatedAt(now);
                 authorizationPermissionsArrayList.add(sponsorAuthorizationPermissions);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/utils/MerchantMongoUtil.java

@@ -52,7 +52,7 @@ public class MerchantMongoUtil {
         return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
     }
 
-    public List<MerchantAuthorizationRecordsVo> getCheckersAuthorizationRecordsVosByCuid(String cuid, String performanceId) {
+    public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsCheckersVosByCuid(String cuid, String performanceId) {
         return mongoTemplate.find(Query.query(Criteria.where("uidRole").is(MerchantAuthorizationConst.PerformanceRole.CHECKER.getRole()).and("cuid").is(cuid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 }

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

+package com.liquidnet.service.merchant.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.merchant.dto.param.MerchantAuthorizationRecordParam;
+import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
+import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 授权 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-11-18
+ */
+@ApiSupport(order = 10003)
+@Api(tags = "授权")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("authorizations")
+public class MerchantAuthorizationsController {
+
+    @Autowired
+    IMerchantAuthorizationRecordsService authorizationRecordsService;
+
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "授权记录列表")
+    @GetMapping("records")
+    public ResponseDto<List<MerchantAuthorizationRecordsVo>> recordsCheckers(@RequestParam(required = true) String performanceId) {
+        String currentUid = CurrentUtil.getCurrentUid();
+
+        return ResponseDto.success(authorizationRecordsService.performanceCheckers(currentUid, performanceId));
+    }
+
+    @ApiOperationSupport(order = 11)
+    @ApiOperation(value = "添加授权记录")
+    @PostMapping("records/add")
+    public ResponseDto<Object> recordsCheckerAdd(@Valid @RequestBody MerchantAuthorizationRecordParam parameter) {
+        String currentUid = CurrentUtil.getCurrentUid();
+
+        authorizationRecordsService.performanceCheckerAdd(currentUid, parameter);
+
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 12)
+    @ApiOperation(value = "删除授权记录")
+    @PostMapping("records/del")
+    public ResponseDto<Object> recordsCheckerDel(@RequestParam(required = true) String authorizationRecordId) {
+        String currentUid = CurrentUtil.getCurrentUid();
+
+        authorizationRecordsService.performanceCheckerDel(currentUid, authorizationRecordId);
+
+        return ResponseDto.success();
+    }
+}

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

@@ -31,11 +31,15 @@ public class MerchantMongoService {
         return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
     }
 
+    public MerchantAuthorizationRecordsVo getAuthorizationRecordsVoByAuthorizationRecordId(String authorizationRecordId) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("authorizationRecordId").is(authorizationRecordId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
+    }
+
     public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsVosByUid(String uid, String performanceId) {
         return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 
-    public List<MerchantAuthorizationRecordsVo> getCheckersAuthorizationRecordsVosByCuid(String cuid, String performanceId) {
+    public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsCheckersVosByCuid(String cuid, String performanceId) {
         return mongoTemplate.find(Query.query(Criteria.where("uidRole").is(MerchantAuthorizationConst.PerformanceRole.CHECKER.getRole()).and("cuid").is(cuid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/errors.properties

@@ -29,7 +29,7 @@
 # 演出授权
 13301=无授权权限
 13302=无权限授于统计权限
-
+13303=授权时间有误
 
 
 

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties

@@ -10,6 +10,14 @@ merchant_field_checkers.update=UPDATE merchant_field_checkers SET cuid = ?, upda
 #  ---------------------------------------------------------------------------------------------------------------------
 merchant_sponsor_applies.insert=INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 merchant_sponsor_applies.update=UPDATE merchant_sponsor_applies SET updated_at = ?, delete_at = ? WHERE sponsor_apply_id = ?
+#  ---------------------------------------------------------------------------------------------------------------------
+merchant_authorization_records.insert=INSERT INTO merchant_authorization_records (authorization_record_id, performance_id, uid_role, uid, mobile, name, cuid_role, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?)
+merchant_authorization_records.update=UPDATE merchant_authorization_records SET updated_at = ?, delete_at = ? WHERE authorization_record_id = ?
+#  ---------------------------------------------------------------------------------------------------------------------
+merchant_authorization_permissions.insert=INSERT INTO merchant_authorization_permissions (authorization_permission_id, authorization_record_id, permission_id, start_time, end_time, created_at) VALUE (?, ?, ?, ?, ?, ?)
+
+
+