From 210441cd89de30628677ef624a122e2d6a327947 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Mon, 14 Oct 2024 15:29:26 +0200 Subject: [PATCH] Add service to fetch shouman orders --- .../business/mapper/PlatformOrderMapper.java | 5 +++ .../mapper/xml/PlatformOrderMapper.xml | 40 +++++++++++++++++++ .../service/IPlatformOrderService.java | 2 + .../impl/PlatformOrderServiceImpl.java | 8 ++++ 4 files changed, 55 insertions(+) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java index ccafcc040..1f1c87339 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderMapper.java @@ -6,6 +6,7 @@ import org.jeecg.modules.business.domain.api.mabang.getorderlist.Order; import org.jeecg.modules.business.entity.PlatformOrder; import org.jeecg.modules.business.entity.PlatformOrderShopSync; import org.jeecg.modules.business.vo.OrderKpi; +import org.jeecg.modules.business.vo.PlatformOrderPage; import org.jeecg.modules.business.vo.ShippingFeeBillableOrders; import org.jeecg.modules.business.vo.clientPlatformOrder.ClientPlatformOrderPage; import org.jeecg.modules.business.vo.clientPlatformOrder.section.OrderQuantity; @@ -219,4 +220,8 @@ public interface PlatformOrderMapper extends BaseMapper { OrderKpi countPlatformOrders(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("showAllData") boolean showAllData, @Param("username") String username); Map fetchShippingPeriodAndType(@Param("invoiceNumber") String invoiceNumber); + + List pagePotentialShoumanOrders(long pageNo, long pageSize, String column, String order); + + Integer countPotentialShoumanOrders(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml index 197af246d..082fcf3cc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMapper.xml @@ -879,4 +879,44 @@ JOIN shipping_invoice s ON po.shipping_invoice_number = s.invoice_number WHERE shipping_invoice_number = #{invoiceNumber}; + + + + SELECT distinct p.* + FROM platform_order_content poc + JOIN platform_order p ON poc.platform_order_id = p.id + JOIN shop sh ON p.shop_id = sh.id + JOIN sku s ON poc.sku_id = s.id + JOIN shouman_sku_relation ssr ON s.id = ssr.sku_id + JOIN shouman_category sc ON ssr.shouman_category_id = sc.id + JOIN shouman_regex sr ON sc.id = sr.shouman_category_id + WHERE p.erp_status in (1, 2) + AND sr.is_active = 1 + AND p.platform_order_id NOT IN (SELECT platform_order_id FROM shouman_order) + AND p.order_time > '2024-10-01' + + + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderService.java index 651a91873..853c52b09 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPlatformOrderService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.business.controller.UserException; import org.jeecg.modules.business.entity.*; +import org.jeecg.modules.business.vo.PlatformOrderPage; import org.jeecg.modules.business.vo.PlatformOrderQuantity; import org.jeecg.modules.business.vo.ShippingFeeBillableOrders; import org.jeecg.modules.business.vo.SkuQuantity; @@ -243,4 +244,5 @@ public interface IPlatformOrderService extends IService { Map fetchShippingPeriodAndType(String invoiceNumber); + void pagePotentialShoumanOrders(IPage page, String column, String order); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java index 90dc3a04e..d1ccd0795 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java @@ -491,4 +491,12 @@ public class PlatformOrderServiceImpl extends ServiceImpl fetchShippingPeriodAndType(String invoiceNumber) { return platformOrderMap.fetchShippingPeriodAndType(invoiceNumber); } + + @Override + public void pagePotentialShoumanOrders(IPage page, String column, String order) { + List potentialShoumanOrders = platformOrderMap.pagePotentialShoumanOrders(page.offset(), page.getSize(), column, order); + page.setRecords(potentialShoumanOrders); + page.setTotal(platformOrderMap.countPotentialShoumanOrders()); + } + }