timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 57 Wiki Activity

Merge pull request 'v1.0.52' (#64) from dev into master

Browse Source 
Reviewed-on: #64
This commit was merged in pull request #64.
This commit is contained in:
timi
2026-09-20 17:22:39 +00:00
parent 6b85cddede e5bfb59a1c
commit 135996ce19
3 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<groupId>com.imyeyu.timiserverapi</groupId>
<artifactId>TimiServerAPI</artifactId>
<version>1.0.51</version>
<version>1.0.52</version>
<packaging>jar</packaging>
<name>TimiServerAPI</name>
<description>imyeyu.com API</description>
src/main/java/com/imyeyu/api/modules/gao/vo/GaoSalesOrderPage.java
+14
View File
@@ -5,6 +5,8 @@ import com.imyeyu.java.bean.BasePage;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/// GAO 销售订单分页请求
///
/// @author Codex
@@ -25,15 +27,27 @@ public class GaoSalesOrderPage extends BasePage {
/// 订单类型
private GaoSalesOrder.OrderType orderType;
/// 订单类型列表
private List<GaoSalesOrder.OrderType> orderTypeList;
/// 订单状态
private GaoSalesOrder.Status status;
/// 订单状态列表
private List<GaoSalesOrder.Status> statusList;
/// 付款状态
private GaoSalesOrder.PaymentStatus paymentStatus;
/// 付款状态列表
private List<GaoSalesOrder.PaymentStatus> paymentStatusList;
/// 退款状态
private GaoSalesOrder.RefundStatus refundStatus;
/// 退款状态列表
private List<GaoSalesOrder.RefundStatus> refundStatusList;
/// true 为筛选可收款且未付清订单
private Boolean pendingReceive;
src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml
+36 -4
View File
@@ -31,10 +31,42 @@
AND cp.`deleted_at` IS NULL
)
</if>
<if test="orderType != null">AND o.`order_type` = #{orderType}</if>
<if test="status != null">AND o.`status` = #{status}</if>
<if test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</if>
<if test="refundStatus != null">AND o.`refund_status` = #{refundStatus}</if>
<choose>
<when test="orderTypeList != null and 0 &lt; orderTypeList.size()">
AND o.`order_type` IN
<foreach collection="orderTypeList" item="orderTypeItem" open="(" separator="," close=")">
#{orderTypeItem}
</foreach>
</when>
<when test="orderType != null">AND o.`order_type` = #{orderType}</when>
</choose>
<choose>
<when test="statusList != null and 0 &lt; statusList.size()">
AND o.`status` IN
<foreach collection="statusList" item="statusItem" open="(" separator="," close=")">
#{statusItem}
</foreach>
</when>
<when test="status != null">AND o.`status` = #{status}</when>
</choose>
<choose>
<when test="paymentStatusList != null and 0 &lt; paymentStatusList.size()">
AND o.`payment_status` IN
<foreach collection="paymentStatusList" item="paymentStatusItem" open="(" separator="," close=")">
#{paymentStatusItem}
</foreach>
</when>
<when test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</when>
</choose>
<choose>
<when test="refundStatusList != null and 0 &lt; refundStatusList.size()">
AND o.`refund_status` IN
<foreach collection="refundStatusList" item="refundStatusItem" open="(" separator="," close=")">
#{refundStatusItem}
</foreach>
</when>
<when test="refundStatus != null">AND o.`refund_status` = #{refundStatus}</when>
</choose>
<if test="pendingReceive != null and pendingReceive">AND o.`status` IN ('ACTIVE', 'FULFILLED') AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')</if>
<if test="fulfilledButUnpaid != null and fulfilledButUnpaid">AND o.`status` = 'FULFILLED' AND o.`paid_amount` &lt; o.`sale_amount`</if>
<if test="keyword != null and keyword.trim() != ''">AND (o.`order_no` LIKE CONCAT('%', #{keyword}, '%') OR c.`name` LIKE CONCAT('%', #{keyword}, '%') OR c.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>