From 7a8f40b8365f4cfe082c563d1a81b564eaad99b2 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 27 Oct 2023 15:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/book/controller/BuyOrderController.java   |  2 +-
 .../book/service/impl/BuyOrderServiceImpl.java        | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
index 1d554def..8ebfa534 100644
--- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
@@ -260,7 +260,7 @@ public class BuyOrderController {
         totalPrice = totalPrice.add(getShoppingAmount(buyOrder));
         String orderSn = IdWorker.getTimeId().substring(0, 32);
         buyOrder.setOrderSn(orderSn);
-        buyOrder.setPaymentDate(new Date());
+//        buyOrder.setPaymentDate(new Date());//这个是支付时间
         QueryWrapper<UserAddress> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", buyOrder.getAddressId());
         UserAddress userAddress = userAddressService.getOne(queryWrapper);
diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
index 51002111..87b23ac7 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
@@ -162,6 +162,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         BuyOrder orderEntity = this.getOne(new QueryWrapper<BuyOrder>().eq("user_id", userId)
                 .eq("order_sn", orderSn));
         if (type.equals("0")) {
+            orderEntity.setPaymentDate(new Date());
             orderEntity.setOrderStatus("1");
         } else if (type.equals("9")) {
             orderEntity.setOrderStatus("4");
@@ -393,6 +394,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             buyOrderIdList.add(buyOrderProduct.getOrderId());
             int productId = buyOrderProduct.getProductId();
             ShopProduct product = shopProductService.getById(productId);
+            //定义快递商品
             ExpressCommodity commodity = new ExpressCommodity();
             commodity.setGoodsName(product.getProductName());
             commodity.setGoodsquantity(buyOrderProduct.getQuantity());
@@ -478,6 +480,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         QueryWrapper<MyUserEntity> userEntityQueryWrapper = new QueryWrapper<>();
         userEntityQueryWrapper.eq("id", userId);
         MyUserEntity user = myUserService.getOne(userEntityQueryWrapper);
+
         if (user != null) {
             UserResponseVo userResponseVo = new UserResponseVo();
             userResponseVo.setUserId(user.getId());
@@ -500,6 +503,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         responseVo.setDistrictPrice(buyOrder.getDistrictMoney());
         responseVo.setOrderType(buyOrder.getOrderType());
         BeanUtil.copyProperties(buyOrder, responseVo);
+
+        //设置快递地址信息
         ConsigneeVo consigneeVo = new ConsigneeVo();
         consigneeVo.setConsigneeName(buyOrder.getShippingUser());
         consigneeVo.setConsigneeMobile(buyOrder.getUserPhone());
@@ -531,6 +536,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             consigneeVo.setCountyCode(county.getRegionCode());
         }
         responseVo.setConsignee(consigneeVo);
+
+        //设置商品数组
         QueryWrapper<BuyOrderProduct> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("order_id", buyOrder.getOrderId());
         List<BuyOrderProduct> buyOrderProductList = buyOrderProductService.list(queryWrapper);
@@ -558,6 +565,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             goodsResponseVoList.add(goodsResponseVo);
         }
         responseVo.setGoodsList(goodsResponseVoList);
+
+
+
+
         return responseVo;
     }