diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersListReq.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersListReq.java index 9f5f424..ce78636 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersListReq.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersListReq.java @@ -22,7 +22,6 @@ public class OrdersListReq { /** * 订单编号 */ - @NotEmpty(message = "订单编号不可为空") @Schema( description = "订单编号", type = "String" 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/OrderShowController.java index a2c338b..ab929e4 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/OrderShowController.java @@ -2,6 +2,7 @@ package com.muyu.cloud.market.controller; import com.dtflys.forest.springboot.annotation.ForestScannerRegister; import com.github.pagehelper.PageInfo; + import com.muyu.cloud.market.domin.Orders; import com.muyu.cloud.market.domin.req.OrdersAddReq; import com.muyu.cloud.market.domin.req.OrdersListReq; @@ -11,6 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import com.muyu.common.core.domain.Result; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,7 +38,7 @@ public class OrderShowController { */ @PostMapping("/list") @Operation(summary = "查看订单", description = "根据订单名称 编号 状态 查询") - public PageInfo selectList(OrdersListReq req){ + public PageInfo selectList(@Validated @RequestBody OrdersListReq req){ PageInfo info = orderShowService.selectList(req); return info; } @@ -49,7 +51,7 @@ public class OrderShowController { */ @PostMapping("/addOrdeds") @Operation(summary = "添加订单", description = "根据ordersAddReq对象添加订单") - Result addOrdeds(OrdersAddReq ordersAddReq){ + Result addOrdeds(@Validated @RequestBody OrdersAddReq ordersAddReq){ return orderShowService.addOrdeds(ordersAddReq); } @@ -60,7 +62,7 @@ public class OrderShowController { */ @PutMapping("/updateOrders") @Operation(summary = "修改订单", description = "根据ordersid查找订单进行修改") - Result updateOrders(Orders orders){ + Result updateOrders(@RequestBody Orders orders){ return orderShowService.updateOrders(orders); } diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java index c3e9c58..e2986d2 100644 --- a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java @@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface OrderShowMapper extends BaseMapper { +public interface OrderShowMapper { /** * 查询订单列表 @@ -27,6 +27,7 @@ public interface OrderShowMapper extends BaseMapper { */ Integer addOrdeds(OrdersAddReq ordersAddReq); + /** 订单 暂定!!!!!!!!! * 修改订单 * @param orders 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 18a7e03..867358d 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 @@ -12,7 +12,7 @@ import com.muyu.common.core.domain.Result; import java.util.List; -public interface OrderShowService extends IService { +public interface OrderShowService { /** * 查询订单列表 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 60fca3d..0a98299 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 @@ -14,15 +14,14 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import io.swagger.v3.oas.annotations.servers.Server; import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -@Server +@Service @Log4j2 -public class OrderShowServiceImpl extends - ServiceImpl - implements OrderShowService { +public class OrderShowServiceImpl implements OrderShowService { @Resource private OrderShowMapper orderShowMapper; @@ -50,10 +49,10 @@ public class OrderShowServiceImpl extends @Override public Result addOrdeds(OrdersAddReq ordersAddReq) { Integer addorders = orderShowMapper.addOrdeds(ordersAddReq); - if(addorders < 1){ - return Result.error(ordersAddReq,"添加订单成功"); + if(addorders > 0){ + return Result.success(ordersAddReq,"添加订单成功"); } - return Result.success(402,"添加订单失败"); + return Result.error(402,"添加订单失败"); } /** @@ -75,10 +74,10 @@ public class OrderShowServiceImpl extends @Override public Result updateByeExist(Integer ordersId) { Integer updatebyexist = orderShowMapper.updateByeExist(ordersId); - if(updatebyexist < 1){ - return Result.error(ordersId,"删除订单成功(逻辑)"); + if(updatebyexist > 0){ + return Result.success(ordersId,"删除订单成功(逻辑)"); } - return Result.success(402,"删除订单失败(逻辑)"); + return Result.error(402,"删除订单失败(逻辑)"); } /** @@ -88,10 +87,11 @@ public class OrderShowServiceImpl extends @Override public Result delByOrderId(Integer ordersId) { Integer delbyorderId = orderShowMapper.delByOrderId(ordersId); - if(delbyorderId < 1){ - return Result.error(ordersId,"删除订单成功"); + if(delbyorderId > 0){ + return Result.success(ordersId,"删除订单成功"); } - return Result.success(402,"删除订单失败"); + return Result.error(402,"删除订单失败"); + } /** diff --git a/cloud-market-server/src/main/resources/mapper/OrderShowMapper.xml b/cloud-market-server/src/main/resources/mapper/OrderShowMapper.xml index f4e9be1..169e08c 100644 --- a/cloud-market-server/src/main/resources/mapper/OrderShowMapper.xml +++ b/cloud-market-server/src/main/resources/mapper/OrderShowMapper.xml @@ -40,7 +40,7 @@