From 4877beea283459cc066e09c628d68a2e8661d83f Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Fri, 24 Feb 2023 10:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/orderDetails.vue       |  2 +-
 .../system/controller/SysUserController.java        | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
index 38256ec8..dabfaed3 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
@@ -62,7 +62,7 @@
                 <p class="text">驻马店市 驿城区</p>
                 <p class="text">{{this.dingdandh.address}}</p>
                 <p class="text">{{this.dingdandh.zipCode}}</p>
-                <p class="headline">已发货</p>
+                <p class="headline">{{this.dingdandh.deliveryStatus}}</p>
                 <p class="text">您的订单已经发出。</p>
                 <p class="headline">尊享免费配送，您的物流单号：</p>
                 <p class="text">4263882788397</p>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 891ffef2..4f17f1ca 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -1558,6 +1558,7 @@ public class SysUserController {
             //这个是获取订单的数据中的商品数据
         Grzx1 g1 = new Grzx1();
         g1 = sysUserService.getallg2(id);
+
         return Result.ok(g1);
     }
 
@@ -1569,6 +1570,18 @@ public class SysUserController {
         //这个是用于获取一个订单的全部信息
         Grzx1 g1 = new Grzx1();
         g1 = sysUserService.getallg2(id);
+        if (g1.getDeliveryStatus().equals("0")){
+            g1.setDeliveryStatus("未支付");
+        }
+        if (g1.getDeliveryStatus().equals("1")){
+            g1.setDeliveryStatus("已支付");
+        }
+        if (g1.getDeliveryStatus().equals("2")){
+            g1.setDeliveryStatus("申请退款");
+        }
+        if (g1.getDeliveryStatus().equals("3")){
+            g1.setDeliveryStatus("确认退款");
+        }
         System.out.println(g1);
         return Result.OK(g1);
     }