diff --git a/src/main/java/com/example/gb/bean/PayGOrder.java b/src/main/java/com/example/gb/bean/PayGOrder.java index fb76e5a..ede85e4 100644 --- a/src/main/java/com/example/gb/bean/PayGOrder.java +++ b/src/main/java/com/example/gb/bean/PayGOrder.java @@ -30,4 +30,5 @@ public class PayGOrder { private Integer liveId; private Boolean isRead; private Integer addTime; + private String dept; } diff --git a/src/main/java/com/example/gb/controller/GoldPayGOrderController.java b/src/main/java/com/example/gb/controller/GoldPayGOrderController.java index b21f069..fa9b685 100644 --- a/src/main/java/com/example/gb/controller/GoldPayGOrderController.java +++ b/src/main/java/com/example/gb/controller/GoldPayGOrderController.java @@ -77,6 +77,14 @@ public class GoldPayGOrderController { } /** + * 根据用户部门获取订单 + */ + @GetMapping("/dept/{dept}") + public List getOrdersByDept(@PathVariable String dept) { + return goldPayGOrderService.getOrdersByDept(dept); + } + + /** * 创建新订单 */ @PostMapping("/") diff --git a/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java b/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java index f934215..fde5d09 100644 --- a/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java +++ b/src/main/java/com/example/gb/dao/GoldPayGOrderMapper.java @@ -22,6 +22,8 @@ public interface GoldPayGOrderMapper { List findByPage(@Param("offset") int offset, @Param("limit") int limit); + List findByDept(String dept); + int insert(PayGOrder order); int update(PayGOrder order); diff --git a/src/main/java/com/example/gb/service/GoldPayGOrderService.java b/src/main/java/com/example/gb/service/GoldPayGOrderService.java index d6e8825..ace6205 100644 --- a/src/main/java/com/example/gb/service/GoldPayGOrderService.java +++ b/src/main/java/com/example/gb/service/GoldPayGOrderService.java @@ -13,6 +13,7 @@ public interface GoldPayGOrderService { PayGOrder getOrderByPayStyle(Boolean payStyle); List getOrdersBySuccessTimeRange(Integer startTime, Integer endTime); List getOrdersByPage(@Param("offset") int offset, @Param("limit") int limit); + List getOrdersByDept(String dept); boolean createOrder(PayGOrder order); boolean updateOrder(PayGOrder order); boolean deleteOrder(Integer id); diff --git a/src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java deleted file mode 100644 index 6c8834b..0000000 --- a/src/main/java/com/example/gb/service/impl/GoldBeanServiceImpl.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.gb.service.impl; - -import com.example.gb.service.GoldBeanService; - -public class GoldBeanServiceImpl implements GoldBeanService { -} diff --git a/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java b/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java index 6449b89..d6602de 100644 --- a/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java +++ b/src/main/java/com/example/gb/service/impl/GoldPayGOrderServiceImpl.java @@ -34,7 +34,6 @@ public class GoldPayGOrderServiceImpl implements GoldPayGOrderService { return goldPayGOrderMapper.findByJwCode(jwCode); } - @Override public PayGOrder getOrderByPayStyle(Boolean payStyle) { return goldPayGOrderMapper.findByPayStyle(payStyle); @@ -51,6 +50,11 @@ public class GoldPayGOrderServiceImpl implements GoldPayGOrderService { } @Override + public List getOrdersByDept(String dept) { + return goldPayGOrderMapper.findByDept(dept); + } + + @Override public boolean createOrder(PayGOrder order) { order.setAddTime((int) (System.currentTimeMillis() / 1000)); return goldPayGOrderMapper.insert(order) > 0; diff --git a/src/main/resources/mapper/GoldPayGOrderMapper.xml b/src/main/resources/mapper/GoldPayGOrderMapper.xml index a85d6f6..85eeb15 100644 --- a/src/main/resources/mapper/GoldPayGOrderMapper.xml +++ b/src/main/resources/mapper/GoldPayGOrderMapper.xml @@ -58,6 +58,13 @@ WHERE success_time >= #{startTime} AND success_time <= #{endTime} + + +