From fddc53db5be089eac76bf2f9d78a240a48d04d71 Mon Sep 17 00:00:00 2001 From: liyuxin <1579178744@qq.com> Date: Sun, 8 Sep 2024 14:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=8E=E9=9B=A8=E6=AC=A3=209.8=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/market/admain/Orders.java | 82 -------------- .../market/admain/request/OrdersListReq.java | 79 -------------- .../admain/response/OrdersListResp.java | 101 ------------------ .../server/controller/AliPayController.java | 2 +- .../server/controller/OrdersController.java | 62 ----------- .../market/server/mapper/OrdersMapper.java | 17 --- .../service/Impl/OrdersServiceImpl.java | 53 --------- .../market/server/service/OrdersService.java | 15 --- .../main/resources/mapper/OrdersMapper.xml | 35 ------ 9 files changed, 1 insertion(+), 445 deletions(-) delete mode 100644 cloud-market2-common/src/main/java/com/muyu/market/admain/Orders.java delete mode 100644 cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java delete mode 100644 cloud-market2-common/src/main/java/com/muyu/market/admain/response/OrdersListResp.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java delete mode 100644 cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java delete mode 100644 cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/Orders.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/Orders.java deleted file mode 100644 index 26d7009..0000000 --- a/cloud-market2-common/src/main/java/com/muyu/market/admain/Orders.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.muyu.market.admain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.web.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -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 -@SuperBuilder -@NoArgsConstructor -@TableName(value = "订单表",autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -public class Orders extends BaseEntity { - - /** - * 订单的唯一标识 - */ - @TableId(value = "order_id",type = IdType.AUTO) - private Long orderId; - /** - * 用户名 - */ - @Schema(description = "用户名",type = "Long") - private Long userId; - /** - * 商品Id - */ - @Schema(description = "商品Id",type = "Long") - private Long apiId; - /** - * 订单号 - */ - @Schema(description = "订单号",type = "String") - private String orderNo; - /** - * 订单状态 - */ - @Schema(description = "订单状态",type = "String") - private String orderStatus; - /** - * 订单总金额 - */ - @Schema(description = "订单总金额",type = "BigDecimal") - private BigDecimal totalAmount; - /** - * 订单创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单创建时间",type = "Date") - private Date createTime; - /** - * 订单更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单更新时间",type = "Date") - private Date updateTime; - /** - * 订单备注 - */ - @Schema(description = "订单备注",type = "String") - private String note; - - - private String createBy; - private String updateBy; - private String remark; - - - -} diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java deleted file mode 100644 index 255e2d2..0000000 --- a/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.muyu.market.admain.request; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.Date; - - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@Tag(name = "订单展示", description = "订单展示") -public class OrdersListReq { - - - /** - * 订单的唯一标识 - */ - @TableId(value = "order_id",type = IdType.AUTO) - private Long orderId; - /** - * 用户名 - */ - @Schema(description = "用户名",type ="Long") - private Long userId; - /** - * 商品Id - */ - @Schema(description = "商品Id",type ="Long") - private Long apiId; - /** - * 订单号 - */ - @Schema(description = "订单号",type ="String") - private String orderNo; - /** - * 订单状态 - */ - @Schema(description = "订单状态",type ="String") - private String orderStatus; - /** - * 订单总金额 - */ - @Schema(description = "订单总金额",type ="BigDecimal") - private BigDecimal totalAmount; - /** - * 订单创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单创建时间",type = "Date") - private Date createTime; - /** - * 订单更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单创建时间",type = "Date") - private Date updateTime; - /** - * 订单备注 - */ - @Schema(description = "订单备注",type ="String") - private String note; - - - private String createBy; - private String updateBy; - private String remark; - - -} diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/response/OrdersListResp.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/response/OrdersListResp.java deleted file mode 100644 index 37ba367..0000000 --- a/cloud-market2-common/src/main/java/com/muyu/market/admain/response/OrdersListResp.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.muyu.market.admain.response; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.market.admain.Myapi; -import com.muyu.market.admain.Orders; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.Date; - - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@Tag(name = "订单展示", description = "订单展示") -public class OrdersListResp { - - - /** - * 订单的唯一标识 - */ - @TableId(value = "order_id",type = IdType.AUTO) - private Long orderId; - /** - * 用户名 - */ - @Schema(description = "用户名",type ="Long") - private Long userId; - /** - * 商品Id - */ - @Schema(description = "商品Id",type ="Long") - private Long apiId; - /** - * 订单号 - */ - @Schema(description = "订单号",type ="String") - private String orderNo; - /** - * 订单状态 - */ - @Schema(description = "订单状态",type ="String") - private String orderStatus; - /** - * 订单总金额 - */ - @Schema(description = "订单总金额",type ="BigDecimal") - private BigDecimal totalAmount; - /** - * 订单创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单创建时间",type = "Date") - private Date createTime; - /** - * 订单更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "订单创建时间",type = "Date") - private Date updateTime; - /** - * 订单备注 - */ - @Schema(description = "订单备注",type ="String") - private String note; - - - private String createBy; - private String updateBy; - private String remark; - - - public static OrdersListResp selOrdersList(Orders orders){ - - return OrdersListResp - .builder() - .orderId(orders.getOrderId()) - .userId(orders.getUserId()) - .apiId(orders.getApiId()) - .orderNo(orders.getOrderNo()) - .orderStatus(orders.getOrderStatus()) - .totalAmount(orders.getTotalAmount()) - .createTime(orders.getCreateTime()) - .updateTime(orders.getUpdateTime()) - .note(orders.getNote()) - .build(); - } - - - - - -} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java index c7e35bb..d85d79e 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java @@ -82,7 +82,7 @@ public class AliPayController { params.put(name, request.getParameter(name)); } - String tradeNo = params.get("out_trade_no"); + String tradeNo0 = params.get("out_trade_no"); String gmtPayment = params.get("gmt_payment"); String alipayTradeNo = params.get("trade_no"); diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java deleted file mode 100644 index 50dbfea..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.muyu.market.server.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.market.admain.Myapi; -import com.muyu.market.admain.request.OrdersListReq; -import com.muyu.market.admain.response.OrdersListResp; -import com.muyu.market.server.service.OrdersService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@Slf4j -@RestController -@RequestMapping("/orders") -@Tag(name = "订单控制层",description = "订单查询") -public class OrdersController { - - @Autowired - private OrdersService ordersService; - - - /** - * 订单的添加 - * @param myapi - * @return - */ - @PostMapping("/Saveorders") - @Operation(summary = "订单添加",description = "订单的添加") - public Result createOrders(@RequestBody Myapi myapi){ - - ordersService.saveOrders(myapi); - return Result.success(); - } - - - - /** - * 查询订单信息 - * @param ordersListReq - * @return - */ - @PostMapping("/ordersSelect") - @Operation(summary = "查询订单信息",description = "查询订单信息") - public Result> ordersSelect(@RequestBody OrdersListReq ordersListReq){ - List selList = ordersService.ordersSelect(ordersListReq); - return Result.success(selList); - } - - - - - - -} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java deleted file mode 100644 index b7c1d54..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.market.server.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.market.admain.Orders; -import com.muyu.market.admain.request.OrdersListReq; -import com.muyu.market.admain.response.OrdersListResp; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface OrdersMapper extends BaseMapper { - - - List ordersSelect(OrdersListReq ordersListReq); -} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java deleted file mode 100644 index 61e61da..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.muyu.market.server.service.Impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.market.admain.Myapi; -import com.muyu.market.admain.Orders; -import com.muyu.market.admain.request.OrdersListReq; -import com.muyu.market.admain.response.OrdersListResp; -import com.muyu.market.server.mapper.OrdersMapper; -import com.muyu.market.server.service.OrdersService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -@Service -public class OrdersServiceImpl extends ServiceImpl implements OrdersService { - - @Autowired - private OrdersMapper ordersMapper; - - - @Override - public void saveOrders(Myapi myapi) { - - Orders orders = new Orders(); - //获取用户ID - Long userId = SecurityUtils.getUserId(); - orders.setUserId(userId); - //获取商品ID - orders.setApiId(myapi.getApiId()); - //获取金额 - orders.setTotalAmount(myapi.getPrice()); - //创建时间为当前时间 - orders.setCreateTime(new Date()); - //修改时间为当前时间 - orders.setUpdateTime(new Date()); - - try { - ordersMapper.insert(orders); - } catch (Exception e) { - - } - - - } - - @Override - public List ordersSelect(OrdersListReq ordersListReq) { - return ordersMapper.ordersSelect(ordersListReq); - } -} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java deleted file mode 100644 index f56ddcf..0000000 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.market.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.market.admain.Myapi; -import com.muyu.market.admain.Orders; -import com.muyu.market.admain.request.OrdersListReq; -import com.muyu.market.admain.response.OrdersListResp; - -import java.util.List; - -public interface OrdersService extends IService { - void saveOrders(Myapi myapi); - - List ordersSelect(OrdersListReq ordersListReq); -} diff --git a/cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml b/cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml deleted file mode 100644 index 58b496b..0000000 --- a/cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -