Commit c9d2de37 authored by xuxin's avatar xuxin

管理员界面-推广码下线查询

parent 8e6bf3f4
...@@ -451,7 +451,7 @@ public class AdministratorController { ...@@ -451,7 +451,7 @@ public class AdministratorController {
} }
//统计推广码下消费 //统计推广码下消费
//@PreAuthorize(Securitys.ADMIN_EL) @PreAuthorize(Securitys.ADMIN_EL)
@RequestMapping(path = "/0xadministrator/promotioncode/query", method = RequestMethod.GET) @RequestMapping(path = "/0xadministrator/promotioncode/query", method = RequestMethod.GET)
public ResultDto queryPromotion(Principal principal, @RequestParam(value = "page") int page, @RequestParam(value = "size") int size, public ResultDto queryPromotion(Principal principal, @RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
@RequestParam(value = "strDate1") String strDate1, @RequestParam(value = "strDate2") String strDate2, @RequestParam(value = "strDate1") String strDate1, @RequestParam(value = "strDate2") String strDate2,
...@@ -463,7 +463,7 @@ public class AdministratorController { ...@@ -463,7 +463,7 @@ public class AdministratorController {
resultDto.setData(administratorService.queryPromotion(pageable, username, promotionCode, strDate1, strDate2)); resultDto.setData(administratorService.queryPromotion(pageable, username, promotionCode, strDate1, strDate2));
resultDto.setStatus(0); resultDto.setStatus(0);
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
System.out.println("=======>" + (end - begin) + "ms"); log.info("queryPromotion executed time: {} ms", (end - begin));
} catch (ClientRequestException e) { } catch (ClientRequestException e) {
resultDto.setStatus(-1); resultDto.setStatus(-1);
Map<String, Object> statusInfo = new HashMap<>(); Map<String, Object> statusInfo = new HashMap<>();
...@@ -475,7 +475,7 @@ public class AdministratorController { ...@@ -475,7 +475,7 @@ public class AdministratorController {
} }
//统计推广码下消费 //统计推广码下消费
//@PreAuthorize(Securitys.ADMIN_EL) @PreAuthorize(Securitys.ADMIN_EL)
@GetMapping("/0xadministrator/promotioncode/queryinfo") @GetMapping("/0xadministrator/promotioncode/queryinfo")
public ResultDto queryCountPromotionInfo(@RequestParam(value = "strDate1") String strDate1, @RequestParam(value = "strDate2") String strDate2, public ResultDto queryCountPromotionInfo(@RequestParam(value = "strDate1") String strDate1, @RequestParam(value = "strDate2") String strDate2,
@RequestParam(value = "username", required = false) String username, @RequestParam(value = "promotionCode", required = false) String promotionCode) { @RequestParam(value = "username", required = false) String username, @RequestParam(value = "promotionCode", required = false) String promotionCode) {
...@@ -485,7 +485,7 @@ public class AdministratorController { ...@@ -485,7 +485,7 @@ public class AdministratorController {
resultDto.setData(administratorService.countPromotionInfos(username, promotionCode, strDate1, strDate2)); resultDto.setData(administratorService.countPromotionInfos(username, promotionCode, strDate1, strDate2));
resultDto.setStatus(0); resultDto.setStatus(0);
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
System.out.println("=======>" + (end - begin) + "ms"); log.info("queryCountPromotionInfo executed time: {} ms", (end - begin));
} catch (ClientRequestException e) { } catch (ClientRequestException e) {
resultDto.setStatus(-1); resultDto.setStatus(-1);
Map<String, Object> statusInfo = new HashMap<>(); Map<String, Object> statusInfo = new HashMap<>();
...@@ -497,7 +497,7 @@ public class AdministratorController { ...@@ -497,7 +497,7 @@ public class AdministratorController {
} }
//统计推广码下消费 //统计推广码下消费
//@PreAuthorize(Securitys.ADMIN_EL) @PreAuthorize(Securitys.ADMIN_EL)
@GetMapping("/0xadministrator/promotioncode/querypage") @GetMapping("/0xadministrator/promotioncode/querypage")
public ResultDto queryPagePromotionInfos(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, public ResultDto queryPagePromotionInfos(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
@RequestParam(value = "strDate1") String strDate1, @RequestParam(value = "strDate2") String strDate2, @RequestParam(value = "strDate1") String strDate1, @RequestParam(value = "strDate2") String strDate2,
...@@ -509,7 +509,7 @@ public class AdministratorController { ...@@ -509,7 +509,7 @@ public class AdministratorController {
resultDto.setData(administratorService.pagePromotionInfos(pageable, username, promotionCode, strDate1, strDate2)); resultDto.setData(administratorService.pagePromotionInfos(pageable, username, promotionCode, strDate1, strDate2));
resultDto.setStatus(0); resultDto.setStatus(0);
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
System.out.println("=======>" + (end - begin) + "ms"); log.info("queryPagePromotionInfos executed time: {} ms", (end - begin));
} catch (ClientRequestException e) { } catch (ClientRequestException e) {
resultDto.setStatus(-1); resultDto.setStatus(-1);
Map<String, Object> statusInfo = new HashMap<>(); Map<String, Object> statusInfo = new HashMap<>();
......
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