فهرست منبع

直播订单有些东西未生效

xdd 4 روز پیش
والد
کامیت
dcae057d30

+ 10 - 0
fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -85,6 +85,11 @@ public class LiveOrder extends BaseEntity {
     @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime payTime;
 
+    // 支付开始时间
+    private String payStartTime;
+    // 支付结束时间
+    private String payEndTime;
+
     /** 支付方式 1微信 */
     @Excel(name = "支付方式 1微信")
     private String payType;
@@ -155,6 +160,11 @@ public class LiveOrder extends BaseEntity {
     @Excel(name = "支付渠道(1微信小程序)", width = 30, dateFormat = "yyyy-MM-dd")
     private Date finishTime;
 
+    // 完成时间-开始
+    private String finishTimeStart;
+    // 完成时间-结束
+    private String finishTimeEnd;
+
     /** 发货时间 */
     @Excel(name = "发货时间")
     private String deliveryTime;

+ 2 - 0
fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -114,6 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join company_user cu on a.company_user_id = cu.user_id
         left join company c on a.company_id = c.company_id
         <where>
+            <if test="finishTimeStart != null and finishTimeEnd != null">and finish_time between #{finishTimeStart} and #{finishTimeEnd}</if>
+            <if test="payStartTime != null and payEndTime != null">and pay_time between #{payStartTime} and #{payEndTime}</if>
             <if test="liveId != null "> and live_id = #{liveId}</if>
             <if test="storeId != null "> and store_id = #{storeId}</if>
             <if test="orderCode != null  and orderCode != ''"> and a.order_code = #{orderCode}</if>