|
|
@@ -16,6 +16,7 @@ import com.ejlchina.searcher.SearchResult;
|
|
|
import com.ejlchina.searcher.param.Operator;
|
|
|
import com.ejlchina.searcher.util.MapBuilder;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
|
+import com.google.common.collect.Lists;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -57,10 +58,13 @@ public class UserInvoiceFrontController {
|
|
|
dateCondition = String.format(" and o.created_time >= '%s'", DateUtil.offsetMonth(DateUtil.beginOfYear(now), -12));
|
|
|
}
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
+ //过滤appid 品如
|
|
|
+ List<String> appIds = Lists.newArrayList("2021003159660212");
|
|
|
//1月底后 过滤木棉订单
|
|
|
if (now.isAfter(DateUtil.parse("2025-02-01"))) {
|
|
|
- builder.field(UserInvoiceChoseOrderViews::getShopId, "2021003171697073").op(Operator.NotEqual);
|
|
|
+ appIds.add("2021003171697073");
|
|
|
}
|
|
|
+ builder.field(UserInvoiceChoseOrderViews::getShopId, appIds).op(Operator.NotIn);
|
|
|
SearchResult<UserInvoiceChoseOrderViews> search = beanSearcher.search(UserInvoiceChoseOrderViews.class, builder
|
|
|
.put("dc", dateCondition)
|
|
|
.field(UserInvoiceChoseOrderViews::getUserId, userIdList).op(Operator.InList)
|
zoujiajian