From 3a07c32f328f46b8ed685f024a75feff22f86ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com> Date: Sun, 25 Aug 2024 19:15:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=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 | 90 ++++++++++++++ .../cloud/market/domin/req/OrdersAddReq.java | 94 +++++++++++++++ .../cloud/market/domin/req/OrdersListReq.java | 69 +++++++++++ .../cloud/market/domin/resp/OrdersResp.java | 110 ++++++++++++++++++ 4 files changed, 363 insertions(+) create mode 100644 cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java create mode 100644 cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersAddReq.java create mode 100644 cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersListReq.java create mode 100644 cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/OrdersResp.java 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 new file mode 100644 index 0000000..6b50f95 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Orders.java @@ -0,0 +1,90 @@ +package com.muyu.cloud.market.domin; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@EqualsAndHashCode(callSuper = true) +@TableName(value = "orders",autoResultMap = true) +public class Orders extends BaseEntity { + + /** + * 订单表ID + */ + private Long ordersId; + + /** + * 订单编号 + */ + private String ordersNum; + + /** + * 订单产品（产品外键） + */ + private Integer ordersProduct; + + /** + * 订单所属人（user外键） + */ + private Integer ordersUser; + + /** + * 订单金额 + */ + private BigDecimal ordersPrice; + + /** + * 订单规格 + */ + private String ordersSpecification; + + /** + * 订单状态（1已付款，2未付款，0待支付） + */ + private Integer ordersState; + + /** + * 订单日期 + */ + private Date ordersLaunchdate; + + /** + * 逻辑删除字段 + */ + private Integer exist; + + /** + * (关联的产品外键) + */ + private Long productId; + + /** + * 产品名称 + */ + private String productName; + + //用户模块(要使用外键) + /** + * (关联的用户外键) + */ + private Long userId; + + /** + * 用户账号 + */ + private String userName; + + + +} 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 new file mode 100644 index 0000000..1132ab7 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersAddReq.java @@ -0,0 +1,94 @@ +package com.muyu.cloud.market.domin.req; + +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 = "根据入参进行服务的添加") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class OrdersAddReq { + + /** + * 订单编号 + */ + @NotEmpty(message = "订单编号不可为空") + @Schema( + title = "订单服务编号", + description = "‘订单编码’和订单id主键不同，由产品类别批次系统构建", + type = "String", + defaultValue = "订单服务", + requiredProperties = {"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 = "订单状态:0-待支付 1-已付款 2-已取消", + 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 new file mode 100644 index 0000000..553a076 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/req/OrdersListReq.java @@ -0,0 +1,69 @@ +package com.muyu.cloud.market.domin.req; + +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 java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "订单列表请求对象") +public class OrdersListReq { + + /** + * 订单编号 + */ + @Schema( + description = "订单编号", + type = "String" + ) + private String ordersNum; + + /** + * 订单状态（已付款，未付款，待支付） + */ + @Schema( + description = "订单状态:0-待支付 1-已支付 2-已取消", + type = "Integer" + ) + private Integer ordersState; + + /** + * 订单日期 + */ + @Schema( + description = "订单日期起始日期", + type = "Date" + ) + private Date startDate; + + + /** + * 订单日期 + */ + @Schema( + description = "订单日期结束日期", + type = "Date" + ) + private Date endDate; + + /** + * 逻辑删除字段 + */ + @Schema( + description = "逻辑删除字段", + type = "Interger") + private Integer exist; + + + private Integer pageNum=1; + private Integer pageSize=5; + + +} 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 new file mode 100644 index 0000000..abf9fcd --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/resp/OrdersResp.java @@ -0,0 +1,110 @@ +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 +@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; + + /** + * 逻辑删除字段 + */ + @Schema(description = "逻辑删除字段", + type = "Interger") + private Integer exist; + + 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(); + } + + + + + +} From eed48a03ec2a469c9bfa38321a741bd75c443815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com> Date: Sun, 25 Aug 2024 19:30:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?mapper=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/market/mapper/OperatorsMapper.java | 7 ++ .../cloud/market/mapper/OrderShowMapper.java | 80 ++++++++++++++++ .../cloud/market/mapper/OrdersPayMapper.java | 7 ++ .../cloud/market/mapper/RechargeMapper.java | 7 ++ .../cloud/market/mapper/SalelogMapper.java | 7 ++ .../mapper/market/OrderShowMapper.xml | 94 +++++++++++++++++++ 6 files changed, 202 insertions(+) create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OperatorsMapper.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrdersPayMapper.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/RechargeMapper.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/SalelogMapper.java create mode 100644 cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OperatorsMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OperatorsMapper.java new file mode 100644 index 0000000..8a61f16 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OperatorsMapper.java @@ -0,0 +1,7 @@ +package com.muyu.cloud.market.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OperatorsMapper { +} 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 new file mode 100644 index 0000000..9bdabe5 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrderShowMapper.java @@ -0,0 +1,80 @@ +package com.muyu.cloud.market.mapper; + +import com.muyu.cloud.market.domin.Orders; +import com.muyu.cloud.market.domin.req.OrdersAddReq; +import com.muyu.cloud.market.domin.req.OrdersListReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface OrderShowMapper { + + /** + * 查询订单列表 + * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate) + * @param req + * @return + */ + List selectList(OrdersListReq req); + + /** 订单 + * 新增订单 + * @param ordersAddReq + * @return + */ + Integer addOrdeds(OrdersAddReq ordersAddReq); + + + /** 订单 + * 修改订单 + * @param orders + * @return + */ + Integer updateOrders(Orders orders); + + /** 订单 + * 逻辑删除->根据orderid修改exist字段 1->0 + * 订单回收站 + * @param ordersId + * @return + */ + Integer updateByeExist(Integer ordersId); + + /** 订单 + * 逻辑复原->根据orderid修改exist字段 0->1 + * 订单回收站 + * @param ordersId + * @return + */ + Integer updateByExist(Integer ordersId); + + /** 订单 + * 彻底删除(根据orderid删除数据库字段) + * @return + */ + Integer delByOrderId(Integer ordersId); + + /** + * 订单回显 + * 根据id查内容 + * @param ordersId + * @return + */ + Orders findAllById (Integer ordersId); + + + /** + * 添加订单(下单时),扣减库存 + * 修改订单支付状态未付款后,增加库存 + */ + + + + + /** + * 订单修改支付状态后,更改该商品的销量 + */ + + +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrdersPayMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrdersPayMapper.java new file mode 100644 index 0000000..6443ddf --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/OrdersPayMapper.java @@ -0,0 +1,7 @@ +package com.muyu.cloud.market.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrdersPayMapper { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/RechargeMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/RechargeMapper.java new file mode 100644 index 0000000..33d1e53 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/RechargeMapper.java @@ -0,0 +1,7 @@ +package com.muyu.cloud.market.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RechargeMapper { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/SalelogMapper.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/SalelogMapper.java new file mode 100644 index 0000000..1aaf87f --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/mapper/SalelogMapper.java @@ -0,0 +1,7 @@ +package com.muyu.cloud.market.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SalelogMapper { +} diff --git a/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml b/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml new file mode 100644 index 0000000..b0c27a3 --- /dev/null +++ b/cloud-market-server/src/main/resources/mapper/market/OrderShowMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + SELECT + orders_id, + orders_num, + orders_product, + orders_user, + orders_price, + orders_specification, + orders_state, + orders_launchdate + FROM `orders` + where exist = 1 + + + + + + + + + + + + + + INSERT INTO `orders` + (`orders_num`, `orders_product`, `orders_user`, `orders_price`, `orders_specification`, `orders_state`, `orders_launchdate`) + VALUES + (#{ordersNum}, #{ordersProduct}, #{ordersUser}, #{ordersPrice}, #{ordersSpecification}, 0, NOW()); + + + + UPDATE `orders` SET + `orders_product` = #{ordersProduct}, + `orders_user` = #{ordersUser}, + `orders_price` = #{ordersPrice}, + `orders_specification` = #{ordersSpecification}, + `orders_state` = 0 + WHERE `orders_id` IS #{ordersId}; + + + + + UPDATE `orders` SET `exist` = 0 WHERE `orders_id` IS #{ordersId} + + + + UPDATE `orders` SET `exist` = 1 WHERE `orders_id` IS #{ordersId} + + + + + DELETE FROM `orders` WHERE `orders_id` IS #{ordersId} + + + From 4097d41b73f1ec88e68f8dfee9eae1811463fcb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com> Date: Sun, 25 Aug 2024 19:34:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/OperatorsService.java | 4 + .../market/service/OrderShowService.java | 70 ++++++++++ .../market/service/OrdersPayService.java | 4 + .../cloud/market/service/RechargeService.java | 4 + .../cloud/market/service/SalelogService.java | 4 + .../service/impl/OperatorsServiceImpl.java | 10 ++ .../service/impl/OrderShowServiceImpl.java | 125 ++++++++++++++++++ .../service/impl/OrdersPayServiceImpl.java | 8 ++ .../service/impl/RechargeServiceImpl.java | 10 ++ .../service/impl/SalelogServiceImpl.java | 10 ++ 10 files changed, 249 insertions(+) create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/OperatorsService.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrdersPayService.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/RechargeService.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/SalelogService.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OperatorsServiceImpl.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrdersPayServiceImpl.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/RechargeServiceImpl.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/SalelogServiceImpl.java diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OperatorsService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OperatorsService.java new file mode 100644 index 0000000..9cace98 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OperatorsService.java @@ -0,0 +1,4 @@ +package com.muyu.cloud.market.service; + +public interface OperatorsService { +} 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 new file mode 100644 index 0000000..4cb02a2 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrderShowService.java @@ -0,0 +1,70 @@ +package com.muyu.cloud.market.service; + +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; +import com.muyu.common.core.domain.Result; + + +public interface OrderShowService { + + /** + * 查询订单列表 + * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate) + * @param req + * @return + */ + PageInfo selectList(OrdersListReq req); + + /** + * 新增订单 + * @param ordersAddReq + * @return + */ + Result addOrdeds(OrdersAddReq ordersAddReq); + + /** + * 修改订单 + * @param orders + * @return + */ + Result updateOrders(Orders orders); + + /** + * 逻辑删除->根据orderid修改exist字段 1->0 + * 订单回收站 + * @param ordersId + * @return + */ + Result updateByeExist(Integer ordersId); + + /** + * 逻辑删除->根据orderid修改exist字段 0->1 + * 订单回收站 + * @param ordersId + * @return + */ + Result updateByExist(Integer ordersId); + + + /** + * 彻底删除(根据orderid删除数据库字段) + * @return + */ + Result delByOrderId(Integer ordersId); + + /** + * 回显 + * 根据id查内容 + * @param ordersId + * @return + */ + Orders findAllById (Integer ordersId); + + + + + + +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrdersPayService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrdersPayService.java new file mode 100644 index 0000000..9ad8e18 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/OrdersPayService.java @@ -0,0 +1,4 @@ +package com.muyu.cloud.market.service; + +public interface OrdersPayService { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/RechargeService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/RechargeService.java new file mode 100644 index 0000000..bc58c24 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/RechargeService.java @@ -0,0 +1,4 @@ +package com.muyu.cloud.market.service; + +public interface RechargeService { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/SalelogService.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/SalelogService.java new file mode 100644 index 0000000..03e2f2f --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/SalelogService.java @@ -0,0 +1,4 @@ +package com.muyu.cloud.market.service; + +public interface SalelogService { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OperatorsServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OperatorsServiceImpl.java new file mode 100644 index 0000000..3dce6b0 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OperatorsServiceImpl.java @@ -0,0 +1,10 @@ +package com.muyu.cloud.market.service.impl; + +import com.muyu.cloud.market.service.OperatorsService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Service +@Log4j2 +public class OperatorsServiceImpl implements OperatorsService { +} 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 new file mode 100644 index 0000000..52335e2 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrderShowServiceImpl.java @@ -0,0 +1,125 @@ +package com.muyu.cloud.market.service.impl; + +import com.github.pagehelper.PageHelper; +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; +import com.muyu.cloud.market.mapper.OrderShowMapper; +import com.muyu.cloud.market.service.OrderShowService; +import com.muyu.common.core.domain.Result; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +@Log4j2 +public class OrderShowServiceImpl implements OrderShowService { + + @Resource + private OrderShowMapper orderShowMapper; + + /** + * 查询订单列表 + * (精确查ordersNum 精确查ordersState 日期范围 startdate enddate) + * @param req + * @return + */ + @Override + public PageInfo selectList(OrdersListReq req) { + PageHelper.startPage(req.getPageNum(),req.getPageSize()); + List ordersList = orderShowMapper.selectList(req); + PageInfo info = new PageInfo<>(ordersList); + return info; + } + + + /** + * 新增订单 + * @param ordersAddReq + * @return + */ + @Override + public Result addOrdeds(OrdersAddReq ordersAddReq) { + Integer addorders = orderShowMapper.addOrdeds(ordersAddReq); + if(addorders > 0){ + return Result.success(ordersAddReq,"添加订单成功"); + } + return Result.error(402,"添加订单失败"); + } + + /** + * 修改订单 + * @param orders + * @return + */ + @Override + public Result updateOrders(Orders orders) { + Integer updateorders = orderShowMapper.updateOrders(orders); + if(updateorders > 0){ + return Result.success(orders,"删除订单成功(逻辑)"); + } + return Result.error(402,"删除订单失败(逻辑)"); + } + + /** + * 逻辑删除->根据orderid修改exist字段 1->0 + * 订单回收站 + * @param ordersId + * @return + */ + @Override + public Result updateByeExist(Integer ordersId) { + Integer updatebyexist = orderShowMapper.updateByeExist(ordersId); + if(updatebyexist > 0){ + return Result.success(ordersId,"删除订单成功(逻辑)"); + } + return Result.error(402,"删除订单失败(逻辑)"); + } + + /** + * 逻辑复原->根据orderid修改exist字段 0->1 + * 订单回收站 + * @param ordersId + * @return + */ + @Override + public Result updateByExist(Integer ordersId) { + Integer updatebyexist = orderShowMapper.updateByeExist(ordersId); + if(updatebyexist > 0){ + return Result.success(ordersId,"复原订单成功(逻辑)"); + } + return Result.error(402,"复原订单失败(逻辑)"); + } + + /** + * 彻底删除(根据orderid删除数据库字段) + * @return + */ + @Override + public Result delByOrderId(Integer ordersId) { + Integer delbyorderId = orderShowMapper.delByOrderId(ordersId); + if(delbyorderId > 0){ + return Result.success(ordersId,"删除订单成功"); + } + return Result.error(402,"删除订单失败"); + + } + + /** + * 回显 + * 根据id查内容 + * @param ordersId + * @return + */ + @Override + public Orders findAllById(Integer ordersId) { + return orderShowMapper.findAllById(ordersId); + } + + +} + + diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrdersPayServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrdersPayServiceImpl.java new file mode 100644 index 0000000..c85efc3 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/OrdersPayServiceImpl.java @@ -0,0 +1,8 @@ +package com.muyu.cloud.market.service.impl; + +import com.muyu.cloud.market.service.OrdersPayService; +import org.springframework.stereotype.Service; + +@Service +public class OrdersPayServiceImpl implements OrdersPayService { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/RechargeServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/RechargeServiceImpl.java new file mode 100644 index 0000000..da2b4f5 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/RechargeServiceImpl.java @@ -0,0 +1,10 @@ +package com.muyu.cloud.market.service.impl; + +import com.muyu.cloud.market.service.RechargeService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Service +@Log4j2 +public class RechargeServiceImpl implements RechargeService { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/SalelogServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/SalelogServiceImpl.java new file mode 100644 index 0000000..49e1034 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/service/impl/SalelogServiceImpl.java @@ -0,0 +1,10 @@ +package com.muyu.cloud.market.service.impl; + +import com.muyu.cloud.market.service.SalelogService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Service +@Log4j2 +public class SalelogServiceImpl implements SalelogService { +} From cc602e4a142e08bf1b15c15931d1187b3e85310d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com> Date: Sun, 25 Aug 2024 19:36:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OperatorsController.java | 13 ++ .../controller/OrderShowController.java | 117 ++++++++++++++++++ .../controller/OrdersPayController.java | 13 ++ .../market/controller/RechargeController.java | 16 +++ .../market/controller/SalelogController.java | 14 +++ 5 files changed, 173 insertions(+) create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OperatorsController.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrderShowController.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersPayController.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/controller/RechargeController.java create mode 100644 cloud-market-server/src/main/java/com/muyu/cloud/market/controller/SalelogController.java diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OperatorsController.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OperatorsController.java new file mode 100644 index 0000000..90e17c0 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OperatorsController.java @@ -0,0 +1,13 @@ +package com.muyu.cloud.market.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Log4j2 +@RestController +@RequestMapping("/orders") +@Tag(name = "运营商控制层", description = "进行订单支付所用运营商管理") +public class OperatorsController { +} 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 new file mode 100644 index 0000000..6a189f8 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrderShowController.java @@ -0,0 +1,117 @@ +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; +import com.muyu.cloud.market.service.OrderShowService; +import com.muyu.common.core.domain.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Log4j2 +@RestController +@RequestMapping("/orders") +@Tag(name = "订单控制层", description = "进行订单管理查询操作") +public class OrderShowController { + public OrderShowController() { + log.info("forest{}扫描路径", ForestScannerRegister.getBasePackages()); + + } + + @Resource + private OrderShowService orderShowService; + + /** + * 展示订单 + * @param + * @return + */ + @PostMapping("/list") + @Operation(summary = "查看订单", description = "根据订单名称 编号 状态 查询") + public PageInfo selectList(@Validated @RequestBody OrdersListReq req){ + PageInfo info = orderShowService.selectList(req); + return info; + } + + + /** + * 新增订单 + * @param ordersAddReq + * @return + */ + @PostMapping("/addOrdeds") + @Operation(summary = "添加订单", description = "根据ordersAddReq对象添加订单") + Result addOrdeds(@Validated @RequestBody OrdersAddReq ordersAddReq){ + return orderShowService.addOrdeds(ordersAddReq); + } + + /** + * 修改订单 + * @param orders + * @return + */ + @PutMapping("/updateOrders") + @Operation(summary = "修改订单", description = "根据ordersid查找订单进行修改") + Result updateOrders(@Validated @RequestBody Orders orders){ + return orderShowService.updateOrders(orders); + } + + /** + * 逻辑删除->根据orderid修改exist字段 1->0 + * 订单回收站 + * @param ordersId + * @return + */ + @PutMapping("/updateByeExist/{ordersId}") + @Operation(summary = "逻辑删除订单", description = "根据orderid修改exist字段 1->0/(类似回收站)") + Result updateByeExist (@Validated @PathVariable("ordersId") Integer ordersId){ + return orderShowService.updateByeExist(ordersId); + } + + /** + * 逻辑删除->根据orderid修改exist字段 1->0 + * 订单回收站 + * @param ordersId + * @return + */ + @PutMapping("/updateByExist/{ordersId}") + @Operation(summary = "逻辑复原订单", description = "根据orderid修改exist字段 0->1") + Result updateByExist(@Validated @PathVariable("ordersId") Integer ordersId){ + return orderShowService.updateByExist(ordersId); + } + + /** + * 彻底删除(根据orderid删除数据库字段) + * @return + */ + @DeleteMapping("/delByOrderId/{ordersId}") + @Operation(summary = "彻底删除订单", description = "根据根据orderid删除数据库字段") + Result delByOrderId(@Validated @PathVariable("ordersId") Integer ordersId){ + return orderShowService.delByOrderId(ordersId); + } + + + /** + * 回显 + * 根据id查内容 + * @param ordersId + * @return + */ + @PostMapping("/findAllById/{ordersId}") + @Operation(summary = "回显", description = "根据ordersId进行查询信息") + Orders findAllById (@Validated @PathVariable("ordersId") Integer ordersId){ + return orderShowService.findAllById(ordersId); + } + + + + + +} 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/OrdersPayController.java new file mode 100644 index 0000000..00e64d3 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/OrdersPayController.java @@ -0,0 +1,13 @@ +package com.muyu.cloud.market.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Log4j2 +@RestController +@RequestMapping("/orders") +@Tag(name = "订单支付控制层", description = "进行订单支付管理") +public class OrdersPayController { +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/RechargeController.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/RechargeController.java new file mode 100644 index 0000000..f1bd161 --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/RechargeController.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.market.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Log4j2 +@RestController +@RequestMapping("/orders") +@Tag(name = "账户充值控制层", description = "进行账户充值管理") +public class RechargeController { + + + +} diff --git a/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/SalelogController.java b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/SalelogController.java new file mode 100644 index 0000000..cbd270e --- /dev/null +++ b/cloud-market-server/src/main/java/com/muyu/cloud/market/controller/SalelogController.java @@ -0,0 +1,14 @@ +package com.muyu.cloud.market.controller; + + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Log4j2 +@RestController +@RequestMapping("/orders") +@Tag(name = "购买记录控制层", description = "进行订单购买日志管理") +public class SalelogController { +} From aabae3511dde139aaed93451d7ad65b30535d378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com> Date: Sun, 25 Aug 2024 20:01:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{OrderShowController.java => OrdersController.java} | 9 +++++---- .../{OrdersPayController.java => PayController.java} | 4 ++-- .../com/muyu/cloud/market/service/OrderShowService.java | 4 +++- .../cloud/market/service/impl/OrderShowServiceImpl.java | 9 +++++---- 4 files changed, 15 insertions(+), 11 deletions(-) rename cloud-market-server/src/main/java/com/muyu/cloud/market/controller/{OrderShowController.java => OrdersController.java} (93%) rename cloud-market-server/src/main/java/com/muyu/cloud/market/controller/{OrdersPayController.java => PayController.java} (76%) 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; }