From d4d53200f2c792ad3de930f94e464bfa5375463d Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Fri, 24 Feb 2023 10:34:36 +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          |  4 ++--
 .../modules/system/controller/SysUserController.java   | 10 ++++------
 .../jeecg/modules/system/mapper/xml/SysUserMapper.xml  |  6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

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 dd2e71cc..38256ec8 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
@@ -60,8 +60,8 @@
                 <p class="headline">配送至</p>
                 <p class="text">河南省</p>
                 <p class="text">驻马店市 驿城区</p>
-                <p class="text">黄淮学院南校区学府花园26号楼3602</p>
-                <p class="text">463000</p>
+                <p class="text">{{this.dingdandh.address}}</p>
+                <p class="text">{{this.dingdandh.zipCode}}</p>
                 <p class="headline">已发货</p>
                 <p class="text">您的订单已经发出。</p>
                 <p class="headline">尊享免费配送，您的物流单号：</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 038fd908..891ffef2 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,7 +1558,6 @@ public class SysUserController {
             //这个是获取订单的数据中的商品数据
         Grzx1 g1 = new Grzx1();
         g1 = sysUserService.getallg2(id);
-        System.out.println(g1);
         return Result.ok(g1);
     }
 
@@ -1568,11 +1567,10 @@ public class SysUserController {
     @RequestMapping(value = "/getdingdandh", method = RequestMethod.GET)
     public Result<?> getdingdandh(@RequestParam(name="id",required=true) String id) {
         //这个是用于获取一个订单的全部信息
-        ZyOrder zyo = sysUserService.getallzyo(id);
-        if(zyo==null) {
-            return Result.error("未找到对应数据");
-        }
-        return Result.OK(zyo);
+        Grzx1 g1 = new Grzx1();
+        g1 = sysUserService.getallg2(id);
+        System.out.println(g1);
+        return Result.OK(g1);
     }
 
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 9c825720..ed12945b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -167,7 +167,7 @@
 	<!-- 根据用户名查询 -->
 	<select id="getallgr1" resultType="org.jeecg.modules.system.vo.Grzx1">
 SELECT og.id, zo.orders_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,za.type_name,zg.default_picture,og.pay_total_price,og.unit_price,og.create_time,og.create_by ,
-zo.delivery_status
+zo.delivery_status , zo.city_id ,zo.address,zo.zipCode
 FROM zy_orders AS zo
 INNER JOIN order_goods AS og ON zo.id = og.orders_id
 LEFT JOIN zy_goods AS zg ON og.goods_id = zg.id
@@ -183,8 +183,8 @@ WHERE og.create_by=#{userid}
 
 	<!-- 这个是获取订单的数据中的商品数据 -->
 	<select id="getallg2" resultType="org.jeecg.modules.system.vo.Grzx1">
-SELECT og.id, zo.orders_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,
-za.type_name,zg.default_picture,og.pay_total_price,og.unit_price,og.create_time,og.create_by
+SELECT og.id, zo.orders_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,za.type_name,zg.default_picture,og.pay_total_price,og.unit_price,og.create_time,og.create_by ,
+zo.delivery_status , zo.city_id ,zo.address,zo.zip_code
 FROM zy_orders AS zo
 INNER JOIN order_goods AS og ON zo.id = og.orders_id
 LEFT JOIN zy_goods AS zg ON og.goods_id = zg.id