今年1月底后 过滤木棉订单开发票

netflix-dao/src/main/java/com/cyksj/model/views/UserInvoiceChoseOrderViews.java

@@ -2,6 +2,7 @@ package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -50,4 +51,8 @@ public class UserInvoiceChoseOrderViews {
 
 	@DbField("o.pay_time")
 	private Date payTime;
+
+	@DbField("o.shop_id")
+	@JsonIgnore
+	private Long shopId;
 }

netflix-web/src/main/java/com/cyksj/web/controller/invoice/UserInvoiceFrontController.java

@@ -14,6 +14,7 @@ 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.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -55,7 +56,12 @@ public class UserInvoiceFrontController {
 		} else {
 			dateCondition = String.format(" and o.created_time >= '%s'", DateUtil.offsetMonth(DateUtil.beginOfYear(now), -12));
 		}
-		SearchResult<UserInvoiceChoseOrderViews> search = beanSearcher.search(UserInvoiceChoseOrderViews.class, MapUtils.flatBuilder(request.getParameterMap())
+		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+		//1月底后 过滤木棉订单
+		if (now.isAfter(DateUtil.parse("2025-02-01"))) {
+			builder.field(UserInvoiceChoseOrderViews::getShopId, "2021003171697073").op(Operator.NotEqual);
+		}
+		SearchResult<UserInvoiceChoseOrderViews> search = beanSearcher.search(UserInvoiceChoseOrderViews.class, builder
 				.put("dc", dateCondition)
 				.field(UserInvoiceChoseOrderViews::getUserId, userIdList).op(Operator.InList)
 				.build());