From 5f6776c45103640ef73ee9fc98fec6fa1c22da8c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 8 Jan 2024 11:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/pay/api/order/PayOrderVo.java     | 23 +++++++++++++++++++
 .../java/com/yxt/pay/biz/order/OrderRest.java |  3 ++-
 .../com/yxt/pay/biz/order/OrderService.java   | 12 +++++++---
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/yxt/pay/api/order/PayOrderVo.java

diff --git a/src/main/java/com/yxt/pay/api/order/PayOrderVo.java b/src/main/java/com/yxt/pay/api/order/PayOrderVo.java
new file mode 100644
index 0000000..674f59a
--- /dev/null
+++ b/src/main/java/com/yxt/pay/api/order/PayOrderVo.java
@@ -0,0 +1,23 @@
+package com.yxt.pay.api.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/8
+ **/
+@Data
+public class PayOrderVo {
+    @ApiModelProperty("主订单sid")
+    private String mainSid;
+    @ApiModelProperty("订单编号")
+    private String outTradeNo;
+    @ApiModelProperty("订单创建时间")
+    private String createTime;
+    @ApiModelProperty("商品价格")
+    private String price;
+    @ApiModelProperty("商品名称")
+    private String goods;
+}
diff --git a/src/main/java/com/yxt/pay/biz/order/OrderRest.java b/src/main/java/com/yxt/pay/biz/order/OrderRest.java
index 633aa42..81c5225 100644
--- a/src/main/java/com/yxt/pay/biz/order/OrderRest.java
+++ b/src/main/java/com/yxt/pay/biz/order/OrderRest.java
@@ -3,6 +3,7 @@ package com.yxt.pay.biz.order;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.pay.api.order.OrderDto;
 import com.yxt.pay.api.order.OrderQuery;
+import com.yxt.pay.api.order.PayOrderVo;
 import com.yxt.pay.utils.ApiBaseAction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,7 +31,7 @@ public class OrderRest extends ApiBaseAction {
     private OrderService orderService;
 
     @PostMapping("createOrder")
-    ResultBean<String> createOrder(@RequestBody OrderDto dto) {
+    ResultBean<PayOrderVo> createOrder(@RequestBody OrderDto dto) {
         return orderService.createOrder(dto);
     }
 
diff --git a/src/main/java/com/yxt/pay/biz/order/OrderService.java b/src/main/java/com/yxt/pay/biz/order/OrderService.java
index 85063b6..0e088a9 100644
--- a/src/main/java/com/yxt/pay/biz/order/OrderService.java
+++ b/src/main/java/com/yxt/pay/biz/order/OrderService.java
@@ -37,8 +37,9 @@ public class OrderService extends MybatisBaseService<OrderMapper, PayOrder> {
     //订单查询
     String orderquery = "https://api.mch.weixin.qq.com/pay/orderquery";
 
-    public ResultBean<String> createOrder(OrderDto dto) {
-        ResultBean<String> rb = ResultBean.fireFail();
+    public ResultBean<PayOrderVo> createOrder(OrderDto dto) {
+        ResultBean<PayOrderVo> rb = ResultBean.fireFail();
+        PayOrderVo payOrderVo = new PayOrderVo();
         PayOrder order = new PayOrder(dto.getSource());
         order.setTotalTee(dto.getTotalTee());
         order.setTimeRemarks(dto.getTimeRemarks());
@@ -46,6 +47,11 @@ public class OrderService extends MybatisBaseService<OrderMapper, PayOrder> {
         order.setCreateBySid(dto.getUserSid());
         order.setOpenId(dto.getOpenId());
         baseMapper.insert(order);
+        payOrderVo.setCreateTime(DateUtils.format(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        payOrderVo.setGoods(order.getName());
+        payOrderVo.setMainSid(order.getSid());
+        payOrderVo.setOutTradeNo(order.getOutTradeNo());
+        payOrderVo.setPrice(order.getTotalTee());
        /* OrderVo orderVo = new OrderVo();
         Map<Object, Object> resultObj = new TreeMap();
         if (dto.getPayType() == 0) {//支付宝
@@ -106,7 +112,7 @@ public class OrderService extends MybatisBaseService<OrderMapper, PayOrder> {
             }
         }*/
 
-        return rb.success().setData(order.getSid());
+        return rb.success().setData(payOrderVo);
     }
 
     public ResultBean pay(OrderQuery query, String ip) {