订单收付信息页面增加结算筛选项

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -108,6 +108,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String applyReturnedPurchaseFlag;//0不可以申请，1可以申请（此标记只用于是否存在审核中或者审核不通过记录，存在记录则不可以申请）
     private String spName;
     private Integer serviceProviderId;  //协销Id
+    private Integer settleStatus;    //结算状态   1未结算2部分结算3已结算
 
     private String productName;     //商品名称（根据商品名称筛选订单）
     private List<NewOrderProduct> orderProduct;// 订单内的商品集合
@@ -179,6 +180,14 @@ public class NewOrder extends DataEntity<NewOrder> {
         this.promotions = promotions;
     }
 
+    public Integer getSettleStatus() {
+        return settleStatus;
+    }
+
+    public void setSettleStatus(Integer settleStatus) {
+        this.settleStatus = settleStatus;
+    }
+
     public Double getPromotionFullReduction() {
         return promotionFullReduction;
     }

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -523,6 +523,10 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
                 order.setClubName(name);
             }
         }
+        // 1未结算2部分结算3已结算
+        if(null!=newOrder.getSettleStatus()&&1==newOrder.getSettleStatus()){
+//            orderList.stream().filter(o->o.getNewShopOrders().stream().map(NewShopOrder::getSettleStatus).collect(Collectors.toList()).contains(2,3))
+        }
         return page;
     }
 

src/main/webapp/WEB-INF/views/modules/order/checkPaymentOrder.jsp

@@ -391,6 +391,13 @@
                     <form:option value="${organize.id}" label="${organize.organizeName}"/>
                 </c:forEach>
             </form:select>
+            <label>结算状态:</label>
+            <form:select path="settleStatus" class="select-ele input-medium required">
+                <form:option value="" label="请选择"/>
+                <form:option value="1" label="未结算"/>
+                <form:option value="2" label="部分结算"/>
+                <form:option value="3" label="已结算"/>
+            </form:select>
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>
         <div class="clearfix"></div>