Merge pull request 'v1.0.55' (#67) from dev into master

Reviewed-on: #67

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.imyeyu.timiserverapi</groupId>
 	<artifactId>TimiServerAPI</artifactId>
-	<version>1.0.56</version>
+	<version>1.0.55</version>
 	<packaging>jar</packaging>
 	<name>TimiServerAPI</name>
 	<description>imyeyu.com API</description>

src/main/java/com/imyeyu/api/modules/gao/vo/GaoOrderFulfillmentPage.java

@@ -5,8 +5,6 @@ import com.imyeyu.java.bean.BasePage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /// GAO 统一履约分页查询请求
 ///
 /// @author Codex
@@ -24,9 +22,6 @@ public class GaoOrderFulfillmentPage extends BasePage {
 	/// 客户 ID
 	private String customerId;
 
-	/// SKU ID 列表，任一 SKU 命中即匹配
-	private List<String> skuIdList;
-
 	/// 履约状态
 	private GaoOrderFulfillment.Status status;
 

src/main/resources/mapper/timi-server/gao/GaoOrderFulfillmentMapper.xml

@@ -39,14 +39,6 @@
 		<if test="storeId != null and storeId != ''">AND `store_id` = #{storeId}</if>
 		<if test="salesOrderId != null and salesOrderId != ''">AND `sales_order_id` = #{salesOrderId}</if>
 		<if test="customerId != null and customerId != ''">AND `customer_id` = #{customerId}</if>
-		<if test="skuIdList != null and skuIdList.size() > 0">
-			AND EXISTS (
-				SELECT 1 FROM `gao_order_fulfillment_item` fulfillment_item
-				WHERE fulfillment_item.`fulfillment_id` = `gao_order_fulfillment`.`id`
-				AND fulfillment_item.`sku_id` IN
-				<foreach collection="skuIdList" item="skuId" open="(" separator="," close=")">#{skuId}</foreach>
-			)
-		</if>
 		<if test="status != null">AND `status` = #{status}</if>
 		<if test="beginAt != null">AND `delivered_at` &gt;= #{beginAt}</if>
 		<if test="endAt != null">AND `delivered_at` &lt;= #{endAt}</if>