Merge branch 'dev_merchant_tice' into dev_merchant

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

@@ -2,6 +2,7 @@ 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.MerchantSponsors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -49,4 +50,42 @@ public class MerchantSponsorsVo implements java.io.Serializable{
     private LocalDateTime createdAt;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
+
+
+    private static final MerchantSponsorsVo obj = new MerchantSponsorsVo();
+
+    public static MerchantSponsorsVo getNew() {
+        try {
+            return (MerchantSponsorsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new MerchantSponsorsVo();
+    }
+
+    public MerchantSponsorsVo copy(MerchantSponsors source) {
+        if (null == source) return this;
+
+        this.setSponsorId(source.getSponsorId());
+        this.setIsOnline(source.getIsOnline());
+        this.setUid(source.getUid());
+
+        this.setName(source.getName());
+        this.setLogo(source.getLogo());
+        this.setBackground(source.getBackground());
+        this.setDescription(source.getDescription());
+
+        this.setContactName(source.getContactName());
+        this.setContactIdentity(source.getContactIdentity());
+        this.setContactIdentityObverse(source.getContactIdentityObverse());
+        this.setContactIdentityReverse(source.getContactIdentityReverse());
+        this.setContactEmail(source.getContactEmail());
+
+        this.setCompanyId(source.getCompanyId());
+
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+
+        return this;
+    }
 }

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

 package com.liquidnet.client.admin.web.controller.zhengzai.merchant;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 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;
@@ -10,6 +12,7 @@ import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldApplie
 import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldApplyListParam;
 import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,7 +38,7 @@ public class MerchantFieldAppliesController extends BaseController {
     }
 
 
-    @Log(title = "场地申请管理", businessType = BusinessType.LIST)
+    @Log(title = "场地申请列表", businessType = BusinessType.LIST)
     @RequiresPermissions("merchant:field:apply:list")
     @PostMapping("/list")
     @ResponseBody
@@ -54,14 +57,43 @@ public class MerchantFieldAppliesController extends BaseController {
         ));
     }
 
-    @Log(title = "场地申请管理", businessType = BusinessType.DETAIL)
+    @Log(title = "场地申请详情", businessType = BusinessType.DETAIL)
     @RequiresPermissions("merchant:field:apply:detail")
-    @GetMapping(value = "/details/{fieldApplyId}")
+    @GetMapping("/details/{fieldApplyId}")
     public String detail(@PathVariable("fieldApplyId") String fieldApplyId, ModelMap mmap) {
-        String authId = ShiroUtils.getUserId().toString();
-        String authName = ShiroUtils.getLoginName();
+
+        LambdaQueryWrapper<MerchantFieldApplies> fieldAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFieldApplies.class);
+        fieldAppliesLambdaQueryWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldApplyId);
+        MerchantFieldApplies fieldApplies = merchantFieldAppliesAdminService.getOne(fieldAppliesLambdaQueryWrapper);
+        mmap.put("fieldApplyInfo", fieldApplies);
+
         return prefix + "/details";
     }
 
+    @ApiOperation(value = "审核通过")
+    @Log(title = "场地申请审核通过", businessType = BusinessType.INSERT)
+    @RequiresPermissions("merchant:field:apply:approve")
+    @PostMapping("/approve")
+    @ResponseBody
+    public AjaxResult approve(@RequestParam(required = true) String uid,
+                              @RequestParam(required = true) String fieldApplyId) {
+        String authUid = ShiroUtils.getUserId().toString();
+        String authName = ShiroUtils.getLoginName();
 
+        return toAjax(merchantFieldAppliesAdminService.applyApprove(uid, fieldApplyId, authUid, authName));
+    }
+
+    @ApiOperation(value = "审核驳回")
+    @Log(title = "场地申请审核驳回", businessType = BusinessType.INSERT)
+    @RequiresPermissions("merchant:field:apply:reject")
+    @PostMapping("/reject")
+    @ResponseBody
+    public AjaxResult reject(@RequestParam(required = true) String uid,
+                             @RequestParam(required = true) String fieldApplyId,
+                             @RequestParam(required = true) String reject) {
+        String authUid = ShiroUtils.getUserId().toString();
+        String authName = ShiroUtils.getLoginName();
+
+        return toAjax(merchantFieldAppliesAdminService.applyReject(uid, fieldApplyId, authUid, authName, reject));
+    }
 }

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

 package com.liquidnet.client.admin.web.controller.zhengzai.merchant;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 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;
@@ -10,6 +12,7 @@ import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorAppl
 import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorApplyListParam;
 import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -54,8 +57,41 @@ public class MerchantSponsorAppliesController extends BaseController {
     @RequiresPermissions("merchant:sponsor:apply:detail")
     @GetMapping(value = "/details/{sponsorApplyId}")
     public String detail(@PathVariable("sponsorApplyId") String sponsorApplyId, ModelMap mmap) {
+
+        LambdaQueryWrapper<MerchantSponsorApplies> sponsorAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsorApplies.class);
+        sponsorAppliesLambdaQueryWrapper.eq(MerchantSponsorApplies::getSponsorApplyId, sponsorApplyId);
+        MerchantSponsorApplies sponsorApplies = merchantSponsorAppliesAdminService.getOne(sponsorAppliesLambdaQueryWrapper);
+        mmap.put("sponsorApplyInfo", sponsorApplies);
+
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
         return prefix + "/details";
     }
+
+    @ApiOperation(value = "审核通过")
+    @Log(title = "主办申请审核通过", businessType = BusinessType.INSERT)
+    @RequiresPermissions("merchant:sponsor:apply:approve")
+    @PostMapping("/approve")
+    @ResponseBody
+    public AjaxResult approve(@RequestParam(required = true) String uid,
+                              @RequestParam(required = true) String sponsorApplyId) {
+        String authUid = ShiroUtils.getUserId().toString();
+        String authName = ShiroUtils.getLoginName();
+
+        return toAjax(merchantSponsorAppliesAdminService.applyApprove(uid, sponsorApplyId, authUid, authName));
+    }
+
+    @ApiOperation(value = "审核驳回")
+    @Log(title = "主办申请审核驳回", businessType = BusinessType.INSERT)
+    @RequiresPermissions("merchant:sponsor:apply:reject")
+    @PostMapping("/reject")
+    @ResponseBody
+    public AjaxResult reject(@RequestParam(required = true) String uid,
+                             @RequestParam(required = true) String sponsorApplyId,
+                             @RequestParam(required = true) String reject) {
+        String authUid = ShiroUtils.getUserId().toString();
+        String authName = ShiroUtils.getLoginName();
+
+        return toAjax(merchantSponsorAppliesAdminService.applyReject(uid, sponsorApplyId, authUid, authName, reject));
+    }
 }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
 
 public interface IMerchantFieldAppliesAdminService extends IService<MerchantFieldApplies>  {
-    void applyApprove(String uid, String fieldApplyId, String auditUid, String auditName);
+    boolean applyApprove(String uid, String fieldApplyId, String auditUid, String auditName);
 
-    void applyReject(String uid, String fieldApplyId, String auditUid, String auditName, String reject);
+    boolean applyReject(String uid, String fieldApplyId, String auditUid, String auditName, String reject);
 }

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

@@ -2,10 +2,9 @@ package com.liquidnet.client.admin.zhengzai.merchant.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
 
 public interface IMerchantSponsorAppliesAdminService extends IService<MerchantSponsorApplies> {
+    boolean applyApprove(String uid, String sponsorApplyId, String auditUid, String auditName);
 
-
+    boolean applyReject(String uid, String sponsorApplyId, String auditUid, String auditName, String reject);
 }

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

 package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService;
 import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorAppliesAdminService;
+import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorsAdminService;
+import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantMongoUtil;
+import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantRedisUtil;
+import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
+import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
+import com.liquidnet.service.merchant.entity.MerchantCompanies;
 import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
+import com.liquidnet.service.merchant.entity.MerchantSponsors;
 import com.liquidnet.service.merchant.mapper.MerchantSponsorAppliesMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.IntStream;
 
 @Slf4j
 @Service
 public class MerchantSponsorAppliesAdminServiceImpl extends ServiceImpl<MerchantSponsorAppliesMapper, MerchantSponsorApplies> implements IMerchantSponsorAppliesAdminService {
 
+    @Autowired
+    MerchantRedisUtil merchantRedisUtil;
+
+    @Autowired
+    MerchantMongoUtil merchantMongoUtil;
+
+    @Autowired
+    IMerchantSponsorsAdminService merchantSponsorsAdminService;
+
+    @Autowired
+    IMerchantCompaniesAdminService merchantCompaniesAdminService;
+
+    @Override
+    public boolean applyApprove(String uid, String sponsorApplyId, String auditUid, String auditName) {
+        List<MerchantSponsorAppliesVo> sponsorAppliesVos = merchantRedisUtil.getSponsorAppliesVosByUid(uid);
+        if (CollectionUtils.isEmpty(sponsorAppliesVos)) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
+        int idx = IntStream.range(0, sponsorAppliesVos.size())
+                .filter(i -> sponsorAppliesVos.get(i).getSponsorApplyId().equals(sponsorApplyId))
+                .findFirst()
+                .orElse(-1);
+        if (idx < 0) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
+        MerchantSponsorAppliesVo sponsorAppliesVo = sponsorAppliesVos.get(idx);
+        if (0 != sponsorAppliesVo.getApplyStatus()) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+
+        // 创建逻辑
+        MerchantCompaniesVo companiesVo = null;
+        if (!sponsorAppliesVo.getCompanyName().isEmpty()) {
+            // 公司 entity mysql
+            MerchantCompanies companiesEntity = new MerchantCompanies();
+            companiesEntity.setCompanyId(IDGenerator.nextSnowId());
+            companiesEntity.setName(sponsorAppliesVo.getCompanyName());
+            companiesEntity.setLicenseCode(sponsorAppliesVo.getLicenseCode());
+            companiesEntity.setLicenseImg(sponsorAppliesVo.getLicenseImg());
+            companiesEntity.setLegalName(sponsorAppliesVo.getLegalName());
+            companiesEntity.setLegalIdentity(sponsorAppliesVo.getLegalIdentity());
+            companiesEntity.setLegalIdentityObverse(sponsorAppliesVo.getLegalIdentityObverse());
+            companiesEntity.setLegalIdentityReverse(sponsorAppliesVo.getLegalIdentityReverse());
+            companiesEntity.setCreatedAt(now);
+            boolean success = merchantCompaniesAdminService.save(companiesEntity);
+            if (!success) {
+                // todo error
+                throw new LiquidnetServiceException();
+            }
+            // 公司 vo
+            companiesVo = MerchantCompaniesVo.getNew();
+            companiesVo.copy(companiesEntity);
+        }
+
+        // 主办 entity mysql
+        MerchantSponsors sponsorsEntity = new MerchantSponsors();
+        sponsorsEntity.setSponsorId(IDGenerator.nextSnowId());
+        sponsorsEntity.setIsOnline(1);
+        sponsorsEntity.setUid(uid);
+        sponsorsEntity.setName(sponsorAppliesVo.getName());
+        sponsorsEntity.setLogo(sponsorAppliesVo.getLogo());
+        sponsorsEntity.setBackground(sponsorAppliesVo.getBackground());
+        sponsorsEntity.setDescription(sponsorAppliesVo.getDescription());
+        sponsorsEntity.setContactName(sponsorAppliesVo.getContactName());
+        sponsorsEntity.setContactIdentity(sponsorAppliesVo.getContactIdentity());
+        sponsorsEntity.setContactIdentityObverse(sponsorAppliesVo.getContactIdentityObverse());
+        sponsorsEntity.setContactIdentityReverse(sponsorAppliesVo.getContactIdentityReverse());
+        sponsorsEntity.setContactEmail(sponsorAppliesVo.getContactEmail());
+        if (null != companiesVo) {
+            sponsorsEntity.setCompanyId(companiesVo.getCompanyId());
+        }
+        sponsorsEntity.setCreatedAt(now);
+        boolean success = merchantSponsorsAdminService.save(sponsorsEntity);
+        if (!success) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
+        // 主办 vo
+        MerchantSponsorsVo sponsorsVo = MerchantSponsorsVo.getNew();
+        sponsorsVo.copy(sponsorsEntity);
+        if (null != companiesVo) {
+            sponsorsVo.setCompaniesVo(companiesVo);
+        }
+
+        // 主办申请 vo
+        sponsorAppliesVo.setApplyStatus(1);
+        sponsorAppliesVo.setReject("");
+        sponsorAppliesVo.setAuditUid(auditUid);
+        sponsorAppliesVo.setAuditName(auditName);
+        sponsorAppliesVo.setAuditedAt(now);
+        sponsorAppliesVo.setUpdatedAt(now);
+        sponsorAppliesVo.setSponsorId(sponsorsVo.getSponsorId());
+
+        // 主办申请 mysql
+        LambdaUpdateWrapper<MerchantSponsorApplies> sponsorAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantSponsorApplies.class);
+        sponsorAppliesLambdaUpdateWrapper.eq(MerchantSponsorApplies::getSponsorApplyId, sponsorAppliesVo.getSponsorApplyId());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getApplyStatus, sponsorAppliesVo.getApplyStatus());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getReject, sponsorAppliesVo.getReject());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getAuditUid, sponsorAppliesVo.getAuditUid());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getAuditName, sponsorAppliesVo.getAuditName());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getAuditedAt, sponsorAppliesVo.getAuditedAt());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getUpdatedAt, sponsorAppliesVo.getUpdatedAt());
+        sponsorAppliesLambdaUpdateWrapper.set(MerchantSponsorApplies::getSponsorId, sponsorAppliesVo.getSponsorId());
+        success = update(sponsorAppliesLambdaUpdateWrapper);
+        if (!success) {
+            // todo error
+            throw new LiquidnetServiceException();
+        }
+
+        // 主办 sync mongo
+        merchantMongoUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
+
+        // 主办 sync redis
+        merchantRedisUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
+
+        // 主办申请 sync redis
+        merchantRedisUtil.setSponsorAppliesVosByUid(uid, sponsorAppliesVos);
+        
+        return true;
+    }
+
+    @Override
+    public boolean applyReject(String uid, String sponsorApplyId, String auditUid, String auditName, String reject) {
+
+        return true;
+    }
 }

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

@@ -2,10 +2,13 @@ package com.liquidnet.client.admin.zhengzai.merchant.utils;
 
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
+import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -13,11 +16,29 @@ public class MerchantMongoUtil {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    public MerchantFieldsVo getMerchantFieldsVoByFieldId(String fieldId) {
+    @Autowired
+    private MongoConverter mongoConverter;
+
+
+    public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
         return mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
     }
 
-    public MerchantSponsorsVo getMerchantSponsorsVoBySponsorId(String sponsorId) {
+    public void setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
+        Query query = Query.query(Criteria.where("fieldId").is(fieldId));
+        Document document = (Document)mongoConverter.convertToMongoType(vo);
+        Update update = Update.fromDocument(document);
+        mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
+    }
+
+    public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
         return mongoTemplate.findOne(Query.query(Criteria.where("sponsorId").is(sponsorId)), MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
     }
+
+    public void setSponsorsVoBySponsorId(String sponsorId, MerchantSponsorsVo vo) {
+        Query query = Query.query(Criteria.where("sponsorId").is(sponsorId));
+        Document document = (Document)mongoConverter.convertToMongoType(vo);
+        Update update = Update.fromDocument(document);
+        mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
+    }
 }

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

@@ -10,6 +10,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.IntStream;
 
 @Slf4j
 @Service
@@ -27,7 +28,7 @@ public class MerchantRedisUtil {
         MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         if (null == vo) {
-            vo = mongoUtil.getMerchantFieldsVoByFieldId(fieldId);
+            vo = mongoUtil.getFieldsVoByFieldId(fieldId);
             this.setFieldsVoByFieldId(fieldId, vo);
         }
         return vo;
@@ -48,6 +49,11 @@ public class MerchantRedisUtil {
         return vos;
     }
 
+    // 【场地认领】更新我的列表
+    public boolean setFieldAppliesVosByUid(String uid, List<MerchantFieldAppliesVo> vos) {
+        return redisUtil.set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
+    }
+
     // 【场地申请】新增
     public boolean addFieldAppliesVoByUid(String uid, List<MerchantFieldAppliesVo> vos, MerchantFieldAppliesVo vo) {
         if (null == vos) {
@@ -66,6 +72,21 @@ public class MerchantRedisUtil {
         return redisUtil.set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
     }
 
+    // 【场地申请】更新
+    public boolean setFieldAppliesVoByUid(String uid, List<MerchantFieldAppliesVo> vos, MerchantFieldAppliesVo vo) {
+        if (CollectionUtils.isEmpty(vos)) {
+            return false;
+        }
+        int idx = IntStream.range(0, vos.size())
+                .filter(i -> vos.get(i).getFieldApplyId().equals(vo.getFieldApplyId()))
+                .findFirst().orElse(-1);
+        if (idx == -1) {
+            return false;
+        }
+        vos.set(idx, vo);
+        return redisUtil.set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
+    }
+
 
     // 【场地默认验票员】列表
     public List<MerchantFieldCheckersVo> getFieldCheckersVosByFieldId(String fieldId) {
@@ -101,7 +122,7 @@ public class MerchantRedisUtil {
         MerchantSponsorsVo vo = (MerchantSponsorsVo) redisUtil.get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         if (null == vo) {
-            vo = mongoUtil.getMerchantSponsorsVoBySponsorId(sponsorId);
+            vo = mongoUtil.getSponsorsVoBySponsorId(sponsorId);
             this.setSponsorsVoBySponsorId(sponsorId, vo);
         }
         return vo;
@@ -121,6 +142,11 @@ public class MerchantRedisUtil {
         return vos;
     }
 
+    // 【主办申请】更新我的列表
+    public boolean setSponsorAppliesVosByUid(String uid, List<MerchantSponsorAppliesVo> vos) {
+        return redisUtil.set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
+    }
+
     // 【主办申请】新增
     public boolean addSponsorAppliesVoByUid(String uid, List<MerchantSponsorAppliesVo> vos, MerchantSponsorAppliesVo vo) {
         if (null == vos) {
@@ -138,4 +164,20 @@ public class MerchantRedisUtil {
         vos.removeIf(r -> r.getSponsorApplyId().equals(vo.getSponsorApplyId()));
         return redisUtil.set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
     }
+
+    // 【主办申请】更新
+    public boolean setSponsorAppliesVoByUid(String uid, List<MerchantSponsorAppliesVo> vos, MerchantSponsorAppliesVo vo) {
+        if (CollectionUtils.isEmpty(vos)) {
+            return false;
+        }
+        int idx = IntStream.range(0, vos.size())
+                .filter(i -> vos.get(i).getSponsorApplyId().equals(vo.getSponsorApplyId()))
+                .findFirst().orElse(-1);
+        if (idx == -1) {
+            return false;
+        }
+        vos.set(idx, vo);
+        return redisUtil.set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos);
+    }
+
 }

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

@@ -49,6 +49,11 @@ public class MerchantSponsorApplies implements Serializable {
      */
     private String uid;
 
+    /**
+     * 要认领的或创建的主办ID
+     */
+    private String sponsorId;
+
     /**
      * 名称
      */

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

@@ -144,6 +144,7 @@ create table merchant_sponsor_applies
     apply_type               varchar(255) default '' not null comment '类型 create创建',
     reject                   varchar(255) default '' not null comment '驳回原因',
     uid                      varchar(64)  default '' not null comment '申请者账号',
+    sponsor_id               varchar(64)  default '' not null comment '要认领的或创建的主办ID',
     name                     varchar(255) default '' not null comment '名称',
     logo                     varchar(255) default '' not null comment 'logo图片地址',
     background               varchar(255) default '' not null comment '背景图片地址',
@@ -169,6 +170,7 @@ create table merchant_sponsor_applies
 ) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '主办申请表';
 
 create index sponsor_apply_id_index on merchant_sponsor_applies (sponsor_apply_id);
+create index sponsor_id_index on merchant_field_applies (sponsor_id);
 create index uid_index on merchant_sponsor_applies (uid);
 
 -- >>------------------------------------------------------------------------------------

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

@@ -45,7 +45,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
     MerchantRdmService merchantRdmService;
 
     @Autowired
-    private MongoTemplate mongoTemplate;
+    MongoTemplate mongoTemplate;
 
     @Autowired
     QueueUtil queueUtils;
@@ -122,7 +122,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
             // 场地 mongo
             s = System.currentTimeMillis();
             Query query = Query.query(Criteria.where("fieldId").is(fieldsVo.getFieldId()));
-            Update update = Update.update("claimStatus", fieldsVo.getClaimStatus()).set("uid", fieldsVo.getUid()).set("updateAt", fieldsVo.getUpdatedAt());
+            Update update = Update.update("claimStatus", fieldsVo.getClaimStatus()).set("uid", fieldsVo.getUid()).set("updatedAt", fieldsVo.getUpdatedAt());
             mongoTemplate.updateFirst(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
             log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
         }

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

@@ -42,7 +42,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
     MerchantRdmService merchantRdmService;
 
     @Autowired
-    private MongoTemplate mongoTemplate;
+    MongoTemplate mongoTemplate;
 
     @Autowired
     QueueUtil queueUtils;