订单同步

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -14,6 +14,7 @@ import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
 import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.SkuSpecPriceDto;
+import com.sd.business.entity.order.enums.OrderStatusEnum;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSku;
@@ -86,8 +87,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         wrapper.eq("o", OrderInfo::getSettlementStatus, dto.getSettlementStatus());
         wrapper.ge("o", OrderInfo::getWlnCreateTime, dto.getBeginTime());
         wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
-        wrapper.isNull(Objects.equals(dto.getLinkedStatementOfAccount(), 0), "o.statement_of_account_id");
-        wrapper.isNotNull(Objects.equals(dto.getLinkedStatementOfAccount(), 1), "o.statement_of_account_id");
+
+        if (Objects.equals(dto.getLinkedStatementOfAccount(), 0)) {
+            wrapper.isNull("o.statement_of_account_id");
+            wrapper.in("o", OrderInfo::getStatus,
+                    OrderStatusEnum.COMPLETION_PRODUCTION.getKey(),
+                    OrderStatusEnum.HAVE_BEEN_SHIPPED.getKey());
+        } else if (Objects.equals(dto.getLinkedStatementOfAccount(), 1)) {
+            wrapper.isNotNull("o.statement_of_account_id");
+            wrapper.in("o", OrderInfo::getStatus,
+                    OrderStatusEnum.COMPLETION_PRODUCTION.getKey(),
+                    OrderStatusEnum.HAVE_BEEN_SHIPPED.getKey());
+        }
 
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }