BUG修改 订单描述运营商修改 订单号码查询清除空格

common/fire-dto/src/main/java/com/fire/es/OrderEsDto.java

@@ -273,9 +273,9 @@ public class OrderEsDto {
     private Integer callbackStatus;
 
     /**
-     * 运营商：1、移动 2、电信 3、联通
+     * 运营商：1、移动 2、联通 3、电信
      */
-    @ApiModelProperty("运营商：1、移动 2、电信 3、联通")
+    @ApiModelProperty("运营商：1、移动 2、联通 3、电信")
     @Field(type = FieldType.Integer)
     private Integer phoneOperator;
 

modules/admin/src/main/java/com/fire/admin/rest/OrderRest.java

@@ -23,6 +23,7 @@ import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
@@ -102,6 +103,12 @@ public class OrderRest {
         }
     }
 
+    @PostMapping("/setOrderStatus")
+    @ApiOperation(value = "设置订单状态")
+    public BaseRestResponse<String> setOrderStatus(List<String> orderIds, int status){
+        return new BaseRestResponse<>(orderManagementService.setOrderStatus(orderIds,status));
+    }
+
 
 
 }

modules/admin/src/main/java/com/fire/admin/service/OrderManagementService.java

@@ -1,5 +1,6 @@
 package com.fire.admin.service;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.fire.admin.request.DispatchSearchPram;
@@ -99,7 +100,7 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
             String usedMobiles = orderSearchPram.getPhoneNo();
             if (usedMobiles.contains(",")) {
-                String[] usedMobileList = usedMobiles.split(",");
+                List<String> usedMobileList = StrUtil.split(usedMobiles, ',', true, true);
                 BoolQueryBuilder temp = QueryBuilders.boolQuery();
                 for (String usedMobile : usedMobileList) {
                     temp.should(QueryBuilders.termQuery("phoneNo", usedMobile));
@@ -230,7 +231,7 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
             String usedMobiles = orderSearchPram.getPhoneNo();
             if (usedMobiles.contains(",")) {
-                String[] usedMobileList = usedMobiles.split(",");
+                List<String> usedMobileList = StrUtil.split(usedMobiles, ',', true, true);
                 BoolQueryBuilder temp = QueryBuilders.boolQuery();
                 for (String usedMobile : usedMobileList) {
                     temp.should(QueryBuilders.termQuery("phoneNo", usedMobile));
@@ -280,9 +281,9 @@ public class OrderManagementService {
 
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withPageable(pageable)
-                .withTrackTotalHits(true)
                 .withQuery(boolQuery)
                 .addAggregation(sumBuilder)
+                .withTrackTotalHits(true)
                 .build();
         query.addAggregation(sumBuilder2);
         query.addAggregation(sumBuilder3);
@@ -359,7 +360,7 @@ public class OrderManagementService {
         if (Strings.isNotBlank(dispatchSearchPram.getPhoneNo())) {
             String usedMobiles = dispatchSearchPram.getPhoneNo();
             if (usedMobiles.contains(",")) {
-                String[] usedMobileList = usedMobiles.split(",");
+                List<String> usedMobileList = StrUtil.split(usedMobiles, ',', true, true);
                 BoolQueryBuilder temp = QueryBuilders.boolQuery();
                 for (String usedMobile : usedMobileList) {
                     temp.should(QueryBuilders.termQuery("phoneNo", usedMobile));
@@ -420,6 +421,9 @@ public class OrderManagementService {
         return pageMap;
     }
 
+    /**
+     * 订单记录导出
+     */
     public ArrayList<OrderEsDto> getOrderList(OrderSearchPram orderSearchPram) {
         HashMap<String, Object> pageMap = new HashMap<>();
         ArrayList<OrderEsDto> resultsList = new ArrayList<>();
@@ -470,7 +474,7 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
             String usedMobiles = orderSearchPram.getPhoneNo();
             if (usedMobiles.contains(",")) {
-                String[] usedMobileList = usedMobiles.split(",");
+                List<String> usedMobileList = StrUtil.split(usedMobiles, ',', true, true);
                 BoolQueryBuilder temp = QueryBuilders.boolQuery();
                 for (String usedMobile : usedMobileList) {
                     temp.should(QueryBuilders.termQuery("phoneNo", usedMobile));
@@ -539,7 +543,9 @@ public class OrderManagementService {
     }
 
 
-
+    /**
+     * 分发记录导出
+     */
     public ArrayList<DispatchDto> getDispatchList(DispatchSearchPram dispatchSearchPram) {
 
         ArrayList<DispatchDto> resultsList = new ArrayList<>();
@@ -572,7 +578,7 @@ public class OrderManagementService {
         if (Strings.isNotBlank(dispatchSearchPram.getPhoneNo())) {
             String usedMobiles = dispatchSearchPram.getPhoneNo();
             if (usedMobiles.contains(",")) {
-                String[] usedMobileList = usedMobiles.split(",");
+                List<String> usedMobileList = StrUtil.split(usedMobiles, ',', true, true);
                 BoolQueryBuilder temp = QueryBuilders.boolQuery();
                 for (String usedMobile : usedMobileList) {
                     temp.should(QueryBuilders.termQuery("phoneNo", usedMobile));
@@ -628,6 +634,20 @@ public class OrderManagementService {
         return resultsList;
 
     }
+
+
+    /**
+     * 更改订单记状态
+     */
+    public String setOrderStatus(List<String> orderIds, int status) {
+        //查询redis
+        //status != 7
+        //判断允许2次回调
+
+
+
+        return "sucees";
+    }
 }
 
 

modules/save-data/src/main/java/com/fire/savedata/consumer/OrderEsConsumer.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fire.common.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.ConsumeMode;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
@@ -19,14 +20,16 @@ import com.fire.es.OrderEsDto;
 @Slf4j
 @Service
 @RocketMQMessageListener(consumerGroup = "OrderEs",topic = RocketTopic.ORDER_TOPIC,consumeMode = ConsumeMode.ORDERLY)
-public class OrderEsConsumer implements RocketMQListener<String> {
+public class OrderEsConsumer implements RocketMQListener<MessageExt> {
 
     @Autowired
     private ElasticsearchRestTemplate restTemplate;
 
     @Override
-    public void onMessage(String s) {
-        System.out.println("Orderly message: " + s);
+    public void onMessage(MessageExt msg) {
+        String s = new String(msg.getBody());
+        log.info("Orderly message: " + s);
+        log.info("reconsumeTimes: " + msg.getReconsumeTimes());
         ObjectMapper om = new ObjectMapper();
         try {
             OrderEsDto orderEsDto =  om.readValue(s, OrderEsDto.class);

modules/save-data/src/main/java/com/fire/savedata/consumer/OrderTidbConsumer.java

@@ -29,7 +29,8 @@ public class OrderTidbConsumer implements RocketMQListener<MessageExt> {
     @Override
     public void onMessage(MessageExt msg) {
         String s = new String(msg.getBody());
-        System.out.println("Orderly message: " + s);
+        log.info("Orderly message: " + s);
+        log.info("reconsumeTimes: " + msg.getReconsumeTimes());
         String tag = msg.getTags();
         ObjectMapper om = new ObjectMapper();
         try {