From 0296a578953fe2ba06ac5e3e9f522de12beb668a Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Thu, 21 Jan 2021 09:32:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../winery/controller/AppOrderController.java | 31 +++++++++++++++++--
 .../com/ruoyi/winery/domain/AppOrder.java     | 21 +++++++++++--
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
index 904ee2aa7..3e9a5a43a 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java
@@ -23,10 +23,12 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.winery.domain.AppOrder;
 import com.ruoyi.winery.domain.AppOrderDetail;
+import com.ruoyi.winery.domain.AppUserAddress;
 import com.ruoyi.winery.domain.goods.GoodsMain;
 import com.ruoyi.winery.domain.winery.WineryOrders;
 import com.ruoyi.winery.service.IAppOrderDetailService;
 import com.ruoyi.winery.service.IAppOrderService;
+import com.ruoyi.winery.service.IAppUserAddressService;
 import com.ruoyi.winery.service.IGoodsMainService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +69,9 @@ public class AppOrderController extends BaseController {
     @Autowired
     private IAppOrderDetailService detailService;
 
+    @Autowired
+    private IAppUserAddressService addressService;
+
     /**
      * 查询订单列表
      */
@@ -81,8 +86,17 @@ public class AppOrderController extends BaseController {
         if (appOrder.getUserId() != null) {
             lqw.eq(AppOrder::getUserId, appOrder.getUserId());
         }
-        if (StringUtils.isNotBlank(appOrder.getAddressId())) {
-            lqw.eq(AppOrder::getAddressId, appOrder.getAddressId());
+        if (StringUtils.isNotBlank(appOrder.getPostName())) {
+            lqw.eq(AppOrder::getPostName, appOrder.getPostName());
+        }
+        if (StringUtils.isNotBlank(appOrder.getPostMoible())) {
+            lqw.eq(AppOrder::getPostName, appOrder.getPostName());
+        }
+        if (StringUtils.isNotBlank(appOrder.getPostRegion())) {
+            lqw.eq(AppOrder::getPostName, appOrder.getPostName());
+        }
+        if (StringUtils.isNotBlank(appOrder.getPostAddress())) {
+            lqw.eq(AppOrder::getPostName, appOrder.getPostName());
         }
         if (StringUtils.isNotBlank(appOrder.getPayMsg())) {
             lqw.eq(AppOrder::getPayMsg, appOrder.getPayMsg());
@@ -158,6 +172,19 @@ public class AppOrderController extends BaseController {
         String username = getUsername();
         Long deptId = getDeptId();
         String id = System.currentTimeMillis() + RandomUtil.randomNumbers(6);
+
+
+        AppUserAddress address = addressService.getById(appOrder.getAddressId());
+
+        if (address == null) {
+            return AjaxResult.error("请校验地址信息");
+        }
+
+        appOrder.setPostMoible(address.getMobile());
+        appOrder.setPostName(address.getName());
+        appOrder.setPostRegion(address.getRegion());
+        appOrder.setPostAddress(address.getAddress());
+
         appOrder.setId(id);
         appOrder.setDeptId(getDeptId());
         appOrder.setUserId(userId);
diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
index 5db7126d7..b08454970 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java
@@ -47,9 +47,21 @@ private static final long serialVersionUID=1L;
     @Excel(name = "用户ID")
     private Long userId;
 
-    /** 收货地址ID */
-    @Excel(name = "收货地址ID")
-    private String addressId;
+    /** 收货人姓名 */
+    @Excel(name = "收货人姓名")
+    private String postName;
+
+    /** 收货人姓名 */
+    @Excel(name = "收货人电话号码")
+    private String postMoible;
+
+    /** 收货人姓名 */
+    @Excel(name = "收货人地区")
+    private String postRegion;
+
+    /** 收货人姓名 */
+    @Excel(name = "收货人地址")
+    private String postAddress;
 
     /** 支付参数 */
     @Excel(name = "支付参数")
@@ -95,4 +107,7 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private List<AppOrderDetail> orderDetailList;
+
+    @TableField(exist = false)
+    private String addressId;
 }