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

Skip to content

L
liquidnet-bus-v1
Commit c4ef1d20 authored by 张国柄's avatar 张国柄
Browse files
Options

Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant

parents dc50af87 0622e725
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 147 deletions
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantFieldEditParam.java → liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/admin/MerchantFieldEditParam.java
View file @ c4ef1d20
package com.liquidnet.service.merchant.dto.param;
package com.liquidnet.service.merchant.dto.param.admin;
import com.liquidnet.commons.lang.constant.LnsRegex;
import io.swagger.annotations.ApiModel;
......@@ -55,6 +55,7 @@ public class MerchantFieldEditParam implements java.io.Serializable {
private String districtName;
@ApiModelProperty(position = 22, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区")
@Size(max = 100, message = "已超出详细地址长度限制")
@NotNull()
private String address;
@ApiModelProperty(position = 23, required = true, value = "经度")
@NotNull()
......
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantSponsorEditParam.java → liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/param/admin/MerchantSponsorEditParam.java
View file @ c4ef1d20
package com.liquidnet.service.merchant.dto.param;
package com.liquidnet.service.merchant.dto.param.admin;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -28,6 +28,7 @@ public class MerchantSponsorEditParam implements java.io.Serializable {
@NotBlank(message = "背景图不能为空")
private String background;
@ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字")
@NotNull
private String description;
@ApiModelProperty(position = 19, required = true, value = "联系人邮箱", example = "zhangsan@zhengzai.tv")
......
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantPermissionVo.java
View file @ c4ef1d20
......@@ -6,10 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;
public class MerchantPermissionVo implements java.io.Serializable{
public class MerchantPermissionVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -1693974333583118507L;
@ApiModelProperty(value = "permission_id", example = "查询、编辑、提审、上线、下线、统计、验票、授权")
@ApiModelProperty(value = "permission_id", example = "1")
private String permissionId;
@ApiModelProperty(value = "名称")
......@@ -20,4 +20,15 @@ public class MerchantPermissionVo implements java.io.Serializable{
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final MerchantPermissionVo obj = new MerchantPermissionVo();
public static MerchantPermissionVo getNew() {
try {
return (MerchantPermissionVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantPermissionVo();
}
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantAuthorizationRecordsService.java
View file @ c4ef1d20
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.param.MerchantAuthorizationRecordParam;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPerformanceVo;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
import java.util.List;
public interface IMerchantAuthorizationRecordsService {
MerchantAuthorizationPerformanceVo performanceAuthorization(String uid, String performanceId);
List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId);
String performanceRecordCheckerAdd(String cuid, MerchantAuthorizationRecordParam parameter);
void performanceRecordCheckerDel(String cuid, String authorizationRecordId);
List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId);
}
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantFieldsService.java
View file @ c4ef1d20
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.merchant.dto.param.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
......@@ -12,8 +11,6 @@ public interface IMerchantFieldsService {
MerchantFieldsVo fieldInfo(String uid, String fieldId);
void editBaseInfo(String uid, MerchantFieldEditParam parameter);
void editIsCheck(String uid, String fieldId, int isCheck);
......
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/service/IMerchantSponsorsService.java
View file @ c4ef1d20
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
public interface IMerchantSponsorsService {
PagedResult<MerchantSponsorsVo> search(String name, int page, int size);
MerchantSponsorsVo sponsorInfo(String uid, String sponsorId);
void editBaseInfo(String uid, MerchantSponsorEditParam parameter);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantFieldsController.java
View file @ c4ef1d20
......@@ -7,10 +7,9 @@ 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;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantMongoUtil;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldListParam;
import com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
......@@ -22,6 +21,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......@@ -39,9 +39,6 @@ public class MerchantFieldsController extends BaseController {
@Autowired
IMerchantCompaniesAdminService merchantCompaniesAdminService;
@Autowired
MerchantMongoUtil merchantMongoUtil;
@RequiresPermissions("merchant:field:view")
@GetMapping()
......@@ -95,24 +92,12 @@ public class MerchantFieldsController extends BaseController {
return prefix + "/detail";
}
@ApiOperation(value = "同步Mysql到MongoDB")
@Log(title = "同步Mysql到MongoDB", businessType = BusinessType.OTHER)
@RequiresPermissions("merchant:field:sync:mongo")
@GetMapping("/sync/mongo")
@ApiOperation(value = "场地编辑")
@Log(title = "场地编辑", businessType = BusinessType.UPDATE)
@RequiresPermissions("merchant:field:edit")
@PostMapping("edit")
@ResponseBody
public AjaxResult approve() {
String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName();
List<MerchantFields> fields = merchantFieldsAdminService.list();
for (MerchantFields field : fields) {
MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew().copy(field);
merchantMongoUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
}
return toAjax(true);
public AjaxResult edit(@RequestBody @Validated MerchantFieldEditParam parameter) {
return toAjax(merchantFieldsAdminService.fieldEdit(parameter));
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/merchant/MerchantSponsorsController.java
View file @ c4ef1d20
......@@ -4,17 +4,21 @@ 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.zhengzai.merchant.service.IMerchantSponsorsAdminService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorListParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
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;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@Api(tags = "主办管理")
......@@ -69,4 +73,13 @@ public class MerchantSponsorsController extends BaseController {
return prefix + "/detail";
}
@ApiOperation(value = "主办编辑")
@Log(title = "主办编辑", businessType = BusinessType.UPDATE)
@RequiresPermissions("merchant:sponsor:edit")
@PostMapping("edit")
@ResponseBody
public AjaxResult edit(@RequestBody @Validated MerchantSponsorEditParam parameter) {
return toAjax(merchantSponsorsAdminService.sponsorEdit(parameter));
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/IMerchantFieldsAdminService.java
View file @ c4ef1d20
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldEditParam;
import com.liquidnet.service.merchant.entity.MerchantFields;
public interface IMerchantFieldsAdminService extends IService<MerchantFields> {
boolean fieldEdit(MerchantFieldEditParam parameter);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/IMerchantSponsorsAdminService.java
View file @ c4ef1d20
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
public interface IMerchantSponsorsAdminService extends IService<MerchantSponsors> {
boolean sponsorEdit(MerchantSponsorEditParam parameter);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/impl/MerchantFieldsAdminServiceImpl.java
View file @ c4ef1d20
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
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.service.merchant.dto.param.admin.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.entity.MerchantCompanies;
import com.liquidnet.service.merchant.entity.MerchantFields;
import com.liquidnet.service.merchant.mapper.MerchantFieldsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@Slf4j
@Service
public class MerchantFieldsAdminServiceImpl extends ServiceImpl<MerchantFieldsMapper, MerchantFields> implements IMerchantFieldsAdminService {
@Autowired
MerchantRedisUtil merchantRedisUtil;
@Autowired
MerchantMongoUtil merchantMongoUtil;
@Autowired
IMerchantCompaniesAdminService merchantCompaniesAdminService;
@Override
public boolean fieldEdit(MerchantFieldEditParam parameter) {
LocalDateTime now = LocalDateTime.now();
// 查询场地 entity
LambdaQueryWrapper<MerchantFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFields.class);
fieldsLambdaQueryWrapper.eq(MerchantFields::getFieldId, parameter.getFieldId());
MerchantFields fieldsEntity = getOne(fieldsLambdaQueryWrapper);
if (null == fieldsEntity) {
// todo error
throw new LiquidnetServiceException();
}
// 场地 entity
BeanUtils.copyProperties(parameter, fieldsEntity);
fieldsEntity.setUpdatedAt(now);
// 场地 mysql
updateById(fieldsEntity);
// 场地 vo
MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew();
fieldsVo.copy(fieldsEntity);
if (null != fieldsVo.getCompanyId() && !fieldsVo.getCompanyId().isEmpty()) {
LambdaQueryWrapper<MerchantCompanies> companiesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantCompanies.class);
companiesLambdaQueryWrapper.eq(MerchantCompanies::getCompanyId, fieldsVo.getCompanyId());
MerchantCompanies companies = merchantCompaniesAdminService.getOne(companiesLambdaQueryWrapper);
MerchantCompaniesVo companiesVo = MerchantCompaniesVo.getNew();
companiesVo.copy(companies);
fieldsVo.setCompaniesVo(companiesVo);
}
// 场地 mongo
merchantMongoUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
// 场地 redis
merchantRedisUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
return true;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/impl/MerchantSponsorsAdminServiceImpl.java
View file @ c4ef1d20
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
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.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
import com.liquidnet.service.merchant.mapper.MerchantSponsorsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@Slf4j
@Service
public class MerchantSponsorsAdminServiceImpl extends ServiceImpl<MerchantSponsorsMapper, MerchantSponsors> implements IMerchantSponsorsAdminService {
@Autowired
MerchantRedisUtil merchantRedisUtil;
@Autowired
MerchantMongoUtil merchantMongoUtil;
@Override
public boolean sponsorEdit(MerchantSponsorEditParam parameter) {
LocalDateTime now = LocalDateTime.now();
// 查询主办 entity
LambdaQueryWrapper<MerchantSponsors> sponsorsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsors.class);
sponsorsLambdaQueryWrapper.eq(MerchantSponsors::getSponsorId, parameter.getSponsorId());
MerchantSponsors sponsorsEntity = getOne(sponsorsLambdaQueryWrapper);
if (null == sponsorsEntity) {
// todo error
throw new LiquidnetServiceException();
}
// 主办 entity
BeanUtils.copyProperties(parameter, sponsorsEntity);
sponsorsEntity.setUpdatedAt(now);
// 主办 mysql
updateById(sponsorsEntity);
// 主办 vo
MerchantSponsorsVo sponsorsVo = MerchantSponsorsVo.getNew();
sponsorsVo.copy(sponsorsEntity);
// 主办 mongo
merchantMongoUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
// 主办 redis
merchantRedisUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
return true;
}
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantAuthorizationsController.java
View file @ c4ef1d20
......@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.merchant.dto.param.MerchantAuthorizationRecordParam;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPerformanceVo;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
import io.swagger.annotations.Api;
......@@ -37,6 +38,15 @@ public class MerchantAuthorizationsController {
IMerchantAuthorizationRecordsService authorizationRecordsService;
@ApiOperationSupport(order = 10)
@ApiOperation(value = "演出下全部权限")
@GetMapping("info")
public ResponseDto<MerchantAuthorizationPerformanceVo> authorizationInfo(@RequestParam(required = true) String performanceId) {
String currentUid = CurrentUtil.getCurrentUid();
return ResponseDto.success(authorizationRecordsService.performanceAuthorization(currentUid, performanceId));
}
@ApiOperationSupport(order = 20)
@ApiOperation(value = "授权记录列表")
@GetMapping("records")
public ResponseDto<List<MerchantAuthorizationRecordsVo>> recordsCheckers(@RequestParam(required = true) String performanceId) {
......@@ -45,7 +55,7 @@ public class MerchantAuthorizationsController {
return ResponseDto.success(authorizationRecordsService.performanceRecordCheckers(currentUid, performanceId));
}
@ApiOperationSupport(order = 11)
@ApiOperationSupport(order = 21)
@ApiOperation(value = "添加授权记录")
@PostMapping("records/add")
public ResponseDto<Object> recordsCheckerAdd(@Valid @RequestBody MerchantAuthorizationRecordParam parameter) {
......@@ -56,7 +66,7 @@ public class MerchantAuthorizationsController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 12)
@ApiOperationSupport(order = 22)
@ApiOperation(value = "删除授权记录")
@PostMapping("records/del")
public ResponseDto<Object> recordsCheckerDel(@RequestParam(required = true) String authorizationRecordId) {
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantFieldsController.java
View file @ c4ef1d20
......@@ -6,7 +6,6 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
import com.liquidnet.service.merchant.dto.param.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
......@@ -92,18 +91,7 @@ public class MerchantFieldsController {
return ResponseDto.success(merchantFieldsService.fieldInfo(currentUid, fieldId));
}
// @ApiOperationSupport(order = 21)
// @ApiOperation(value = "场地更改基础信息")
// @PostMapping("editBaseInfo")
// public ResponseDto<Object> editBaseInfo(@Valid @RequestBody MerchantFieldEditParam parameter) {
// String currentUid = CurrentUtil.getCurrentUid();
//
// merchantFieldsService.editBaseInfo(currentUid, parameter);
//
// return ResponseDto.success();
// }
@ApiOperationSupport(order = 22)
@ApiOperationSupport(order = 21)
@ApiOperation(value = "场地更改是否审核演出")
@PostMapping("editIsCheck")
public ResponseDto<Object> editIsCheck(@RequestParam(required = true) String fieldId,
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantSponsorsController.java
View file @ c4ef1d20
......@@ -5,7 +5,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
......@@ -89,15 +88,4 @@ public class MerchantSponsorsController {
return ResponseDto.success(merchantSponsorsService.sponsorInfo(currentUid, sponsorId));
}
// @ApiOperationSupport(order = 21)
// @ApiOperation(value = "主办更改基础信息")
// @PostMapping("editBaseInfo")
// public ResponseDto<Object> editBaseInfo(@Valid @RequestBody MerchantSponsorEditParam parameter) {
// String currentUid = CurrentUtil.getCurrentUid();
//
// merchantSponsorsService.editBaseInfo(currentUid, parameter);
//
// return ResponseDto.success();
// }
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantAuthorizationRecordsServiceImpl.java
View file @ c4ef1d20
......@@ -42,6 +42,18 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
@Autowired
QueueUtil queueUtils;
@Override
public MerchantAuthorizationPerformanceVo performanceAuthorization(String uid, String performanceId) {
MerchantAuthorizationPerformanceVo authorizationPerformanceVo = merchantMongoService.getAuthorizationPerformanceVo(performanceId, uid);
return authorizationPerformanceVo;
}
@Override
public List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId) {
List<MerchantAuthorizationRecordsVo> authorizationRecordsVos = merchantMongoService.getAuthorizationRecordsCheckersVosByCuid(cuid, performanceId);
return authorizationRecordsVos;
}
@Override
public String performanceRecordCheckerAdd(String cuid, MerchantAuthorizationRecordParam parameter) {
LocalDateTime now = LocalDateTime.now();
......@@ -206,11 +218,6 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
}
@Override
public List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId) {
List<MerchantAuthorizationRecordsVo> authorizationRecordsVos = merchantMongoService.getAuthorizationRecordsCheckersVosByCuid(cuid, performanceId);
return authorizationRecordsVos;
}
private MerchantAuthorizationConst.PerformanceRole getMaxPerformanceRole(String uid, String performanceId) {
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java
View file @ c4ef1d20
......@@ -7,7 +7,6 @@ import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.merchant.dto.param.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.service.IMerchantFieldsService;
......@@ -16,7 +15,6 @@ import com.liquidnet.service.merchant.service.MerchantRdmService;
import com.liquidnet.service.merchant.util.ObjectUtil;
import com.liquidnet.service.merchant.util.QueueUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
......@@ -101,44 +99,44 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
return fieldsVo;
}
@Override
public void editBaseInfo(String uid, MerchantFieldEditParam parameter) {
// 当前用户是否管理该场地
MerchantFieldsVo fieldsVo = this.checkFieldAccount(uid, parameter.getFieldId());
LocalDateTime now = LocalDateTime.now();
BeanUtils.copyProperties(parameter, fieldsVo);
fieldsVo.setUpdatedAt(now);
// 场地 redis
long s = System.currentTimeMillis();
merchantRdmService.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 场地 mongo
s = System.currentTimeMillis();
merchantMongoService.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> fieldUpdateObjs = CollectionUtil.linkedListObjectArr();
// 场地 sql
toMqSqls.add(SqlMapping.get("merchant_fields.update_base_info"));
fieldUpdateObjs.add(new Object[]{
fieldsVo.getName(), fieldsVo.getLogo(), fieldsVo.getBackground(), fieldsVo.getDescription(), fieldsVo.getBuiltDate(),
fieldsVo.getProvinceId(), fieldsVo.getProvinceName(), fieldsVo.getCityId(), fieldsVo.getCityName(), fieldsVo.getDistrictId(), fieldsVo.getDistrictName(), fieldsVo.getAddress(), fieldsVo.getLongitude(), fieldsVo.getLatitude(),
fieldsVo.getContactName(), fieldsVo.getContactEmail(),
fieldsVo.getUpdatedAt(), fieldsVo.getFieldId()
});
// mq
s = System.currentTimeMillis();
queueUtils.sendMsgByRedis(
MQConst.MerchantQueue.SQL_MERCHANT_FIELD.getKey(),
SqlMapping.gets(toMqSqls, fieldUpdateObjs)
);
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
}
// @Override
// public void editBaseInfo(String uid, MerchantFieldEditParam parameter) {
// // 当前用户是否管理该场地
// MerchantFieldsVo fieldsVo = this.checkFieldAccount(uid, parameter.getFieldId());
//
// LocalDateTime now = LocalDateTime.now();
// BeanUtils.copyProperties(parameter, fieldsVo);
// fieldsVo.setUpdatedAt(now);
//
// // 场地 redis
// long s = System.currentTimeMillis();
// merchantRdmService.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
// log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
//
// // 场地 mongo
// s = System.currentTimeMillis();
// merchantMongoService.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
// log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
//
// LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
// LinkedList<Object[]> fieldUpdateObjs = CollectionUtil.linkedListObjectArr();
// // 场地 sql
// toMqSqls.add(SqlMapping.get("merchant_fields.update_base_info"));
// fieldUpdateObjs.add(new Object[]{
// fieldsVo.getName(), fieldsVo.getLogo(), fieldsVo.getBackground(), fieldsVo.getDescription(), fieldsVo.getBuiltDate(),
// fieldsVo.getProvinceId(), fieldsVo.getProvinceName(), fieldsVo.getCityId(), fieldsVo.getCityName(), fieldsVo.getDistrictId(), fieldsVo.getDistrictName(), fieldsVo.getAddress(), fieldsVo.getLongitude(), fieldsVo.getLatitude(),
// fieldsVo.getContactName(), fieldsVo.getContactEmail(),
// fieldsVo.getUpdatedAt(), fieldsVo.getFieldId()
// });
//
// // mq
// s = System.currentTimeMillis();
// queueUtils.sendMsgByRedis(
// MQConst.MerchantQueue.SQL_MERCHANT_FIELD.getKey(),
// SqlMapping.gets(toMqSqls, fieldUpdateObjs)
// );
// log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
// }
@Override
public void editIsCheck(String uid, String fieldId, int isCheck) {
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantSponsorsServiceImpl.java
View file @ c4ef1d20
......@@ -6,7 +6,6 @@ import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.service.IMerchantSponsorsService;
import com.liquidnet.service.merchant.service.MerchantMongoService;
......@@ -87,43 +86,43 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
return sponsorsVo;
}
@Override
public void editBaseInfo(String uid, MerchantSponsorEditParam parameter) {
// 当前用户是否管理该主办
MerchantSponsorsVo sponsorsVo = this.checkSponsorAccount(uid, parameter.getSponsorId());
LocalDateTime now = LocalDateTime.now();
BeanUtils.copyProperties(parameter, sponsorsVo);
sponsorsVo.setUpdatedAt(now);
// 主办 redis
long s = System.currentTimeMillis();
merchantRdmService.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 主办 mongo
s = System.currentTimeMillis();
merchantMongoService.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sponsorUpdateObjs = CollectionUtil.linkedListObjectArr();
// 主办 sql
toMqSqls.add(SqlMapping.get("merchant_sponsors.update_base_info"));
sponsorUpdateObjs.add(new Object[]{
sponsorsVo.getName(), sponsorsVo.getLogo(), sponsorsVo.getBackground(), sponsorsVo.getDescription(),
sponsorsVo.getContactEmail(),
sponsorsVo.getUpdatedAt(), sponsorsVo.getSponsorId()
});
// mq
s = System.currentTimeMillis();
queueUtils.sendMsgByRedis(
MQConst.MerchantQueue.SQL_MERCHANT_SPONSOR.getKey(),
SqlMapping.gets(toMqSqls, sponsorUpdateObjs)
);
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
}
// @Override
// public void editBaseInfo(String uid, MerchantSponsorEditParam parameter) {
// // 当前用户是否管理该主办
// MerchantSponsorsVo sponsorsVo = this.checkSponsorAccount(uid, parameter.getSponsorId());
//
// LocalDateTime now = LocalDateTime.now();
// BeanUtils.copyProperties(parameter, sponsorsVo);
// sponsorsVo.setUpdatedAt(now);
//
// // 主办 redis
// long s = System.currentTimeMillis();
// merchantRdmService.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
// log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
//
// // 主办 mongo
// s = System.currentTimeMillis();
// merchantMongoService.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
// log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
//
// LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
// LinkedList<Object[]> sponsorUpdateObjs = CollectionUtil.linkedListObjectArr();
// // 主办 sql
// toMqSqls.add(SqlMapping.get("merchant_sponsors.update_base_info"));
// sponsorUpdateObjs.add(new Object[]{
// sponsorsVo.getName(), sponsorsVo.getLogo(), sponsorsVo.getBackground(), sponsorsVo.getDescription(),
// sponsorsVo.getContactEmail(),
// sponsorsVo.getUpdatedAt(), sponsorsVo.getSponsorId()
// });
//
// // mq
// s = System.currentTimeMillis();
// queueUtils.sendMsgByRedis(
// MQConst.MerchantQueue.SQL_MERCHANT_SPONSOR.getKey(),
// SqlMapping.gets(toMqSqls, sponsorUpdateObjs)
// );
// log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
// }
private MerchantSponsorsVo checkSponsorAccount(String uid, String sponsorId) {
// 当前用户是否管理该主办
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/merchant/DataMigrationServiceImpl.java
View file @ c4ef1d20
......@@ -13,7 +13,7 @@ import java.sql.*;
public class DataMigrationServiceImpl {
@Autowired
MerchantFieldsMapper fieldsMapper;
MerchantFieldsMapper merchantFieldsMapper;
public void dataFields() {
......@@ -33,6 +33,8 @@ public class DataMigrationServiceImpl {
if (null != contactMobile && !contactMobile.isEmpty()) {
if (rs.getString("uid").isEmpty()) {
// register
fields.setClaimStatus(0);
fields.setUid("");
} else {
fields.setClaimStatus(rs.getInt("claim_status"));
fields.setUid(rs.getString("uid"));
......@@ -62,7 +64,7 @@ public class DataMigrationServiceImpl {
fields.setCompanyId(rs.getString("company_id"));
fields.setCreatedAt(rs.getTimestamp("created_at").toLocalDateTime());
fields.setUpdatedAt(rs.getTimestamp("updated_at").toLocalDateTime());
fieldsMapper.insert(fields);
merchantFieldsMapper.insert(fields);
}
......
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