diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java index 52af87c0f..6ec695a1c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PlatformOrderContentMapper.java @@ -79,4 +79,6 @@ public interface PlatformOrderContentMapper extends BaseMapper findOrderContentsWithStock(@Param("orderIds") List orderIds); List searchShoumanOrderContent(); + + List searchShoumanOrderContentByPlatformOrderId(@Param("platformOrderId") String platformOrderId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml index 338790c58..e65316975 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml @@ -357,7 +357,7 @@ 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 poc.erp_status = 1 + where poc.erp_status in (1,2) and sr.is_active = 1 and po.platform_order_id not in (select platform_order_id from shouman_order); @@ -387,4 +387,39 @@ + +