更新

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,7 +72,20 @@ 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);
+
+        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";
     }

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,7 +62,11 @@ 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);
+
+        MerchantSponsorAppliesVo sponsorAppliesVo = MerchantSponsorAppliesVo.getNew();
+        sponsorAppliesVo.copy(sponsorApplies);
+
+        mmap.put("sponsorApplyInfo", sponsorAppliesVo);
 
         return prefix + "/applyDetail";
     }

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

@@ -12,15 +12,15 @@ import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.merchant.constant.MerchantPermissionConst;
-import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
-import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
-import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
+import com.liquidnet.service.merchant.dto.vo.*;
 import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
 import com.liquidnet.service.merchant.entity.MerchantAuthorizationRecords;
 import com.liquidnet.service.merchant.mapper.MerchantAuthorizationRecordsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -95,7 +95,9 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
         creatorAuthorizationRecords.setCuidRole("creator");
         creatorAuthorizationRecords.setCreatedAt(now);
         authorizationRecordsArrayList.add(creatorAuthorizationRecords);
+
         // 授权权限
+        ArrayList<MerchantAuthorizationPermissionsVo> creatorAuthorizationPermissionsVos = new ArrayList<>();
         String[] fielderPermissionIds = {
                 MerchantPermissionConst.PerformancePermission.READ.getId(),
                 MerchantPermissionConst.PerformancePermission.EDIT.getId(),
@@ -105,6 +107,7 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 MerchantPermissionConst.PerformancePermission.ACCREDIT.getId()
         };
         for (String permissionId : fielderPermissionIds) {
+            // entity
             MerchantAuthorizationPermissions creatorAuthorizationPermissions = new MerchantAuthorizationPermissions();
             creatorAuthorizationPermissions.setAuthorizationPermissionId(IDGenerator.nextSnowId());
             creatorAuthorizationPermissions.setAuthorizationRecordId(creatorAuthorizationRecords.getAuthorizationRecordId());
@@ -113,14 +116,29 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
             creatorAuthorizationPermissions.setEndTime(now.plusYears(99));
             creatorAuthorizationPermissions.setCreatedAt(now);
             authorizationPermissionsArrayList.add(creatorAuthorizationPermissions);
+            // vo
+            MerchantAuthorizationPermissionsVo authorizationPermissionsVo = MerchantAuthorizationPermissionsVo.getNew();
+            authorizationPermissionsVo.copy(creatorAuthorizationPermissions);
+            creatorAuthorizationPermissionsVos.add(authorizationPermissionsVo);
         }
 
         // mysql
-        saveBatch(authorizationRecordsArrayList);
-        authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
-
-        // todo mongo
+        boolean success = saveBatch(authorizationRecordsArrayList);
+        if (!success) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
+        success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
+        if (!success) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
 
+        // mongo
+        MerchantAuthorizationRecordsVo authorizationRecordsVo = MerchantAuthorizationRecordsVo.getNew();
+        authorizationRecordsVo.copy(creatorAuthorizationRecords);
+        authorizationRecordsVo.setPermissionsVos(creatorAuthorizationPermissionsVos);
+        mongoTemplate.insert(authorizationRecordsVo, MerchantAuthorizationRecordsVo.class.getSimpleName());
 
         return true;
     }
@@ -169,7 +187,14 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 throw new LiquidnetServiceException();
             }
 
-            // todo mongo
+            // mongo
+            Criteria criteria = Criteria.where("performanceId").is(performanceId).and("deletedAt").is(null);
+            criteria.orOperator(
+                    Criteria.where("authorizationRecordId").is(authorizationRecords.getAuthorizationRecordId()),
+                    Criteria.where("cuid").is(authorizationRecords.getUid()).and("cuidRole").is("fielder")
+            );
+            Query query = Query.query(criteria);
+            mongoTemplate.remove(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
         }
 
         // 是否添加权限
@@ -177,7 +202,9 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
             ArrayList<MerchantAuthorizationRecords> authorizationRecordsArrayList = new ArrayList<>();
             ArrayList<MerchantAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>();
 
-            // 授权记录
+            ArrayList<MerchantAuthorizationRecordsVo> authorizationRecordsVoArrayList = new ArrayList<>();
+
+            // 授权记录 entity
             // todo 用户信息
             MerchantAuthorizationRecords fielderAuthorizationRecords = new MerchantAuthorizationRecords();
             fielderAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
@@ -190,7 +217,8 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
             fielderAuthorizationRecords.setCuidRole("creator");
             fielderAuthorizationRecords.setCreatedAt(now);
             authorizationRecordsArrayList.add(fielderAuthorizationRecords);
-            // 授权权限
+            // 授权权限 entity vo
+            ArrayList<MerchantAuthorizationPermissionsVo> fielderAuthorizationPermissionsVos = new ArrayList<>();
             String[] fielderPermissionIds = {
                     MerchantPermissionConst.PerformancePermission.READ.getId(),
                     MerchantPermissionConst.PerformancePermission.CHECK.getId(),
@@ -205,18 +233,27 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 fielderAuthorizationPermissions.setEndTime(now.plusYears(99));
                 fielderAuthorizationPermissions.setCreatedAt(now);
                 authorizationPermissionsArrayList.add(fielderAuthorizationPermissions);
+
+                MerchantAuthorizationPermissionsVo fielderAuthorizationPermissionsVo = MerchantAuthorizationPermissionsVo.getNew();
+                fielderAuthorizationPermissionsVo.copy(fielderAuthorizationPermissions);
+                fielderAuthorizationPermissionsVos.add(fielderAuthorizationPermissionsVo);
             }
+            // 授权记录 vo
+            MerchantAuthorizationRecordsVo fielderAuthorizationRecordsVo = MerchantAuthorizationRecordsVo.getNew();
+            fielderAuthorizationRecordsVo.copy(fielderAuthorizationRecords);
+            fielderAuthorizationRecordsVo.setPermissionsVos(fielderAuthorizationPermissionsVos);
+            authorizationRecordsVoArrayList.add(fielderAuthorizationRecordsVo);
 
             // 查询默认验票员
             List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRedisUtil.getFieldCheckersVosByFieldId(fieldId);
             if (!CollectionUtil.isEmpty(fieldCheckersVos)) {
-                // 授权权限
+                // 验票员 授权权限
                 String[] checkerPermissionIds = {
                         MerchantPermissionConst.PerformancePermission.CHECK.getId()
                 };
 
                 for (MerchantFieldCheckersVo fieldCheckersVo: fieldCheckersVos) {
-                    // 授权记录
+                    // 验票员 授权记录 entity
                     MerchantAuthorizationRecords checkerAuthorizationRecords = new MerchantAuthorizationRecords();
                     checkerAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
                     checkerAuthorizationRecords.setPerformanceId(performanceId);
@@ -229,7 +266,8 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                     checkerAuthorizationRecords.setCreatedAt(now);
                     authorizationRecordsArrayList.add(checkerAuthorizationRecords);
 
-                    // 授权权限
+                    // 验票员 授权权限 entity vo
+                    ArrayList<MerchantAuthorizationPermissionsVo> checkerAuthorizationPermissionsVos = new ArrayList<>();
                     for (String permissionId : checkerPermissionIds) {
                         MerchantAuthorizationPermissions checkerAuthorizationPermissions = new MerchantAuthorizationPermissions();
                         checkerAuthorizationPermissions.setAuthorizationPermissionId(IDGenerator.nextSnowId());
@@ -239,7 +277,17 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                         checkerAuthorizationPermissions.setEndTime(now.plusYears(99));
                         checkerAuthorizationPermissions.setCreatedAt(now);
                         authorizationPermissionsArrayList.add(checkerAuthorizationPermissions);
+
+                        MerchantAuthorizationPermissionsVo checkerAuthorizationPermissionsVo = MerchantAuthorizationPermissionsVo.getNew();
+                        checkerAuthorizationPermissionsVo.copy(checkerAuthorizationPermissions);
+                        checkerAuthorizationPermissionsVos.add(checkerAuthorizationPermissionsVo);
                     }
+
+                    // 验票员 授权记录 vo
+                    MerchantAuthorizationRecordsVo checkerAuthorizationRecordsVo = MerchantAuthorizationRecordsVo.getNew();
+                    checkerAuthorizationRecordsVo.copy(checkerAuthorizationRecords);
+                    checkerAuthorizationRecordsVo.setPermissionsVos(checkerAuthorizationPermissionsVos);
+                    authorizationRecordsVoArrayList.add(checkerAuthorizationRecordsVo);
                 }
             }
 
@@ -255,7 +303,8 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 throw new LiquidnetServiceException();
             }
 
-            // todo mongo
+            // mongo
+            mongoTemplate.insert(authorizationRecordsVoArrayList, MerchantAuthorizationRecordsVo.class.getSimpleName());
         }
 
         return true;
@@ -305,7 +354,14 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 throw new LiquidnetServiceException();
             }
 
-            // todo mongo
+            // mongo
+            Criteria criteria = Criteria.where("performanceId").is(performanceId).and("deletedAt").is(null);
+            criteria.orOperator(
+                    Criteria.where("authorizationRecordId").is(authorizationRecords.getAuthorizationRecordId()),
+                    Criteria.where("cuid").is(authorizationRecords.getUid()).and("cuidRole").is("sponsor")
+            );
+            Query query = Query.query(criteria);
+            mongoTemplate.remove(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
         }
 
         // 是否添加权限
@@ -313,7 +369,7 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
             ArrayList<MerchantAuthorizationRecords> authorizationRecordsArrayList = new ArrayList<>();
             ArrayList<MerchantAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>();
 
-            // 授权记录
+            // 授权记录 entity
             // todo 用户信息
             MerchantAuthorizationRecords sponsorAuthorizationRecords = new MerchantAuthorizationRecords();
             sponsorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
@@ -326,7 +382,8 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
             sponsorAuthorizationRecords.setCuidRole("creator");
             sponsorAuthorizationRecords.setCreatedAt(now);
             authorizationRecordsArrayList.add(sponsorAuthorizationRecords);
-            // 授权权限
+            // 授权权限 entity vo
+            ArrayList<MerchantAuthorizationPermissionsVo> sponsorAuthorizationPermissionsVos = new ArrayList<>();
             String[] fielderPermissionIds = {
                     MerchantPermissionConst.PerformancePermission.READ.getId(),
                     MerchantPermissionConst.PerformancePermission.CHECK.getId(),
@@ -342,14 +399,30 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
                 sponsorAuthorizationPermissions.setEndTime(now.plusYears(99));
                 sponsorAuthorizationPermissions.setCreatedAt(now);
                 authorizationPermissionsArrayList.add(sponsorAuthorizationPermissions);
+
+                MerchantAuthorizationPermissionsVo sponsorAuthorizationPermissionsVo = MerchantAuthorizationPermissionsVo.getNew();
+                sponsorAuthorizationPermissionsVo.copy(sponsorAuthorizationPermissions);
+                sponsorAuthorizationPermissionsVos.add(sponsorAuthorizationPermissionsVo);
             }
+            // 授权记录 vo
+            MerchantAuthorizationRecordsVo sponsorAuthorizationRecordsVo = MerchantAuthorizationRecordsVo.getNew();
+            sponsorAuthorizationRecordsVo.copy(sponsorAuthorizationRecords);
+            sponsorAuthorizationRecordsVo.setPermissionsVos(sponsorAuthorizationPermissionsVos);
 
             // mysql
-            saveBatch(authorizationRecordsArrayList);
-            authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
-
-            // todo mongo
+            boolean success = saveBatch(authorizationRecordsArrayList);
+            if (!success) {
+                // todo error
+                throw new LiquidnetServiceException();
+            }
+            success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
+            if (!success) {
+                // todo error
+                throw new LiquidnetServiceException();
+            }
 
+            // mongo
+            mongoTemplate.insert(sponsorAuthorizationRecordsVo, MerchantAuthorizationRecordsVo.class.getSimpleName());
         }
 
         return true;