BUG修改 订单置状态

modules/admin/src/main/java/com/fire/admin/request/OrderSetPram.java

@@ -0,0 +1,22 @@
+package com.fire.admin.request;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@ApiModel(value = "订单状态设置请求头")
+@Data
+public class OrderSetPram {
+
+    @ApiModelProperty(value = "订单号列表")
+    private List<String> orderIds;
+
+    @ApiModelProperty(value = "状态码")
+    private int status;
+
+
+}

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

@@ -5,6 +5,7 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.fire.admin.request.DispatchSearchPram;
 import com.fire.admin.request.OrderSearchPram;
+import com.fire.admin.request.OrderSetPram;
 import com.fire.admin.service.OrderManagementService;
 import com.fire.dto.response.BaseRestResponse;
 import com.fire.es.DispatchDto;
@@ -105,8 +106,8 @@ public class OrderRest {
 
     @PostMapping("/setOrderStatus")
     @ApiOperation(value = "设置订单状态")
-    public BaseRestResponse<String> setOrderStatus(List<String> orderIds, int status){
-        return new BaseRestResponse<>(orderManagementService.setOrderStatus(orderIds,status));
+    public BaseRestResponse<String> setOrderStatus(@RequestBody OrderSetPram orderSetPram){
+        return new BaseRestResponse<>(orderManagementService.setOrderStatus(orderSetPram));
     }
 
 

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

@@ -5,6 +5,7 @@ import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
 import com.fire.admin.request.DispatchSearchPram;
 import com.fire.admin.request.OrderSearchPram;
+import com.fire.admin.request.OrderSetPram;
 import com.fire.es.DispatchDto;
 import com.fire.es.OrderEsDto;
 import lombok.extern.slf4j.Slf4j;
@@ -639,13 +640,11 @@ public class OrderManagementService {
     /**
      * 更改订单记状态
      */
-    public String setOrderStatus(List<String> orderIds, int status) {
+    public String setOrderStatus(OrderSetPram orderSetPram) {
         //查询redis
         //status != 7
         //判断允许2次回调
 
-
-
         return "sucees";
     }
 }

modules/admin/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8083
+  port: 8081
 spring:
   profiles:
     active: dev

modules/distribution/src/main/resources/bootstrap.yml

@@ -28,11 +28,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.2.114:8848
+        server-addr: 139.155.226.217:8848
         file-extension: yaml
         namespace: fire
         prefix: distribution
       discovery:
-        server-addr: 192.168.2.114:8848
+        server-addr: 139.155.226.217:8848
         namespace: fire
         service: distribution

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

@@ -0,0 +1,47 @@
+package com.fire.savedata.consumer;
+
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fire.common.constants.RocketTopic;
+import com.fire.es.DispatchDto;
+import com.fire.es.OrderEsDto;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RocketMQMessageListener(consumerGroup = "DispatchEs",topic = RocketTopic.CHILD_ORDER_TOPIC,consumeMode = ConsumeMode.ORDERLY)
+public class DispatchEsConsumer implements RocketMQListener<MessageExt> {
+
+    @Autowired
+    private ElasticsearchRestTemplate restTemplate;
+
+    @Override
+    public void onMessage(MessageExt msg) {
+        String s = new String(msg.getBody());
+        log.info("dispathES message: " + s);
+        ObjectMapper om = new ObjectMapper();
+        try {
+            DispatchDto dispatchDto =  om.readValue(s, DispatchDto.class);
+            IndexQuery indexQuery = new IndexQuery();
+            indexQuery.setId(dispatchDto.getRecId());
+            indexQuery.setObject(dispatchDto);
+            IndexCoordinates indexCoordinates = IndexCoordinates.of("mobile_flow_dispatch_rec");
+            restTemplate.index(indexQuery, indexCoordinates);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+            log.error(e.toString());
+            //throw new BaseException("ES消费出错");
+        }
+    }
+
+}

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

@@ -28,8 +28,8 @@ public class OrderEsConsumer implements RocketMQListener<MessageExt> {
     @Override
     public void onMessage(MessageExt msg) {
         String s = new String(msg.getBody());
-        log.info("Orderly message: " + s);
-        log.info("reconsumeTimes: " + msg.getReconsumeTimes());
+        log.info("OrderlyEs 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,8 +29,8 @@ public class OrderTidbConsumer implements RocketMQListener<MessageExt> {
     @Override
     public void onMessage(MessageExt msg) {
         String s = new String(msg.getBody());
-        log.info("Orderly message: " + s);
-        log.info("reconsumeTimes: " + msg.getReconsumeTimes());
+        log.info("OrderlyTidb message: " + s);
+        //log.info("reconsumeTimes: " + msg.getReconsumeTimes());
         String tag = msg.getTags();
         ObjectMapper om = new ObjectMapper();
         try {

modules/save-data/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8084
+  port: 8085
 spring:
   application:
     name: save-data