'去除处理4.24版本之前订单功能'

DB/version4.2.3to4.2.4.sql

@@ -1,3 +1,2 @@
 /** 新增已退货数量 **/
-ALTER TABLE li_order_item ADD return_goods_number int DEFAULT 0 COMMENT '退货数量 ';
+ALTER TABLE li_order_item ADD return_goods_number int DEFAULT 0 COMMENT '退货数量 ';
-ALTER TABLE li_order_item ADD identification_status varchar(255) COMMENT '标识是否被4.2.4版本处理过的订单';

framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java

@@ -464,7 +464,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
     }
 
     /**
-     * 根据售后状态修改OrderItem订单中正在售后的商品数量及OrderItem订单状态
+     * 修改OrderItem订单中正在售后的商品数量及OrderItem订单状态
      *
      * @author ftyy
      */
@@ -475,6 +475,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
                 .eq(OrderItem::getOrderSn, afterSale.getOrderSn())
                 .eq(OrderItem::getSkuId, afterSale.getSkuId()));
         AfterSaleStatusEnum afterSaleStatusEnum = AfterSaleStatusEnum.valueOf(afterSale.getServiceStatus());
+
         switch (afterSaleStatusEnum){
             //判断当前售后的状态---申请中
             case APPLY:{
@@ -602,47 +603,6 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(afterSale), RocketmqSendCallbackBuilder.commonCallback());
     }
 
-    /**
-     * 功能描述: 处理4.24之前未标识订单。
-     *
-     * @return void
-     * @Author ftyy
-     **/
-    @PostConstruct
-    private void initializationOrderItemState() {
-        //获取所有未处理过的订单
-        List<OrderItem> orderItemList = orderItemService.list(new LambdaQueryWrapper<OrderItem>()
-                .isNull(OrderItem::getIdentificationStatus).or()
-                .eq(OrderItem::getIdentificationStatus, IdentificationStatusEnum.NOT_HANDLE.name()));
-
-        //不为空时对订单数据进行部分售后逻辑处理
-        if (!orderItemList.isEmpty()) {
-
-            //遍历订单查询每一个订单下的售后记录
-            orderItemList.forEach(orderItem -> {
-
-                //订单状态不能为新订单,已失效订单或未申请订单才可以去修改订单信息
-                if (!orderItem.getAfterSaleStatus().equals(OrderItemAfterSaleStatusEnum.NEW.name())
-                        && !orderItem.getAfterSaleStatus().equals(OrderItemAfterSaleStatusEnum.EXPIRED.name())
-                        && !orderItem.getAfterSaleStatus().equals(OrderItemAfterSaleStatusEnum.NOT_APPLIED.name())) {
-
-                    //查询订单下的售后记录
-                    List<AfterSale> afterSaleList = this.list(new LambdaQueryWrapper<AfterSale>()
-                            .eq(AfterSale::getOrderSn, orderItem.getOrderSn())
-                            .eq(AfterSale::getGoodsId, orderItem.getGoodsId()));
-
-                    //获取售后商品数量及已完成售后商品数量修改orderItem订单
-                    this.updateOrderItemGoodsNumber(orderItem, afterSaleList);
-                }
-
-                //修改orderItem订单
-                this.updateOrderItem(orderItem);
-            });
-
-        }
-
-    }
-
     /**
      * 功能描述: 获取售后商品数量及已完成售后商品数量修改orderItem订单
      *
@@ -711,8 +671,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
         orderItemService.update(new LambdaUpdateWrapper<OrderItem>()
                 .eq(OrderItem::getSn, orderItem.getSn())
                 .set(OrderItem::getAfterSaleStatus, orderItem.getAfterSaleStatus())
-                .set(OrderItem::getReturnGoodsNumber,orderItem.getReturnGoodsNumber())
+                .set(OrderItem::getReturnGoodsNumber,orderItem.getReturnGoodsNumber()));
-                .set(OrderItem::getIdentificationStatus, IdentificationStatusEnum.ALREADY_NOT_HANDLE.name()));
     }
 
 }

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -9,7 +9,6 @@ import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
 import cn.lili.modules.order.order.entity.enums.CommentStatusEnum;
-import cn.lili.modules.order.order.entity.enums.IdentificationStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderComplaintStatusEnum;
 import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
 import cn.lili.modules.promotion.entity.vos.PromotionSkuVO;
@@ -116,8 +115,6 @@ public class OrderItem extends BaseEntity {
     @ApiModelProperty(value = "退货商品数量")
     private Integer returnGoodsNumber;
 
-    @ApiModelProperty(value = "标识是否被4.2.4版本处理过的订单")
-    private String identificationStatus;
 
     public OrderItem(CartSkuVO cartSkuVO, CartVO cartVO, TradeDTO tradeDTO) {
         String oldId = this.getId();
@@ -132,7 +129,6 @@ public class OrderItem extends BaseEntity {
         this.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.NEW.name());
         this.setCommentStatus(CommentStatusEnum.NEW.name());
         this.setComplainStatus(OrderComplaintStatusEnum.NEW.name());
-        this.setIdentificationStatus(IdentificationStatusEnum.ALREADY_NOT_HANDLE.name());
         this.setPriceDetailDTO(cartSkuVO.getPriceDetailDTO());
         this.setOrderSn(cartVO.getSn());
         this.setTradeSn(tradeDTO.getSn());

framework/src/main/java/cn/lili/modules/order/order/entity/enums/IdentificationStatusEnum.java

@@ -1,25 +0,0 @@
-package cn.lili.modules.order.order.entity.enums;
-
-/**
- * 标识是否被4.2.4版本处理过的订单
- * @author: ftyy
- * @Date: 2021-11-19 18:29
- */
-public enum IdentificationStatusEnum {
-    /**
-     * 订单处理状态
-     **/
-
-    NOT_HANDLE("未处理过的订单"),
-    ALREADY_NOT_HANDLE("已处理过的订单");
-
-    private final String description;
-
-    IdentificationStatusEnum(String description) {
-        this.description = description;
-    }
-
-    public String description() {
-        return this.description;
-    }
-}