fix 已支付状态

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -23,6 +23,8 @@ import com.cyksj.service.order.OrderDonService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -35,6 +37,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -273,13 +276,17 @@ public class OrderController {
      * 获取订单列表
      */
     @GetMapping("/get")
-    public Result<SearchResult<OrderDonView>> list(){
-        long userId = StpUserUtil.getLoginIdAsLong();
-        SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(OrderDonView::getUserId,userId)
-                .orderBy(OrderDonView::getId).desc()
-                .build());
-        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+    public Result<SearchResult<OrderDonView>> list(Boolean isPaid){
+	    long userId = StpUserUtil.getLoginIdAsLong();
+	    MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap())
+			    .field(OrderDonView::getUserId, userId);
+	    if (isPaid != null) {
+           builder.field(OrderDonView::getStatus, List.of("hasPayment", "complete")).op(Operator.InList);
+        }
+	    SearchResult<OrderDonView> search = beanSearcher.search(OrderDonView.class, builder
+			    .orderBy(OrderDonView::getId).desc()
+			    .build());
+	    return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }