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

Skip to content

L
liquidnet-bus-v1
Commit a01e5439 authored by Tice's avatar Tice
Browse files
Options

更新小站内容

parent 5ca4638a
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 89 deletions
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantFieldAppliesVo.java
View file @ a01e5439
......@@ -31,15 +31,15 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
@ApiModelProperty(position = 16, value = "场地，认领时或通过后存在")
private MerchantFieldsVo fieldVo;
@ApiModelProperty(position = 17, value = "场地名称[30]")
@ApiModelProperty(position = 17, value = "场地名称")
private String name;
@ApiModelProperty(position = 18, value = "logo图")
private String logo;
@ApiModelProperty(position = 19, value = "背景图")
private String background;
@ApiModelProperty(position = 20, value = "介绍[1000]")
@ApiModelProperty(position = 20, value = "介绍")
private String description;
@ApiModelProperty(position = 21, value = "建立日期[YYYY-MM-DD]")
@ApiModelProperty(position = 21, value = "建立日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_SMALL_STR)
private LocalDate builtDate;
......@@ -55,7 +55,7 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
private String districtId;
@ApiModelProperty(position = 27, value = "县名称")
private String districtName;
@ApiModelProperty(position = 28, value = "详细地址[100]")
@ApiModelProperty(position = 28, value = "详细地址")
private String address;
@ApiModelProperty(position = 29, value = "经度")
private String longitude;
......
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantSponsorAppliesVo.java
View file @ a01e5439
......@@ -30,7 +30,7 @@ public class MerchantSponsorAppliesVo implements java.io.Serializable, Cloneable
@ApiModelProperty(position = 16, value = "主办，通过后存在")
private MerchantSponsorsVo sponsorVo;
@ApiModelProperty(position = 17, value = "主办ID")
@ApiModelProperty(position = 17, value = "主办名称")
private String name;
@ApiModelProperty(position = 18, value = "logo图片地址")
private String logo;
......
liquidnet-bus-api/liquidnet-service-merchant-api/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantStationsVo.java
View file @ a01e5439
......@@ -12,22 +12,36 @@ import java.time.LocalDateTime;
@Data
public class MerchantStationsVo {
@ApiModelProperty(position = 10, value = "申请类型 field-场地、sponsor-主办")
@ApiModelProperty(position = 10, value = "类型 fieldApply-场地申请、field-场地、sponsorApply主办申请、sponsor-主办")
private String stationType;
@ApiModelProperty(position = 11, value = "申请场地vo")
private MerchantFieldAppliesVo fieldAppliesVo;
@ApiModelProperty(position = 20, value = "申请状态 0-待审核 1-通过 2-驳回")
private Integer applyStatus;
@ApiModelProperty(position = 21, value = "申请类型 claim-认领、create-创建")
private String applyType;
@ApiModelProperty(position = 22, value = "驳回原因")
private String reject;
@ApiModelProperty(position = 30, value = "主办ID")
private String name;
@ApiModelProperty(position = 31, value = "logo图片地址")
private String logo;
@ApiModelProperty(position = 40, value = "场地申请ID")
private String fieldApplyId;
@ApiModelProperty(position = 41, value = "场地ID")
private String fieldId;
@ApiModelProperty(position = 50, value = "主办申请ID")
private String sponsorApplyId;
@ApiModelProperty(position = 51, value = "主办ID")
private String sponsorId;
@ApiModelProperty(position = 12, value = "申请主办vo")
private MerchantSponsorAppliesVo sponsorAppliesVo;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime deletedAt;
private static final MerchantStationsVo obj = new MerchantStationsVo();
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantFieldsController.java
View file @ a01e5439
......@@ -92,16 +92,16 @@ 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 = 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)
@ApiOperation(value = "场地更改是否审核演出")
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantSponsorsController.java
View file @ a01e5439
......@@ -90,14 +90,14 @@ 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();
}
// @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/MerchantStationsServiceImpl.java
View file @ a01e5439
package com.liquidnet.service.merchant.service.impl;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantStationsVo;
import com.liquidnet.service.merchant.dto.vo.*;
import com.liquidnet.service.merchant.service.IMerchantStationsService;
import com.liquidnet.service.merchant.service.MerchantRdmService;
import com.liquidnet.service.merchant.util.ObjectUtil;
......@@ -12,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.format.DateTimeFormatter;
import java.util.Comparator;
import java.util.List;
......@@ -31,38 +27,31 @@ public class MerchantStationsServiceImpl implements IMerchantStationsService {
List<MerchantFieldAppliesVo> fieldAppliesVos = merchantRdmService.getFieldAppliesVosByUid(uid);
if (!CollectionUtils.isEmpty(fieldAppliesVos)) {
for (MerchantFieldAppliesVo fieldAppliesVo : fieldAppliesVos) {
MerchantFieldAppliesVo appliesVo = MerchantFieldAppliesVo.getNew();
appliesVo.setFieldApplyId(fieldAppliesVo.getFieldApplyId());
appliesVo.setApplyStatus(fieldAppliesVo.getApplyStatus());
appliesVo.setApplyType(fieldAppliesVo.getApplyType());
appliesVo.setReject(fieldAppliesVo.getReject());
appliesVo.setUid(fieldAppliesVo.getUid());
appliesVo.setFieldId(fieldAppliesVo.getFieldId());
appliesVo.setName(fieldAppliesVo.getName());
appliesVo.setLogo(fieldAppliesVo.getLogo());
appliesVo.setBackground(fieldAppliesVo.getBackground());
appliesVo.setDescription(fieldAppliesVo.getDescription());
appliesVo.setBuiltDate(fieldAppliesVo.getBuiltDate());
appliesVo.setProvinceId(fieldAppliesVo.getProvinceId());
appliesVo.setProvinceName(fieldAppliesVo.getProvinceName());
appliesVo.setCityId(fieldAppliesVo.getCityId());
appliesVo.setCityName(fieldAppliesVo.getCityName());
appliesVo.setDistrictId(fieldAppliesVo.getDistrictId());
appliesVo.setDistrictName(fieldAppliesVo.getDistrictName());
appliesVo.setAddress(fieldAppliesVo.getAddress());
appliesVo.setLongitude(fieldAppliesVo.getLongitude());
appliesVo.setLatitude(fieldAppliesVo.getLatitude());
appliesVo.setBuiltDate(fieldAppliesVo.getBuiltDate());
appliesVo.setCreatedAt(fieldAppliesVo.getCreatedAt());
appliesVo.setUpdatedAt(fieldAppliesVo.getUpdatedAt());
appliesVo.setDeletedAt(fieldAppliesVo.getDeletedAt());
MerchantStationsVo vo = MerchantStationsVo.getNew();
vo.setStationType("field");
vo.setFieldAppliesVo(appliesVo);
vo.setCreatedAt(appliesVo.getCreatedAt());
vo.setUpdatedAt(appliesVo.getUpdatedAt());
vo.setDeletedAt(appliesVo.getDeletedAt());
if (1 == fieldAppliesVo.getApplyStatus()) {
MerchantFieldsVo fieldsVo = merchantRdmService.getFieldsVoByFieldId(fieldAppliesVo.getFieldId());
vo.setStationType("field");
vo.setApplyStatus(fieldAppliesVo.getApplyStatus());
vo.setApplyType(fieldAppliesVo.getApplyType());
vo.setReject(fieldAppliesVo.getReject());
vo.setName(fieldsVo.getName());
vo.setLogo(fieldsVo.getLogo());
vo.setFieldApplyId(fieldAppliesVo.getFieldApplyId());
vo.setFieldId(fieldAppliesVo.getFieldId());
vo.setCreatedAt(fieldsVo.getCreatedAt());
vo.setUpdatedAt(fieldsVo.getUpdatedAt());
} else {
vo.setStationType("fieldApply");
vo.setApplyStatus(fieldAppliesVo.getApplyStatus());
vo.setApplyType(fieldAppliesVo.getApplyType());
vo.setReject(fieldAppliesVo.getReject());
vo.setName(fieldAppliesVo.getName());
vo.setLogo(fieldAppliesVo.getLogo());
vo.setFieldApplyId(fieldAppliesVo.getFieldApplyId());
vo.setFieldId(fieldAppliesVo.getFieldId());
vo.setCreatedAt(fieldAppliesVo.getCreatedAt());
vo.setUpdatedAt(fieldAppliesVo.getUpdatedAt());
}
vos.add(vo);
}
}
......@@ -70,27 +59,31 @@ public class MerchantStationsServiceImpl implements IMerchantStationsService {
List<MerchantSponsorAppliesVo> sponsorAppliesVos = merchantRdmService.getSponsorAppliesVosByUid(uid);
if (!CollectionUtils.isEmpty(sponsorAppliesVos)) {
for (MerchantSponsorAppliesVo sponsorAppliesVo : sponsorAppliesVos) {
MerchantSponsorAppliesVo appliesVo = MerchantSponsorAppliesVo.getNew();
appliesVo.setSponsorApplyId(sponsorAppliesVo.getSponsorApplyId());
appliesVo.setApplyStatus(sponsorAppliesVo.getApplyStatus());
appliesVo.setApplyType(sponsorAppliesVo.getApplyType());
appliesVo.setReject(sponsorAppliesVo.getReject());
appliesVo.setUid(sponsorAppliesVo.getUid());
appliesVo.setSponsorId(sponsorAppliesVo.getSponsorId());
appliesVo.setName(sponsorAppliesVo.getName());
appliesVo.setLogo(sponsorAppliesVo.getLogo());
appliesVo.setBackground(sponsorAppliesVo.getBackground());
appliesVo.setDescription(sponsorAppliesVo.getDescription());
appliesVo.setCreatedAt(sponsorAppliesVo.getCreatedAt());
appliesVo.setUpdatedAt(sponsorAppliesVo.getUpdatedAt());
appliesVo.setDeletedAt(sponsorAppliesVo.getDeletedAt());
MerchantStationsVo vo = MerchantStationsVo.getNew();
vo.setStationType("sponsor");
vo.setSponsorAppliesVo(appliesVo);
vo.setCreatedAt(appliesVo.getCreatedAt());
vo.setUpdatedAt(appliesVo.getUpdatedAt());
vo.setDeletedAt(appliesVo.getDeletedAt());
if (1 == sponsorAppliesVo.getApplyStatus()) {
MerchantSponsorsVo sponsorsVo = merchantRdmService.getSponsorsVoBySponsorId(sponsorAppliesVo.getSponsorId());
vo.setStationType("sponsor");
vo.setApplyStatus(sponsorAppliesVo.getApplyStatus());
vo.setApplyType(sponsorAppliesVo.getApplyType());
vo.setReject(sponsorAppliesVo.getReject());
vo.setName(sponsorsVo.getName());
vo.setLogo(sponsorsVo.getLogo());
vo.setSponsorApplyId(sponsorAppliesVo.getSponsorApplyId());
vo.setSponsorId(sponsorAppliesVo.getSponsorId());
vo.setCreatedAt(sponsorsVo.getCreatedAt());
vo.setUpdatedAt(sponsorsVo.getUpdatedAt());
} else {
vo.setStationType("sponsorApply");
vo.setApplyStatus(sponsorAppliesVo.getApplyStatus());
vo.setApplyType(sponsorAppliesVo.getApplyType());
vo.setReject(sponsorAppliesVo.getReject());
vo.setName(sponsorAppliesVo.getName());
vo.setLogo(sponsorAppliesVo.getLogo());
vo.setSponsorApplyId(sponsorAppliesVo.getSponsorApplyId());
vo.setSponsorId(sponsorAppliesVo.getSponsorId());
vo.setCreatedAt(sponsorAppliesVo.getCreatedAt());
vo.setUpdatedAt(sponsorAppliesVo.getUpdatedAt());
}
vos.add(vo);
}
}
......
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