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

Commit 195dd9ad authored by Tice's avatar Tice

update

parent 23dedf23
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
public interface IMerchantFieldAppliesService {
String apply(String uid, MerchantFieldApplyParam parameter);
void applyDel(String uid, String fieldApplyId);
MerchantFieldAppliesVo applyInfo(String uid, String fieldApplyId);
}
......@@ -12,13 +12,6 @@ public interface IMerchantFieldsService {
PagedResult<MerchantFieldsVo> search(String name, int page, int size);
String apply(String uid, MerchantFieldApplyParam parameter);
void applyDel(String uid, String fieldApplyId);
MerchantFieldAppliesVo applyInfo(String uid, String fieldApplyId);
void editIsCheck(String uid, String fieldId, int isCheck);
......
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
public interface IMerchantSponsorAppliesService {
String apply(String uid, MerchantSponsorApplyParam parameter);
void applyDel(String uid, String sponsorApplyId);
MerchantSponsorAppliesVo applyInfo(String uid, String sponsorApplyId);
}
......@@ -7,10 +7,4 @@ import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
public interface IMerchantSponsorsService {
PagedResult<MerchantSponsorsVo> search(String name, int page, int size);
String apply(String uid, MerchantSponsorApplyParam parameter);
void applyDel(String uid, String sponsorApplyId);
MerchantSponsorAppliesVo applyInfo(String uid, String sponsorApplyId);
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantFieldCheckers;
public interface IMerchantFieldCheckersAdminService extends IService<MerchantFieldCheckers> {
}
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldCheckersAdminService;
import com.liquidnet.service.merchant.entity.MerchantFieldCheckers;
import com.liquidnet.service.merchant.mapper.MerchantFieldCheckersMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class MerchantFieldCheckersAdminServiceImpl extends ServiceImpl<MerchantFieldCheckersMapper, MerchantFieldCheckers> implements IMerchantFieldCheckersAdminService {
}
......@@ -30,7 +30,7 @@ public class MerchantFieldCheckers implements Serializable {
private String fieldCheckerId;
/**
* 要认领的或创建的场地ID
* 场地ID
*/
private String fieldId;
......
......@@ -44,7 +44,7 @@ create table merchant_field_checkers
(
mid bigint unsigned auto_increment primary key,
field_checker_id varchar(64) not null comment 'field_apply_id',
field_id varchar(64) default '' not null comment '要认领的或创建的场地ID',
field_id varchar(64) default '' not null comment '场地ID',
uid varchar(64) default '' not null comment '验票员账号',
mobile varchar(255) default '' not null comment '手机号',
name varchar(255) default '' not null comment '姓名',
......
......@@ -9,6 +9,7 @@ import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.service.IMerchantFieldAppliesService;
import com.liquidnet.service.merchant.service.IMerchantFieldsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -39,6 +40,9 @@ public class MerchantFieldsController {
@Autowired
IMerchantFieldsService merchantFieldsService;
@Autowired
IMerchantFieldAppliesService merchantFieldAppliesService;
@ApiOperationSupport(order = 10)
@ApiOperation(value = "场地搜索")
@GetMapping("search")
......@@ -54,7 +58,7 @@ public class MerchantFieldsController {
public ResponseDto<Object> apply(@Valid @RequestBody MerchantFieldApplyParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
return ResponseDto.success(merchantFieldsService.apply(currentUid, parameter));
return ResponseDto.success(merchantFieldAppliesService.apply(currentUid, parameter));
}
@ApiOperationSupport(order = 12)
......@@ -63,7 +67,7 @@ public class MerchantFieldsController {
public ResponseDto<Object> applyDel(@RequestParam(required = true) String fieldApplyId) {
String currentUid = CurrentUtil.getCurrentUid();
merchantFieldsService.applyDel(currentUid, fieldApplyId);
merchantFieldAppliesService.applyDel(currentUid, fieldApplyId);
return ResponseDto.success();
}
......@@ -74,7 +78,7 @@ public class MerchantFieldsController {
public ResponseDto<MerchantFieldAppliesVo> applyInfo(@RequestParam(required = true) String fieldApplyId) {
String currentUid = CurrentUtil.getCurrentUid();
return ResponseDto.success(merchantFieldsService.applyInfo(currentUid, fieldApplyId));
return ResponseDto.success(merchantFieldAppliesService.applyInfo(currentUid, fieldApplyId));
}
@ApiOperationSupport(order = 21)
......
......@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
import com.liquidnet.service.merchant.service.IMerchantSponsorAppliesService;
import com.liquidnet.service.merchant.service.IMerchantSponsorsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -37,6 +38,9 @@ public class MerchantSponsorsController {
@Autowired
IMerchantSponsorsService merchantSponsorsService;
@Autowired
IMerchantSponsorAppliesService merchantSponsorAppliesService;
@ApiOperationSupport(order = 10)
@ApiOperation(value = "主办搜索")
@GetMapping("search")
......@@ -52,7 +56,7 @@ public class MerchantSponsorsController {
public ResponseDto<Object> apply(@Valid @RequestBody MerchantSponsorApplyParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
return ResponseDto.success(merchantSponsorsService.apply(currentUid, parameter));
return ResponseDto.success(merchantSponsorAppliesService.apply(currentUid, parameter));
}
@ApiOperationSupport(order = 12)
......@@ -61,7 +65,7 @@ public class MerchantSponsorsController {
public ResponseDto<Object> applyDel(@RequestParam(required = true) String sponsorApplyId) {
String currentUid = CurrentUtil.getCurrentUid();
merchantSponsorsService.applyDel(currentUid, sponsorApplyId);
merchantSponsorAppliesService.applyDel(currentUid, sponsorApplyId);
return ResponseDto.success();
}
......@@ -72,6 +76,6 @@ public class MerchantSponsorsController {
public ResponseDto<MerchantSponsorAppliesVo> applyInfo(@RequestParam(required = true) String sponsorApplyId) {
String currentUid = CurrentUtil.getCurrentUid();
return ResponseDto.success(merchantSponsorsService.applyInfo(currentUid, sponsorApplyId));
return ResponseDto.success(merchantSponsorAppliesService.applyInfo(currentUid, sponsorApplyId));
}
}
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