Compare commits
66
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05e28c2c6d | ||
|
|
c18d0e8a9f | ||
|
|
1b221b13d1 | ||
|
|
135996ce19 | ||
|
|
6b85cddede | ||
|
|
e486f850f2 | ||
|
|
76c2f3a5fd | ||
|
|
bb542e7510 | ||
|
|
eba4461381 | ||
|
|
f5ad238015 | ||
|
|
4bdb24e9ac | ||
|
|
425922fd04 | ||
|
|
d65424e5bf | ||
|
|
2a35793baf | ||
|
|
d22df698b6 | ||
|
|
1771bf9909 | ||
|
|
15d69f9361 | ||
|
|
2b4089ef59 | ||
|
|
20c3e1f422 | ||
|
|
3b19d9e930 | ||
|
|
5fd11e9caf | ||
|
|
0b98dcdfe9 | ||
|
|
b373cbbe46 | ||
|
|
acd97c7b9b | ||
|
|
118bdb1666 | ||
|
|
944de228f7 | ||
|
|
25c9cd4dfc | ||
|
|
882cd226ec | ||
|
|
feb4d7af66 | ||
|
|
d75ab1ed5f | ||
|
|
a501eb7443 | ||
|
|
19941d9480 | ||
|
|
cd3d522d4f | ||
|
|
181c5078e9 | ||
|
|
e97f46e6b4 | ||
|
|
c0f89deb83 | ||
|
|
ce695463d3 | ||
|
|
83c683d473 | ||
|
|
9555474b0b | ||
|
|
a150f9e017 | ||
|
|
ecd2fa1c33 | ||
|
|
e3236d262d | ||
|
|
c8e2e16ba5 | ||
|
|
99b44faf09 | ||
|
|
b3e3cbf84b | ||
|
|
0aee11d824 | ||
|
|
fcf358a768 | ||
|
|
619369104c | ||
|
|
4f1408b9d0 | ||
|
|
029eea70cc | ||
|
|
22b1e65385 | ||
|
|
2170c48763 | ||
|
|
c2d1c48aae | ||
|
|
e14958c643 | ||
|
|
da288338cd | ||
|
|
ea430f2468 | ||
|
|
f76f79744a | ||
|
|
19daaff907 | ||
|
|
db94d8f932 | ||
|
|
53618fe362 | ||
|
|
523edffc4e | ||
|
|
c7ddb1a8b0 | ||
|
|
45c9fc814a | ||
|
|
407dc13ac4 | ||
|
|
0c06bf16c2 | ||
|
|
1db39e77d3 |
@@ -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>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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;
|
||||
|
||||
|
||||
@@ -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` >= #{beginAt}</if>
|
||||
<if test="endAt != null">AND `delivered_at` <= #{endAt}</if>
|
||||
|
||||
Reference in New Issue
Block a user