From fb48df83d35c6c416ca4d1983f1cc9eff639cb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com> Date: Wed, 21 Aug 2024 20:36:45 +0800 Subject: [PATCH] =?UTF-8?q?orders=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/cloud/market/domin/Orders.java | 4 +- .../com/muyu/cloud/market/domin/Product.java | 19 ++-- .../cloud/market/domin/req/OrdersAddReq.java | 61 ++++++++++++- .../cloud/market/domin/req/OrdersListReq.java | 6 +- .../market/domin/resp/CustomerListResp.java | 4 + .../cloud/market/domin/resp/OrdersResp.java | 86 ++++++++++++++++++- .../market/service/OrderShowService.java | 9 +- .../service/impl/OrderShowServiceImpl.java | 15 ++-- 8 files changed, 185 insertions(+), 19 deletions(-) diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java index 8394e5b..4472a1f 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java @@ -22,12 +22,12 @@ public class Orders extends BaseEntity { /** * 订单表ID */ - private Integer ordersId; + private Long ordersId; /** * 订单编号 */ - private Integer ordersNum; + private String ordersNum; /** * 订单产品（产品外键） diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Product.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Product.java index 042d42c..456173b 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Product.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Product.java @@ -1,11 +1,16 @@ package com.muyu.cloud.market.domin; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; /** * @Author：weiran @@ -24,7 +29,7 @@ public class Product extends BaseEntity { /** * 主键 */ - private String productId; + private Long productId; /** * 产品名称 */ @@ -32,7 +37,7 @@ public class Product extends BaseEntity { /** *产品价格 */ - private String productPrice; + private BigDecimal productPrice; /** *产品介绍 */ @@ -40,7 +45,7 @@ public class Product extends BaseEntity { /** *产品上架状态（是否上架 0未上架 1已上架） */ - private String productState; + private Integer productState; /** *产品规格（按次购买/按日期购买）购买多少次 */ @@ -48,15 +53,17 @@ public class Product extends BaseEntity { /** *产品库存 */ - private String productInventory; + private Integer productInventory; /** *产品销量 */ - private String product_sales; + private Integer productSales; /** *产品上架日期 */ - private String product_shelvesdate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date productShelvesdate; diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersAddReq.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersAddReq.java index adc993e..4d636e9 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersAddReq.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersAddReq.java @@ -1,13 +1,16 @@ package com.muyu.cloud.market.domin.req; +import com.muyu.common.core.validation.custom.IsSystemYesNo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; import java.util.Date; @Tag(name = "订单信息列表请求对象",description = "根据入参进行服务的添加") @@ -17,7 +20,6 @@ import java.util.Date; @Builder public class OrdersAddReq { - /** * 订单编号 */ @@ -29,8 +31,63 @@ public class OrdersAddReq { defaultValue = "订单服务", requiredProperties = {"ordersNum"} ) - private Integer ordersNum; + private String ordersNum; + /** + * 订单产品（产品外键） + */ + @Schema(title = "订单产品（产品外键）", + type = "Integer") + @NotEmpty(message = "订单产品不可为空") + private Integer ordersProduct; + + /** + * 订单所属人（user外键） + */ + @Schema(title = "订单所属人（用户外键）", + type = "Integer") + @NotEmpty(message = "订单所属人不可为空") + private Integer ordersUser; + + /** + * 订单金额 + */ + @NotBlank(message = "订单金额不可为空") + @Schema( + title = "订单金额", + description = "订单金额方向需使用特殊操作处理", + type = "BigDecimal" + ) + private BigDecimal ordersPrice; + + /** + * 订单规格 + */ + @Schema( + description = "订单规格", + type = "String" + ) + private String ordersSpecification; + + /** + * 订单状态（已付款，未付款，待支付） + */ + @Schema( + title = "订单状态", + description = "订单状态:1-待支付 2-已付款 3-已取消", + type = "Interger" + ) + @NotEmpty(message = "客户使用状态不能为空") + private Integer ordersState; + + /** + * 订单日期 + */ + @Schema( + description = "订单日期", + type = "Date" + ) + private Date ordersLaunchdate; 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 d481e50..e92ba8c 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 @@ -1,5 +1,6 @@ package com.muyu.cloud.market.domin.req; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.NotEmpty; @@ -7,6 +8,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -31,7 +33,7 @@ public class OrdersListReq { * 订单状态（已付款，未付款，待支付） */ @Schema( - description = "订单状态:1-待支付 2-已付款 3-已取消", + description = "订单状态:1-待支付 2-已支付 3-已取消", type = "Integer" ) private Integer ordersState; @@ -43,6 +45,8 @@ public class OrdersListReq { description = "订单日期", type = "Date" ) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date ordersLaunchdate; diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/CustomerListResp.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/CustomerListResp.java index 2b2b698..b827309 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/CustomerListResp.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/CustomerListResp.java @@ -6,6 +6,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.*; import lombok.experimental.SuperBuilder; +import java.math.BigDecimal; +import java.util.Date; + /** * @Author：weiran * @Package：com.muyu.cloud.market.domin.resp @@ -20,4 +23,5 @@ import lombok.experimental.SuperBuilder; @Tag(name = "客户信息", description = "客户详细信息情况") public class CustomerListResp { + } diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/OrdersResp.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/OrdersResp.java index 8580fe1..65e42c4 100644 --- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/OrdersResp.java +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/OrdersResp.java @@ -1,17 +1,101 @@ package com.muyu.cloud.market.domin.resp; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.cloud.market.domin.Orders; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; +import java.util.function.Supplier; @Data -@Builder @AllArgsConstructor @NoArgsConstructor +@Builder +@Tag(name = "订单信息响应对象",description = "负责订单信息查询的响应结果") public class OrdersResp { + /** + * 订单表ID + */ + @Schema(description = "订单表ID", + defaultValue = "1", + type = "Long") + private Long ordersId; + + /** + * 订单编号 + */ + @Schema(description = "订单编号", + type = "String") + private String ordersNum; + + /** + * 订单产品（产品外键） + */ + @Schema(description = "订单产品（产品外键）", + type = "Integer") + private Integer ordersProduct; + + /** + * 订单所属人（user外键） + */ + @Schema(description = "订单所属人（user外键）", + type = "Integer") + private Integer ordersUser; + + /** + * 订单金额 + */ + @Schema(description = "订单金额", + type = "BigDecimal") + private BigDecimal ordersPrice; + + /** + * 订单规格 + */ + @Schema(description = "订单规格", + type = "String") + private String ordersSpecification; + + /** + * 订单状态（已付款，未付款，待支付） + */ + @Schema(description = "订单状态（已付款，未付款，待支付）", + type = "Integer") + private Integer ordersState; + + /** + * 订单日期 + */ + @Schema(description = "订单日期", + type = "Date") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date ordersLaunchdate; + + + public static OrdersResp ordersresp(Orders orders, Supplier> function){ + + return OrdersResp.builder() + .ordersId(orders.getOrdersId()) + .ordersNum(orders.getOrdersNum()) + .ordersProduct(orders.getOrdersProduct()) + .ordersUser(orders.getOrdersUser()) + .ordersPrice(orders.getOrdersPrice()) + .ordersSpecification(orders.getOrdersSpecification()) + .ordersState(orders.getOrdersState()) + .ordersLaunchdate(orders.getOrdersLaunchdate()) + .build(); + } 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 4ac94a4..3e00741 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 @@ -2,12 +2,19 @@ package com.muyu.cloud.market.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.cloud.market.domin.Orders; +import com.muyu.cloud.market.domin.req.OrdersListReq; import java.util.List; public interface OrderShowService extends IService { + /** + * 订单查询列表 + * @param req + * @return + */ + List selectOrderShow(OrdersListReq req); + - List selectOrderShowAndLimit(); } 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 ed48d47..b3114ae 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 @@ -3,6 +3,7 @@ package com.muyu.cloud.market.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.cloud.market.domin.Orders; +import com.muyu.cloud.market.domin.req.OrdersListReq; import com.muyu.cloud.market.mapper.OrderShowMapper; import com.muyu.cloud.market.service.OrderShowService; import com.muyu.common.core.utils.StringUtils; @@ -21,13 +22,15 @@ public class OrderShowServiceImpl extends ServiceImpl i @Override - public List selectOrderShowAndLimit() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like( - StringUtils.isNotEmpty() - ) - + public List selectOrderShow(OrdersListReq req) { + return null; } + + + + + + }