- 添加 DeletableDO

- 修改 DO extends

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dao/OrderLogisticsMapper.java

@@ -1,6 +1,5 @@
 package cn.iocoder.mall.order.dao;
 
-import cn.iocoder.mall.order.dataobject.OrderDO;
 import cn.iocoder.mall.order.dataobject.OrderLogisticsDO;
 import org.springframework.stereotype.Repository;
 

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderDO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.mall.order.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 import java.util.Date;
 
@@ -10,7 +10,7 @@ import java.util.Date;
  * @author Sin
  * @time 2019-03-16 13:49
  */
-public class OrderDO extends BaseDO {
+public class OrderDO extends DeletableDO {
 
     /**
      * id

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderExchangeDO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.mall.order.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 import java.util.Date;
 
@@ -10,7 +10,7 @@ import java.util.Date;
  * @author Sin
  * @time 2019-03-19 19:48
  */
-public class OrderExchangeDO extends BaseDO {
+public class OrderExchangeDO extends DeletableDO {
 
     /**
      * id

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderItemDO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.mall.order.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 import java.util.Date;
 
@@ -10,7 +10,7 @@ import java.util.Date;
  * @author Sin
  * @time 2019-03-16 14:03
  */
-public class OrderItemDO extends BaseDO {
+public class OrderItemDO extends DeletableDO {
 
     /**
      * 编号

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.mall.order.dataobject;
 
 import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 /**
  * 订单物流信息

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderLogisticsDetailDO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.mall.order.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 import java.util.Date;
 
@@ -12,7 +12,7 @@ import java.util.Date;
  * @author Sin
  * @time 2019-03-19 20:48
  */
-public class OrderLogisticsDetailDO extends BaseDO {
+public class OrderLogisticsDetailDO extends DeletableDO {
 
     /**
      * id

order/order-service-impl/src/main/java/cn/iocoder/mall/order/dataobject/OrderReturnDO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.mall.order.dataobject;
 
-import cn.iocoder.common.framework.dataobject.BaseDO;
+import cn.iocoder.common.framework.dataobject.DeletableDO;
 
 import java.util.Date;
 
@@ -10,7 +10,7 @@ import java.util.Date;
  * @author Sin
  * @time 2019-03-19 19:48
  */
-public class OrderReturnDO extends BaseDO {
+public class OrderReturnDO extends DeletableDO {
 
     /**
      * 编号自动增长

order/order-service-impl/src/main/java/cn/iocoder/mall/order/service/OrderServiceImpl.java

@@ -51,7 +51,10 @@ public class OrderServiceImpl implements OrderService {
         List<OrderItemDO> orderItemDOList = OrderConvert.INSTANCE.convert(orderItemDTOList);
 
         // 物流信息
-        orderLogisticsDO.setLogisticsNo("");
+        orderLogisticsDO
+                .setLogisticsNo("")
+                .setCreateTime(new Date())
+                .setUpdateTime(null);
         orderLogisticsMapper.insert(orderLogisticsDO);
 
         // order
@@ -87,9 +90,9 @@ public class OrderServiceImpl implements OrderService {
                     .setClosingTime(null)
                     .setHasReturnExchange(OrderStatusEnum.WAITING_PAYMENT.getValue())
                     .setStatus(OrderStatusEnum.WAITING_PAYMENT.getValue())
+                    .setDeleted(DeleteStatusEnum.DELETE_NO.getValue())
                     .setCreateTime(new Date())
-                    .setUpdateTime(new Date())
-                    .setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
+                    .setUpdateTime(new Date());
 
             orderItemMapper.insert(orderItemDO);
         });