记得上下班打卡 | git大法好,push需谨慎

Commit 29416af2 authored by Tice's avatar Tice

主办申请审核

parent c3983863
...@@ -2,6 +2,7 @@ package com.liquidnet.service.merchant.dto.vo; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.merchant.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -49,4 +50,42 @@ public class MerchantSponsorsVo implements java.io.Serializable{ ...@@ -49,4 +50,42 @@ public class MerchantSponsorsVo implements java.io.Serializable{
private LocalDateTime createdAt; private LocalDateTime createdAt;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt; 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;
}
} }
package com.liquidnet.client.admin.web.controller.zhengzai.merchant; 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.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.client.admin.common.annotation.Log; import com.liquidnet.client.admin.common.annotation.Log;
import com.liquidnet.client.admin.common.core.controller.BaseController; 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.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType; import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.ShiroUtils; import com.liquidnet.client.admin.common.utils.ShiroUtils;
...@@ -10,6 +12,7 @@ import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldApplie ...@@ -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.dto.param.admin.MerchantFieldApplyListParam;
import com.liquidnet.service.merchant.entity.MerchantFieldApplies; import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -35,7 +38,7 @@ public class MerchantFieldAppliesController extends BaseController { ...@@ -35,7 +38,7 @@ public class MerchantFieldAppliesController extends BaseController {
} }
@Log(title = "场地申请管理", businessType = BusinessType.LIST) @Log(title = "场地申请列表", businessType = BusinessType.LIST)
@RequiresPermissions("merchant:field:apply:list") @RequiresPermissions("merchant:field:apply:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
...@@ -54,14 +57,43 @@ public class MerchantFieldAppliesController extends BaseController { ...@@ -54,14 +57,43 @@ public class MerchantFieldAppliesController extends BaseController {
)); ));
} }
@Log(title = "场地申请管理", businessType = BusinessType.DETAIL) @Log(title = "场地申请详情", businessType = BusinessType.DETAIL)
@RequiresPermissions("merchant:field:apply:detail") @RequiresPermissions("merchant:field:apply:detail")
@GetMapping(value = "/details/{fieldApplyId}") @GetMapping("/details/{fieldApplyId}")
public String detail(@PathVariable("fieldApplyId") String fieldApplyId, ModelMap mmap) { 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"; 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));
}
} }
package com.liquidnet.client.admin.web.controller.zhengzai.merchant; 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.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.client.admin.common.annotation.Log; import com.liquidnet.client.admin.common.annotation.Log;
import com.liquidnet.client.admin.common.core.controller.BaseController; 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.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType; import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.ShiroUtils; import com.liquidnet.client.admin.common.utils.ShiroUtils;
...@@ -10,6 +12,7 @@ import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorAppl ...@@ -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.dto.param.admin.MerchantSponsorApplyListParam;
import com.liquidnet.service.merchant.entity.MerchantSponsorApplies; import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -54,8 +57,41 @@ public class MerchantSponsorAppliesController extends BaseController { ...@@ -54,8 +57,41 @@ public class MerchantSponsorAppliesController extends BaseController {
@RequiresPermissions("merchant:sponsor:apply:detail") @RequiresPermissions("merchant:sponsor:apply:detail")
@GetMapping(value = "/details/{sponsorApplyId}") @GetMapping(value = "/details/{sponsorApplyId}")
public String detail(@PathVariable("sponsorApplyId") String sponsorApplyId, ModelMap mmap) { 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 authId = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName(); String authName = ShiroUtils.getLoginName();
return prefix + "/details"; 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));
}
} }
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantFieldApplies; import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
public interface IMerchantFieldAppliesAdminService extends IService<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);
} }
...@@ -2,10 +2,9 @@ package com.liquidnet.client.admin.zhengzai.merchant.service; ...@@ -2,10 +2,9 @@ package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantSponsorApplies; import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
public interface IMerchantSponsorAppliesAdminService extends IService<MerchantSponsorApplies> { 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);
} }
...@@ -56,7 +56,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -56,7 +56,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
@Override @Override
@Transactional @Transactional
public void applyApprove(String uid, String fieldApplyId, String auditUid, String auditName) { public boolean applyApprove(String uid, String fieldApplyId, String auditUid, String auditName) {
List<MerchantFieldAppliesVo> fieldAppliesVos = merchantRedisUtil.getFieldAppliesVosByUid(uid); List<MerchantFieldAppliesVo> fieldAppliesVos = merchantRedisUtil.getFieldAppliesVosByUid(uid);
if (CollectionUtils.isEmpty(fieldAppliesVos)) { if (CollectionUtils.isEmpty(fieldAppliesVos)) {
// todo error // todo error
...@@ -81,14 +81,6 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -81,14 +81,6 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
if (fieldAppliesVo.getApplyType().equals("claim")) { if (fieldAppliesVo.getApplyType().equals("claim")) {
// 认领逻辑 // 认领逻辑
// 场地申请 vo
fieldAppliesVo.setApplyStatus(1);
fieldAppliesVo.setReject("");
fieldAppliesVo.setAuditUid(auditUid);
fieldAppliesVo.setAuditName(auditName);
fieldAppliesVo.setAuditedAt(now);
fieldAppliesVo.setUpdatedAt(now);
// 公司 entity mysql // 公司 entity mysql
MerchantCompanies companiesEntity = new MerchantCompanies(); MerchantCompanies companiesEntity = new MerchantCompanies();
companiesEntity.setCompanyId(IDGenerator.nextSnowId()); companiesEntity.setCompanyId(IDGenerator.nextSnowId());
...@@ -141,7 +133,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -141,7 +133,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
fieldsEntity.setLatitude(fieldAppliesVo.getLatitude()); fieldsEntity.setLatitude(fieldAppliesVo.getLatitude());
fieldsEntity.setContactName(fieldAppliesVo.getContactName()); fieldsEntity.setContactName(fieldAppliesVo.getContactName());
fieldsEntity.setContactEmail(fieldAppliesVo.getContactEmail()); fieldsEntity.setContactEmail(fieldAppliesVo.getContactEmail());
fieldsEntity.setCompanyId(companiesEntity.getCompanyId()); fieldsEntity.setCompanyId(companiesVo.getCompanyId());
fieldsEntity.setUpdatedAt(now); fieldsEntity.setUpdatedAt(now);
LambdaUpdateWrapper<MerchantFields> fieldsLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFields.class); LambdaUpdateWrapper<MerchantFields> fieldsLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFields.class);
fieldsLambdaUpdateWrapper.eq(MerchantFields::getFieldId, fieldsEntity.getFieldId()); fieldsLambdaUpdateWrapper.eq(MerchantFields::getFieldId, fieldsEntity.getFieldId());
...@@ -155,6 +147,14 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -155,6 +147,14 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
fieldsVo.copy(fieldsEntity); fieldsVo.copy(fieldsEntity);
fieldsVo.setCompaniesVo(companiesVo); fieldsVo.setCompaniesVo(companiesVo);
// 场地申请 vo
fieldAppliesVo.setApplyStatus(1);
fieldAppliesVo.setReject("");
fieldAppliesVo.setAuditUid(auditUid);
fieldAppliesVo.setAuditName(auditName);
fieldAppliesVo.setAuditedAt(now);
fieldAppliesVo.setUpdatedAt(now);
// 场地申请 mysql // 场地申请 mysql
LambdaUpdateWrapper<MerchantFieldApplies> fieldAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFieldApplies.class); LambdaUpdateWrapper<MerchantFieldApplies> fieldAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFieldApplies.class);
fieldAppliesLambdaUpdateWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldAppliesVo.getFieldApplyId()); fieldAppliesLambdaUpdateWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldAppliesVo.getFieldApplyId());
...@@ -182,14 +182,6 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -182,14 +182,6 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
} else { } else {
// 创建逻辑 // 创建逻辑
// 场地申请 vo
fieldAppliesVo.setApplyStatus(1);
fieldAppliesVo.setReject("");
fieldAppliesVo.setAuditUid(auditUid);
fieldAppliesVo.setAuditName(auditName);
fieldAppliesVo.setAuditedAt(now);
fieldAppliesVo.setUpdatedAt(now);
// 公司 entity mysql // 公司 entity mysql
MerchantCompanies companiesEntity = new MerchantCompanies(); MerchantCompanies companiesEntity = new MerchantCompanies();
companiesEntity.setCompanyId(IDGenerator.nextSnowId()); companiesEntity.setCompanyId(IDGenerator.nextSnowId());
...@@ -233,7 +225,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -233,7 +225,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
fieldsEntity.setLatitude(fieldAppliesVo.getLatitude()); fieldsEntity.setLatitude(fieldAppliesVo.getLatitude());
fieldsEntity.setContactName(fieldAppliesVo.getContactName()); fieldsEntity.setContactName(fieldAppliesVo.getContactName());
fieldsEntity.setContactEmail(fieldAppliesVo.getContactEmail()); fieldsEntity.setContactEmail(fieldAppliesVo.getContactEmail());
fieldsEntity.setCompanyId(companiesEntity.getCompanyId()); fieldsEntity.setCompanyId(companiesVo.getCompanyId());
fieldsEntity.setCreatedAt(now); fieldsEntity.setCreatedAt(now);
success = merchantFieldsAdminService.save(fieldsEntity); success = merchantFieldsAdminService.save(fieldsEntity);
if (!success) { if (!success) {
...@@ -245,6 +237,15 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -245,6 +237,15 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
fieldsVo.copy(fieldsEntity); fieldsVo.copy(fieldsEntity);
fieldsVo.setCompaniesVo(companiesVo); fieldsVo.setCompaniesVo(companiesVo);
// 场地申请 vo
fieldAppliesVo.setApplyStatus(1);
fieldAppliesVo.setReject("");
fieldAppliesVo.setAuditUid(auditUid);
fieldAppliesVo.setAuditName(auditName);
fieldAppliesVo.setAuditedAt(now);
fieldAppliesVo.setUpdatedAt(now);
fieldAppliesVo.setFieldId(fieldsVo.getFieldId());
// 场地申请 mysql // 场地申请 mysql
LambdaUpdateWrapper<MerchantFieldApplies> fieldAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFieldApplies.class); LambdaUpdateWrapper<MerchantFieldApplies> fieldAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFieldApplies.class);
fieldAppliesLambdaUpdateWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldAppliesVo.getFieldApplyId()); fieldAppliesLambdaUpdateWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldAppliesVo.getFieldApplyId());
...@@ -254,6 +255,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -254,6 +255,7 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getAuditName, fieldAppliesVo.getAuditName()); fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getAuditName, fieldAppliesVo.getAuditName());
fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getAuditedAt, fieldAppliesVo.getAuditedAt()); fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getAuditedAt, fieldAppliesVo.getAuditedAt());
fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getUpdatedAt, fieldAppliesVo.getUpdatedAt()); fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getUpdatedAt, fieldAppliesVo.getUpdatedAt());
fieldAppliesLambdaUpdateWrapper.set(MerchantFieldApplies::getFieldId, fieldAppliesVo.getFieldId());
success = update(fieldAppliesLambdaUpdateWrapper); success = update(fieldAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error // todo error
...@@ -269,10 +271,12 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -269,10 +271,12 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
// 场地申请 sync redis // 场地申请 sync redis
merchantRedisUtil.setFieldAppliesVosByUid(uid, fieldAppliesVos); merchantRedisUtil.setFieldAppliesVosByUid(uid, fieldAppliesVos);
} }
return true;
} }
@Override @Override
public void applyReject(String uid, String fieldApplyId, String auditUid, String auditName, String reject) { public boolean applyReject(String uid, String fieldApplyId, String auditUid, String auditName, String reject) {
List<MerchantFieldAppliesVo> fieldAppliesVos = merchantRedisUtil.getFieldAppliesVosByUid(uid); List<MerchantFieldAppliesVo> fieldAppliesVos = merchantRedisUtil.getFieldAppliesVosByUid(uid);
if (CollectionUtils.isEmpty(fieldAppliesVos)) { if (CollectionUtils.isEmpty(fieldAppliesVos)) {
// todo error // todo error
...@@ -297,14 +301,6 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -297,14 +301,6 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
if (fieldAppliesVo.getApplyType().equals("claim")) { if (fieldAppliesVo.getApplyType().equals("claim")) {
// 驳回认领逻辑 // 驳回认领逻辑
// 场地申请 vo
fieldAppliesVo.setApplyStatus(2);
fieldAppliesVo.setReject(reject);
fieldAppliesVo.setAuditUid(auditUid);
fieldAppliesVo.setAuditName(auditName);
fieldAppliesVo.setAuditedAt(now);
fieldAppliesVo.setUpdatedAt(now);
// 场地 vo // 场地 vo
MerchantFieldsVo fieldsVo = merchantRedisUtil.getFieldsVoByFieldId(fieldAppliesVo.getFieldId()); MerchantFieldsVo fieldsVo = merchantRedisUtil.getFieldsVoByFieldId(fieldAppliesVo.getFieldId());
if (null == fieldsVo) { if (null == fieldsVo) {
...@@ -331,6 +327,14 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -331,6 +327,14 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
// 场地申请 vo
fieldAppliesVo.setApplyStatus(2);
fieldAppliesVo.setReject(reject);
fieldAppliesVo.setAuditUid(auditUid);
fieldAppliesVo.setAuditName(auditName);
fieldAppliesVo.setAuditedAt(now);
fieldAppliesVo.setUpdatedAt(now);
// 场地申请 mysql // 场地申请 mysql
LambdaUpdateWrapper<MerchantFieldApplies> fieldAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFieldApplies.class); LambdaUpdateWrapper<MerchantFieldApplies> fieldAppliesLambdaUpdateWrapper = Wrappers.lambdaUpdate(MerchantFieldApplies.class);
fieldAppliesLambdaUpdateWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldAppliesVo.getFieldApplyId()); fieldAppliesLambdaUpdateWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldAppliesVo.getFieldApplyId());
...@@ -386,6 +390,8 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi ...@@ -386,6 +390,8 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
// 场地申请 sync redis // 场地申请 sync redis
merchantRedisUtil.setFieldAppliesVosByUid(uid, fieldAppliesVos); merchantRedisUtil.setFieldAppliesVosByUid(uid, fieldAppliesVos);
} }
return true;
} }
......
package com.liquidnet.client.admin.zhengzai.merchant.service.impl; 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.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.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.MerchantSponsorApplies;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
import com.liquidnet.service.merchant.mapper.MerchantSponsorAppliesMapper; import com.liquidnet.service.merchant.mapper.MerchantSponsorAppliesMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.IntStream;
@Slf4j @Slf4j
@Service @Service
public class MerchantSponsorAppliesAdminServiceImpl extends ServiceImpl<MerchantSponsorAppliesMapper, MerchantSponsorApplies> implements IMerchantSponsorAppliesAdminService { 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;
}
} }
...@@ -34,4 +34,11 @@ public class MerchantMongoUtil { ...@@ -34,4 +34,11 @@ public class MerchantMongoUtil {
public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) { public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
return mongoTemplate.findOne(Query.query(Criteria.where("sponsorId").is(sponsorId)), MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName()); 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());
}
} }
...@@ -142,6 +142,11 @@ public class MerchantRedisUtil { ...@@ -142,6 +142,11 @@ public class MerchantRedisUtil {
return vos; 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) { public boolean addSponsorAppliesVoByUid(String uid, List<MerchantSponsorAppliesVo> vos, MerchantSponsorAppliesVo vo) {
if (null == vos) { if (null == vos) {
...@@ -159,4 +164,20 @@ public class MerchantRedisUtil { ...@@ -159,4 +164,20 @@ public class MerchantRedisUtil {
vos.removeIf(r -> r.getSponsorApplyId().equals(vo.getSponsorApplyId())); vos.removeIf(r -> r.getSponsorApplyId().equals(vo.getSponsorApplyId()));
return redisUtil.set(MerchantRedisConst.INFO_SPONSOR_APPLIES.concat(uid), vos); 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);
}
} }
...@@ -49,6 +49,11 @@ public class MerchantSponsorApplies implements Serializable { ...@@ -49,6 +49,11 @@ public class MerchantSponsorApplies implements Serializable {
*/ */
private String uid; private String uid;
/**
* 要认领的或创建的主办ID
*/
private String sponsorId;
/** /**
* 名称 * 名称
*/ */
......
...@@ -144,6 +144,7 @@ create table merchant_sponsor_applies ...@@ -144,6 +144,7 @@ create table merchant_sponsor_applies
apply_type varchar(255) default '' not null comment '类型 create创建', apply_type varchar(255) default '' not null comment '类型 create创建',
reject varchar(255) default '' not null comment '驳回原因', reject varchar(255) default '' not null comment '驳回原因',
uid varchar(64) 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 '名称', name varchar(255) default '' not null comment '名称',
logo varchar(255) default '' not null comment 'logo图片地址', logo varchar(255) default '' not null comment 'logo图片地址',
background varchar(255) default '' not null comment '背景图片地址', background varchar(255) default '' not null comment '背景图片地址',
...@@ -169,6 +170,7 @@ create table merchant_sponsor_applies ...@@ -169,6 +170,7 @@ create table merchant_sponsor_applies
) engine=InnoDB default charset=utf8mb4 collate=utf8mb4_unicode_ci comment '主办申请表'; ) 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_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); create index uid_index on merchant_sponsor_applies (uid);
-- >>------------------------------------------------------------------------------------ -- >>------------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment