yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/OrderInfoResponse.java

@@ -60,10 +60,4 @@ public class OrderInfoResponse implements Serializable {
 
     @Schema(description = "规格属性值")
     private String sku;
-
-    @Schema(description = "购买东西的详细信息")
-    private String info;
-    private String productName;
-
-
 }

yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java

@@ -72,7 +72,7 @@ public class StoreOrderDetailInfoResponse implements Serializable {
     private BigDecimal deductionPrice;
 
     @Schema(description = "优惠券id")
-    private Long couponId;
+    private Integer couponId;
 
     @Schema(description = "优惠券金额")
     private BigDecimal couponPrice;

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java

@@ -63,7 +63,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -141,7 +140,6 @@ public class OrderServiceImpl implements OrderService {
 
     @Autowired
     private StoreProductAttrValueService storeProductAttrValueService;
-
     /**
      * 订单列表
      *
@@ -158,22 +156,7 @@ public class OrderServiceImpl implements OrderService {
         }
         lambdaQueryWrapper.orderByDesc(StoreOrder::getId);
         List<StoreOrder> storeOrders = dao.selectList(lambdaQueryWrapper);
-        PageInfo<OrderDetailResponse> orderDetailResponsePageInfo = new PageInfo<>(StoreOrderConvert.INSTANCE.convert(storeOrders));
-        if (!CollectionUtils.isEmpty(orderDetailResponsePageInfo.getList())) {
-            orderDetailResponsePageInfo.getList().forEach(e -> {
-                List<StoreOrderInfo> list = storeOrderInfoService.list(Wrappers.<StoreOrderInfo>lambdaQuery().eq(StoreOrderInfo::getOrderId, e.getId()));
-                if (!CollectionUtils.isEmpty(list)) {
-                    List<OrderInfoResponse> orderInfoList = new ArrayList<>();
-                    list.forEach(x -> {
-                        OrderInfoResponse response = new OrderInfoResponse();
-                        BeanUtils.copyProperties(x, response);
-                        orderInfoList.add(response);
-                    });
-                    e.setOrderInfoList(orderInfoList);
-                }
-            });
-        }
-        return orderDetailResponsePageInfo;
+        return new PageInfo<>(StoreOrderConvert.INSTANCE.convert(storeOrders));
     }
 
     /**
@@ -184,24 +167,11 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public StoreOrderDetailInfoResponse detailOrder(String orderId) {
         StoreOrder storeOrder = storeOrderService.getByOderId(orderId);
-        List<StoreOrderInfo> list = storeOrderInfoService.list(Wrappers.<StoreOrderInfo>lambdaQuery().eq(StoreOrderInfo::getOrderId, storeOrder.getId()));
-        StoreOrderDetailInfoResponse convert = StoreOrderOneConvert.INSTANCE.convert(storeOrder);
-        if (!CollectionUtils.isEmpty(list)) {
-            List<OrderInfoResponse> orderInfoList = new ArrayList<>();
-            list.forEach(e -> {
-                OrderInfoResponse response = new OrderInfoResponse();
-                BeanUtils.copyProperties(e, response);
-                orderInfoList.add(response);
-            });
-            convert.setOrderInfoList(orderInfoList);
-        }
-
-        return convert;
+        return StoreOrderOneConvert.INSTANCE.convert(storeOrder);
     }
 
     /**
      * 获取订单总数
-     *
      * @param dateLimit 时间端
      * @param status String 状态
      * @return Integer
@@ -222,7 +192,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 获取订单金额
-     *
      * @param dateLimit 时间端
      * @param type  支付类型
      * @return BigDecimal
@@ -248,7 +217,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 根据订单状态获取where条件
-     *
      * @param queryWrapper QueryWrapper<StoreOrder> 表达式
      * @param status String 类型
      */
@@ -362,7 +330,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 查询单条订单
-     *
      *@param orderNo 订单编号
      * @return 退款理由集合
      */
@@ -375,7 +342,6 @@ public class OrderServiceImpl implements OrderService {
         }
         return storeOrder;
     }
-
     /**
      * 订单删除
      *
@@ -813,7 +779,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 校验预下单商品信息
-     *
      * @param request 预下单请求参数
      * @return OrderInfoVo
      */
@@ -901,7 +866,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 再次下单预下单校验
-     *
      * @param detailRequest 请求参数
      * @return List<OrderInfoDetailVo>
      */
@@ -971,7 +935,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 购物车预下单校验
-     *
      * @param request 请求参数
      * @param user 用户
      * @return List<OrderInfoDetailVo>
@@ -1028,7 +991,6 @@ public class OrderServiceImpl implements OrderService {
         });
         return detailVoList;
     }
-
     /**
      * 加载预下单信息
      *
@@ -1069,7 +1031,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 计算订单价格
-     *
      * @param request 计算订单价格请求对象
      * @return ComputedOrderPriceResponse
      */
@@ -1385,7 +1346,6 @@ public class OrderServiceImpl implements OrderService {
 
     /**
      * 校验商品库存（生成订单）
-     *
      * @param orderInfoVo 订单详情Vo
      * @return List<MyRecord>
      * skuRecord 扣减库存对象
@@ -1432,7 +1392,6 @@ public class OrderServiceImpl implements OrderService {
         }
         return recordList;
     }
-
     /**
      * 获取支付配置
      *