diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrderShowController.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java similarity index 93% rename from cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrderShowController.java rename to cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java index 6a189f8..61aa196 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrderShowController.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersController.java @@ -14,13 +14,14 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @Log4j2 @RestController @RequestMapping("/orders") @Tag(name = "订单控制层", description = "进行订单管理查询操作") -public class OrderShowController { - public OrderShowController() { +public class OrdersController { + public OrdersController() { log.info("forest{}扫描路径", ForestScannerRegister.getBasePackages()); } @@ -35,8 +36,8 @@ public class OrderShowController { */ @PostMapping("/list") @Operation(summary = "查看订单", description = "根据订单名称 编号 状态 查询") - public PageInfo selectList(@Validated @RequestBody OrdersListReq req){ - PageInfo info = orderShowService.selectList(req); + public List selectList(@Validated @RequestBody OrdersListReq req){ + List info = orderShowService.selectList(req); return info; } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersPayController.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/PayController.java similarity index 76% rename from cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersPayController.java rename to cloud-market-server/src/main/java/com/muyu/cloud/market/controller/PayController.java index 00e64d3..46835ae 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersPayController.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/PayController.java @@ -8,6 +8,6 @@ import org.springframework.web.bind.annotation.RestController; @Log4j2 @RestController @RequestMapping("/orders") -@Tag(name = "订单支付控制层", description = "进行订单支付管理") -public class OrdersPayController { +@Tag(name = "支付接口控制层", description = "进行订单支付管理") +public class PayController { } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java index 4cb02a2..a8c5999 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java @@ -6,6 +6,8 @@ import com.muyu.cloud.market.domin.req.OrdersAddReq; import com.muyu.cloud.market.domin.req.OrdersListReq; import com.muyu.common.core.domain.Result; +import java.util.List; + public interface OrderShowService { @@ -15,7 +17,7 @@ public interface OrderShowService { * @param req * @return */ - PageInfo selectList(OrdersListReq req); + List selectList(OrdersListReq req); /** * 新增订单 diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java index 52335e2..66f6786 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java @@ -28,11 +28,12 @@ public class OrderShowServiceImpl implements OrderShowService { * @return */ @Override - public PageInfo selectList(OrdersListReq req) { - PageHelper.startPage(req.getPageNum(),req.getPageSize()); + public List selectList(OrdersListReq req) { +// PageHelper.startPage(req.getPageNum(),req.getPageSize()); List ordersList = orderShowMapper.selectList(req); - PageInfo info = new PageInfo<>(ordersList); - return info; +// PageInfo info = new PageInfo<>(ordersList); +// return info; + return ordersList; }