Ver código fonte

fix:“优化订单查询接口,减少数据库压力"

soobin 11 meses atrás
pai
commit
905cc2e587

+ 5 - 10
src/main/java/com/szwl/controller/TOrderController.java

@@ -205,10 +205,10 @@ public class TOrderController {
                 query.eq(TOrder::getProductNo, productNo);
             }
             if (StringUtils.isNotEmpty(sn)) {
-                query.like(TOrder::getSn, sn);
+                query.eq(TOrder::getSn, sn);
             }
             if (StringUtils.isNotEmpty(trxNo)) {
-                query.like(TOrder::getTrxNo, trxNo);
+                query.eq(TOrder::getTrxNo, trxNo);
             }
             if (StringUtils.isNotEmpty(status)) {
                 query.eq(TOrder::getStatus, status);
@@ -855,7 +855,6 @@ public class TOrderController {
         param.setIfForeign(isForeignUser(adminId));
         log.info("param:{}", param);
         FgObjectUtil.objectNullOrEmptySel(param, "chartType$");
-//        String adminId = param.getAdminId();
         ChartColumn chartColumn = new ChartColumn();
         if (StringUtils.isNotEmpty(adminId)) {
             TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(adminId)));
@@ -899,10 +898,6 @@ public class TOrderController {
                     } else {
                         TAdminEquipment adminEquipment = R.getDataIfSuccess(szwlFeign.getClientIdList(String.valueOf(admin.getId())));
                         if (!adminEquipment.getType().equals("0")) {
-//                        TAdmin admin1 = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(admin.getParentId())));
-//                        param.setAdminId(admin1.getId().toString());
-//                            param.setAdminId(admin.getParentId().toString());
-//                        } else {
                             List<String> list = R.getDataIfSuccess(szwlFeign.getClientIds(adminId));
                             param.setClientIds(list);
                             if (StringUtils.isNotEmpty(adminEquipment.getEquipmentIds())) {
@@ -1034,10 +1029,10 @@ public class TOrderController {
 
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         if (StringUtils.isNotEmpty(sn)) {
-            query.like(TOrder::getSn, sn);
+            query.eq(TOrder::getSn, sn);
         }
         if (StringUtils.isNotEmpty(productName)) {
-            query.like(TOrder::getProductName, productName);
+            query.eq(TOrder::getProductName, productName);
         }
         if (StringUtils.isNotEmpty(status)) {
             if (status.equals("unpay")) {
@@ -1061,7 +1056,7 @@ public class TOrderController {
             }
 
         }
-        query.like(TOrder::getClientId, clientId);
+        query.eq(TOrder::getClientId, clientId);
 
         int size = 20;
         int current = pageNumber;

+ 0 - 6
src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.model.bean.ChartBean;
 import com.szwl.model.bean.ChartColumn;
 import com.szwl.model.bo.ChartType;
-import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TOrder;
 import com.szwl.model.query.StatisticsParam;
 import com.szwl.model.query.TCoinOrderParam;
@@ -25,7 +24,6 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
@@ -38,8 +36,6 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.ParseException;
@@ -48,8 +44,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service