修改app端货单列表

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsStopEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderGoodsStopEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Status {
+
+        NO(0, "未暂停"),
+
+        YES(1, "已暂停")
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<Status> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -3,6 +3,8 @@ package com.clx.performance.sqlProvider;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
+import com.clx.performance.enums.OrderGoodsStopEnum;
+import com.clx.performance.enums.PendingOrderWayStatusEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import org.apache.commons.lang3.StringUtils;
@@ -91,10 +93,10 @@ public class OrderGoodsSqlProvider {
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
                     "a.user_no,a.user_name");
             FROM("order_goods a");
-
-            WHERE("a.pending_order_way = 1");
+            WHERE("a.stop_flag = "+ OrderGoodsStopEnum.Status.NO.getCode());
+            WHERE("a.pending_order_way = " + PendingOrderWayStatusEnum.Status.GK.getCode());
             WHERE("a.last_arrive_send_time >= now()");
-            WHERE("(a.order_goods_status = 20 or a.order_goods_status = 30)");
+            WHERE("(a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+" or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")");
             WHERE("a.residue_transport_weight >0");
             ORDER_BY("a.pending_order_time desc");
         }}.toString();
@@ -117,9 +119,11 @@ public class OrderGoodsSqlProvider {
                 "date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
                 " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
                 "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name," +
-                "a.pending_order_freight,a.user_no,a.user_name from order_goods a where a.last_arrive_send_time >= now() and (a.order_goods_status = 20 or a.order_goods_status = 30)" +
+                "a.pending_order_freight,a.user_no,a.user_name from order_goods a " +
+                "where a.stop_flag = "+ OrderGoodsStopEnum.Status.NO.getCode()+" and a.last_arrive_send_time >= now() and (a.order_goods_status = "+OrderGoodsStatusEnum.Status.PAYING.getCode()+
+                " or a.order_goods_status = "+OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode()+")" +
                 "and a.residue_transport_weight > 0" +
-                " and a.pending_order_way = 2 and a.order_goods_no in (");
+                " and a.pending_order_way = "+ PendingOrderWayStatusEnum.Status.DX.getCode() +" and a.order_goods_no in (");
 
         if (!param.isEmpty()) {
             for (int i = 0; i < param.size(); i++) {