Merge branch 'dev_merchant_tice' into dev_merchant

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

@@ -4,14 +4,12 @@ public class MerchantPermissionConst {
 
     // 某演出通过审核后，分配演出权限，场地方审核演出为'待审核的演出'与'演出'不同
     public enum PerformancePermission {
-        READ("1", "查看"),
-        EDIT("2", "编辑"),
-        SUBMIT("3", "提交"),
-        ONLINE("4", "上线"),
-        OFFLINE("5", "下线"),
-        SALES("6", "销售"),
-        CHECK("7", "验票"),
-        ACCREDIT("8", "授权");
+        READ("1", "查看详情"),
+        EDIT("2", "编辑提交"),
+        ONOFF("3", "上下线"),
+        SALES("4", "销售统计"),
+        CHECK("5", "验票"),
+        ACCREDIT("6", "授权");
 
         private final String id;
         private final String name;

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

@@ -2,11 +2,16 @@ package com.liquidnet.service.merchant.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
-public class MerchantAuthorizationPermissionsVo implements java.io.Serializable {
+@ApiModel(value = "MerchantAuthorizationPermissionsVo", description = "授权记录关联")
+@Data
+public class MerchantAuthorizationPermissionsVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -771282476240311975L;
 
     @ApiModelProperty(value = "authorization_permission_id")
@@ -29,4 +34,31 @@ public class MerchantAuthorizationPermissionsVo implements java.io.Serializable
     private LocalDateTime createdAt;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
+
+    private static final MerchantAuthorizationPermissionsVo obj = new MerchantAuthorizationPermissionsVo();
+
+    public static MerchantAuthorizationPermissionsVo getNew() {
+        try {
+            return (MerchantAuthorizationPermissionsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new MerchantAuthorizationPermissionsVo();
+    }
+
+    public MerchantAuthorizationPermissionsVo copy(MerchantAuthorizationPermissions source) {
+        if (null == source) return this;
+
+        this.setAuthorizationPermissionId(source.getAuthorizationPermissionId());
+        this.setAuthorizationRecordId(source.getAuthorizationRecordId());
+        this.setPermissionId(source.getPermissionId());
+
+        this.setStartTime(source.getStartTime());
+        this.setEndTime(source.getEndTime());
+
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+
+        return this;
+    }
 }

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

@@ -2,11 +2,17 @@ package com.liquidnet.service.merchant.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.merchant.entity.MerchantAuthorizationRecords;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
-public class MerchantAuthorizationRecordsVo implements java.io.Serializable{
+@ApiModel(value = "MerchantAuthorizationRecordsVo", description = "授权记录")
+@Data
+public class MerchantAuthorizationRecordsVo implements java.io.Serializable, Cloneable{
     private static final long serialVersionUID = 5851793907387626205L;
 
     @ApiModelProperty(value = "authorization_record_id")
@@ -33,10 +39,44 @@ public class MerchantAuthorizationRecordsVo implements java.io.Serializable{
     @ApiModelProperty(value = "授权人")
     private String cuid;
 
+    @ApiModelProperty(value = "授权的权限")
+    private List<MerchantAuthorizationPermissionsVo> permissionsVos;
+
     @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;
+
+    private static final MerchantAuthorizationRecordsVo obj = new MerchantAuthorizationRecordsVo();
+
+    public static MerchantAuthorizationRecordsVo getNew() {
+        try {
+            return (MerchantAuthorizationRecordsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new MerchantAuthorizationRecordsVo();
+    }
+
+    public MerchantAuthorizationRecordsVo copy(MerchantAuthorizationRecords source) {
+        if (null == source) return this;
+
+        this.setAuthorizationRecordId(source.getAuthorizationRecordId());
+        this.setPerformanceId(source.getPerformanceId());
+        this.setUidRole(source.getUidRole());
+        this.setUid(source.getUid());
+        this.setMobile(source.getMobile());
+        this.setName(source.getName());
+
+        this.setCuid(source.getCuidRole());
+        this.setCuid(source.getCuid());
+
+        this.setDeletedAt(source.getDeletedAt());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+
+        return this;
+    }
 }

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 checkerAdd(String cuid, String performanceId, String uid, boolean statistics);
+    void performanceCheckerAdd(String cuid, String performanceId, String uid, boolean statistics);
 
-    void checkerDel(String cuid, String performanceId, String uid);
+    void performanceCheckerDel(String cuid, String performanceId, String uid);
 
-    void checkers(String cuid, String performanceId);
+    void performanceCheckers(String cuid, String performanceId);
 }

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

@@ -9,8 +9,12 @@ import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldAppliesAdminService;
+import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
 import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldApplyListParam;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
+import com.liquidnet.service.merchant.entity.MerchantFields;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -27,6 +31,9 @@ public class MerchantFieldAppliesController extends BaseController {
 
     private final String prefix = "zhengzai/kylin/field";
 
+    @Autowired
+    IMerchantFieldsAdminService merchantFieldsAdminService;
+
     @Autowired
     IMerchantFieldAppliesAdminService merchantFieldAppliesAdminService;
 
@@ -65,9 +72,22 @@ public class MerchantFieldAppliesController extends BaseController {
         LambdaQueryWrapper<MerchantFieldApplies> fieldAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFieldApplies.class);
         fieldAppliesLambdaQueryWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldApplyId);
         MerchantFieldApplies fieldApplies = merchantFieldAppliesAdminService.getOne(fieldAppliesLambdaQueryWrapper);
-        mmap.put("fieldApplyInfo", fieldApplies);
 
-        return prefix + "/details";
+        MerchantFieldAppliesVo fieldAppliesVo = MerchantFieldAppliesVo.getNew();
+        fieldAppliesVo.copy(fieldApplies);
+        if (fieldAppliesVo.getApplyType().equals("claim")) {
+            LambdaQueryWrapper<MerchantFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFields.class);
+            fieldsLambdaQueryWrapper.eq(MerchantFields::getFieldId, fieldAppliesVo.getFieldId());
+            MerchantFields fields = merchantFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
+
+            MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew();
+            fieldsVo.copy(fields);
+            fieldAppliesVo.setFieldVo(fieldsVo);
+        }
+
+        mmap.put("fieldApplyInfo", fieldAppliesVo);
+
+        return prefix + "/applyDetail";
     }
 
     @ApiOperation(value = "审核通过")

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

@@ -10,6 +10,7 @@ import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorAppliesAdminService;
 import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorApplyListParam;
+import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
 import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -61,9 +62,13 @@ public class MerchantSponsorAppliesController extends BaseController {
         LambdaQueryWrapper<MerchantSponsorApplies> sponsorAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsorApplies.class);
         sponsorAppliesLambdaQueryWrapper.eq(MerchantSponsorApplies::getSponsorApplyId, sponsorApplyId);
         MerchantSponsorApplies sponsorApplies = merchantSponsorAppliesAdminService.getOne(sponsorAppliesLambdaQueryWrapper);
-        mmap.put("sponsorApplyInfo", sponsorApplies);
 
-        return prefix + "/details";
+        MerchantSponsorAppliesVo sponsorAppliesVo = MerchantSponsorAppliesVo.getNew();
+        sponsorAppliesVo.copy(sponsorApplies);
+
+        mmap.put("sponsorApplyInfo", sponsorAppliesVo);
+
+        return prefix + "/applyDetail";
     }
 
     @ApiOperation(value = "审核通过")

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

@@ -4,17 +4,17 @@ import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsServi
 
 public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthorizationRecordsService {
     @Override
-    public void checkerAdd(String cuid, String performanceId, String uid, boolean statistics) {
+    public void performanceCheckerAdd(String cuid, String performanceId, String uid, boolean statistics) {
 
     }
 
     @Override
-    public void checkerDel(String cuid, String performanceId, String uid) {
+    public void performanceCheckerDel(String cuid, String performanceId, String uid) {
 
     }
 
     @Override
-    public void checkers(String cuid, String performanceId) {
+    public void performanceCheckers(String cuid, String performanceId) {
 
     }
 }

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

@@ -86,7 +86,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
 
         // 若认领，查询验证场地
         MerchantFieldsVo fieldsVo = null;
-        if (!parameter.getFieldId().isEmpty()) {
+        if (null != parameter.getFieldId() && !parameter.getFieldId().isEmpty()) {
             fieldsVo = merchantRdmService.getFieldsVoByFieldId(parameter.getFieldId());
             if (null == fieldsVo) {
                 ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13101");