feat(商城): 添加订单详情

waynboot-common/src/main/java/com/wayn/common/core/domain/vo/order/OrderDetailVO.java

@@ -0,0 +1,179 @@
+package com.wayn.common.core.domain.vo.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 订单表
+ * </p>
+ *
+ * @author wayn
+ * @since 2020-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OrderDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 3129813461714576208L;
+
+    private Long id;
+
+    /**
+     * 用户表的用户ID
+     */
+    private Long userId;
+
+    /**
+     * 订单编号
+     */
+    private String orderSn;
+
+    /**
+     * 订单状态
+     */
+    private Short orderStatus;
+
+    /**
+     * 售后状态，0是可申请，1是用户已申请，2是管理员审核通过，3是管理员退款成功，4是管理员审核拒绝，5是用户已取消
+     */
+    private Short aftersaleStatus;
+
+    /**
+     * 收货人名称
+     */
+    private String consignee;
+
+    /**
+     * 收货人手机号
+     */
+    private String mobile;
+
+    /**
+     * 收货具体地址
+     */
+    private String address;
+
+    /**
+     * 用户订单留言
+     */
+    private String message;
+
+    /**
+     * 商品总费用
+     */
+    private BigDecimal goodsPrice;
+
+    /**
+     * 配送费用
+     */
+    private BigDecimal freightPrice;
+
+    /**
+     * 优惠券减免
+     */
+    private BigDecimal couponPrice;
+
+    /**
+     * 用户积分减免
+     */
+    private BigDecimal integralPrice;
+
+    /**
+     * 团购优惠价减免
+     */
+    private BigDecimal grouponPrice;
+
+    /**
+     * 订单费用， = goods_price + freight_price - coupon_price
+     */
+    private BigDecimal orderPrice;
+
+    /**
+     * 实付费用， = order_price - integral_price
+     */
+    private BigDecimal actualPrice;
+
+    /**
+     * 付款编号
+     */
+    private String payId;
+
+    /**
+     * 支付方式 1微信 2支付宝
+     */
+    private Integer payType;
+
+    /**
+     * 付款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payTime;
+
+    /**
+     * 发货编号
+     */
+    private String shipSn;
+
+    /**
+     * 发货快递公司
+     */
+    private String shipChannel;
+
+    /**
+     * 发货开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime shipTime;
+
+    /**
+     * 实际退款金额，（有可能退款金额小于实际支付金额）
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 退款方式
+     */
+    private String refundType;
+
+    /**
+     * 退款备注
+     */
+    private String refundContent;
+
+    /**
+     * 退款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime refundTime;
+
+    /**
+     * 用户确认收货时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime confirmTime;
+
+    /**
+     * 待评价订单商品数量
+     */
+    private Integer comments;
+
+    /**
+     * 订单关闭时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime orderEndTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    private List<OrderGoodsVO> orderGoodsVOList;
+
+}

waynboot-common/src/main/java/com/wayn/common/core/domain/vo/order/OrderGoodsVO.java

@@ -0,0 +1,69 @@
+package com.wayn.common.core.domain.vo.order;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 订单商品表
+ * </p>
+ *
+ * @author wayn
+ * @since 2020-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OrderGoodsVO implements Serializable {
+
+    private static final long serialVersionUID = -8548938788899621492L;
+    private Long id;
+
+    /**
+     * 订单表的订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 商品表的商品ID
+     */
+    private Long goodsId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    private String goodsSn;
+
+    /**
+     * 商品货品的购买数量
+     */
+    private Integer number;
+
+    /**
+     * 商品货品的售价
+     */
+    private BigDecimal price;
+
+    /**
+     * 商品货品的规格列表
+     */
+    private String[] specifications;
+
+    /**
+     * 商品货品图片或者商品图片
+     */
+    private String picUrl;
+
+    /**
+     * 订单商品评论，如果是-1，则超期不能评价；如果是0，则可以评价；如果其他值，则是comment表里面的评论ID。
+     */
+    private Integer comment;
+
+}

waynboot-mobile-api/pom.xml

@@ -48,6 +48,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.17</version>
+        </dependency>
     </dependencies>
 
     <build>

waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java

@@ -1,11 +1,13 @@
 package com.wayn.mobile.api.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -23,6 +25,8 @@ import com.wayn.common.config.WaynConfig;
 import com.wayn.common.constant.Constants;
 import com.wayn.common.core.domain.shop.*;
 import com.wayn.common.core.domain.vo.OrderVO;
+import com.wayn.common.core.domain.vo.order.OrderDetailVO;
+import com.wayn.common.core.domain.vo.order.OrderGoodsVO;
 import com.wayn.common.core.service.shop.*;
 import com.wayn.common.core.util.OrderHandleOption;
 import com.wayn.common.core.util.OrderUtil;
@@ -163,6 +167,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return success;
     }
 
+    @Override
+    public R getOrderDetailByOrderSn(String orderSn) {
+        R success = R.success();
+        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Order::getOrderSn, orderSn);
+        Order order = getOne(queryWrapper);
+        OrderDetailVO orderDetailVO = new OrderDetailVO();
+        MyBeanUtil.copyProperties(order, orderDetailVO);
+        LambdaQueryWrapper<OrderGoods> queryWrapper1 = Wrappers.lambdaQuery(OrderGoods.class);
+        queryWrapper1.eq(OrderGoods::getOrderId, order.getId());
+        List<OrderGoods> list = iOrderGoodsService.list(queryWrapper1);
+        List<OrderGoodsVO> orderGoodsVOS = BeanUtil.copyToList(list, OrderGoodsVO.class);
+        orderDetailVO.setOrderGoodsVOList(orderGoodsVOS);
+        return success.add("order", orderDetailVO);
+    }
+
     @Override
     public R asyncSubmit(OrderVO orderVO) {
         OrderDTO orderDTO = new OrderDTO();