You've already forked FrameTour-BE
推客直接收益,调整顺序
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
package com.ycwl.basic.controller.extern;
|
||||
|
||||
import com.ycwl.basic.annotation.IgnoreToken;
|
||||
import com.ycwl.basic.mapper.FaceMapper;
|
||||
import com.ycwl.basic.mapper.MemberMapper;
|
||||
import com.ycwl.basic.mapper.VideoMapper;
|
||||
@ -23,7 +24,9 @@ import com.ycwl.basic.utils.ApiResponse;
|
||||
import com.ycwl.basic.utils.SnowFlakeUtil;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
@ -36,7 +39,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController("/ly")
|
||||
@RestController
|
||||
@RequestMapping("/ly")
|
||||
public class LyCompatibleController {
|
||||
@Autowired
|
||||
private FaceService faceService;
|
||||
@ -57,6 +61,7 @@ public class LyCompatibleController {
|
||||
private TaskTaskServiceImpl taskTaskServiceImpl;
|
||||
|
||||
@PostMapping("sendPhoto")
|
||||
@IgnoreToken
|
||||
public R sendPhoto(@RequestParam(value = "file", required = false) MultipartFile file, HttpServletRequest request) {
|
||||
Map<String, String> headersMap = new HashMap<String, String>();
|
||||
Enumeration<String> headerNames = request.getHeaderNames();
|
||||
@ -72,12 +77,14 @@ public class LyCompatibleController {
|
||||
return R.error("请传入秘钥!");
|
||||
}
|
||||
String scid = request.getParameter("scid");
|
||||
Long scenicId = 0L;
|
||||
long scenicId;
|
||||
if (StringUtils.isBlank(scid)) {
|
||||
return R.error("景区ID为空!");
|
||||
}
|
||||
if (StringUtils.equals("288",scid)) {
|
||||
// 正式景区
|
||||
scenicId = 3955650120997015552L;
|
||||
} else {
|
||||
scenicId = 3946669713328836608L;
|
||||
}
|
||||
String openId = headersMap.get("client");
|
||||
MemberRespVO member = memberMapper.getByOpenId(openId);
|
||||
@ -104,7 +111,8 @@ public class LyCompatibleController {
|
||||
return R.ok().put("data", resp);
|
||||
}
|
||||
|
||||
@PostMapping("getIsVideo")
|
||||
@RequestMapping("getIsVideo")
|
||||
@IgnoreToken
|
||||
public R getIsVideo(HttpServletRequest request) {
|
||||
Map<String, String> headersMap = new HashMap<String, String>();
|
||||
Enumeration<String> headerNames = request.getHeaderNames();
|
||||
@ -140,7 +148,8 @@ public class LyCompatibleController {
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("getNewVideo")
|
||||
@RequestMapping("getNewVideo")
|
||||
@IgnoreToken
|
||||
public R getNewVideo(HttpServletRequest request) {
|
||||
Map<String, String> headersMap = new HashMap<String, String>();
|
||||
Enumeration<String> headerNames = request.getHeaderNames();
|
||||
|
@ -99,11 +99,11 @@ public class BrokerController {
|
||||
}
|
||||
|
||||
@ApiOperation("根据brokerId和时间范围查询每天的记录数量和orderPrice汇总")
|
||||
@GetMapping("/record/dailySummary")
|
||||
@GetMapping("/{id}/record/summary")
|
||||
public ApiResponse<List<DailySummaryRespVO>> getDailySummaryByBrokerId(
|
||||
@RequestParam Long brokerId,
|
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
|
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
|
||||
@PathVariable("id") Long brokerId,
|
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
|
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
|
||||
return ApiResponse.success(brokerRecordService.getDailySummaryByBrokerId(brokerId, startTime, endTime));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user