Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

This commit is contained in:
feng.li
2023-12-12 18:54:21 +08:00
18 changed files with 436 additions and 6 deletions

View File

@@ -5,10 +5,12 @@ import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.exhibition.ExhibitionDTO;
import com.cool.store.dto.exhibition.ExhibitionEnterInterviewDTO;
import com.cool.store.dto.exhibition.ExhibitionGroupDTO;
import com.cool.store.dto.exhibition.SignUpExhibitionDTO;
import com.cool.store.exception.ApiException;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ExhibitionService;
import com.cool.store.vo.EnterInterviewVO;
import com.cool.store.vo.exhibition.SignUpExhibitionVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -106,4 +108,19 @@ public class ExhibitionController {
return ResponseResult.success(exhibitionService.exhibitionLineBaseList(exhibitionId,partnerName));
}
@ApiOperation("报名会销")
@PostMapping("/signUpExhibition")
public ResponseResult<SignUpExhibitionVO> signUpExhibition(@RequestBody SignUpExhibitionDTO dto) throws ApiException {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(exhibitionService.signUpExhibition(dto,user));
}
@ApiOperation("取消报名会销")
@GetMapping("/cancelSignUp")
public ResponseResult<Boolean> cancelSignUp(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId,
@RequestParam(required = true,value = "lineId") Long lineId) throws ApiException {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(exhibitionService.cancelSignUpExhibition(exhibitionId,lineId,user));
}
}