Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

performance-web/src/main/java/com/clx/performance/listener/SaveOrderGoodsAdjustmentPriceListener.java

@@ -8,6 +8,7 @@ import com.clx.performance.model.OrderGoodsAdjustmentPrice;
 import com.clx.performance.service.OrderGoodsAdjustmentPriceService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
@@ -25,10 +26,14 @@ public class SaveOrderGoodsAdjustmentPriceListener {
 
     @RabbitListener(queues = RabbitKeyConstants.SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_QUEUE)
     public void onMessage(Message message) {
-        log.info("监听到保存货单挂单运费调整记录,消息内容{}", new String(message.getBody()));
-        OrderGoodsAdjustmentPrice data = JSON.parseObject(new String(message.getBody()),
-                new TypeReference<MqWrapper<OrderGoodsAdjustmentPrice>>() {
-                }).getData();
-        orderGoodsAdjustmentPriceService.saveOrderGoodsAdjustmentPrice(data);
+        try{
+            log.info("监听到保存货单挂单运费调整记录,消息内容{}", new String(message.getBody()));
+            OrderGoodsAdjustmentPrice data = JSON.parseObject(new String(message.getBody()),
+                    new TypeReference<MqWrapper<OrderGoodsAdjustmentPrice>>() {
+                    }).getData();
+            orderGoodsAdjustmentPriceService.saveOrderGoodsAdjustmentPrice(data);
+        }catch (Exception e){
+            log.info("监听到保存货单挂单运费调整记录，异常原因：{}", ExceptionUtils.getStackTrace(e));
+        }
     }
 }

performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderChildListener.java

@@ -8,6 +8,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.PerformanceProgressService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
@@ -25,11 +26,14 @@ public class SyncPerformanceProgress4OrderChildListener {
 
     @RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_QUEUE)
     public void onMessage(Message message) {
-        log.info("监听到同步履约进度表---运单信息部分,消息内容{}", new String(message.getBody()));
-        OrderChild data = JSON.parseObject(new String(message.getBody()),
-                new TypeReference<MqWrapper<OrderChild>>() {
-                }).getData();
-        log.info("OrderChild ======={}",JSON.toJSONString(data));
-        performanceProgressService.dealPerformanceProgress4OrderChild(data);
+        try{
+            log.info("监听到同步履约进度表---运单信息部分,消息内容{}", new String(message.getBody()));
+            OrderChild data = JSON.parseObject(new String(message.getBody()),
+                    new TypeReference<MqWrapper<OrderChild>>() {
+                    }).getData();
+            performanceProgressService.dealPerformanceProgress4OrderChild(data);
+        }catch (Exception e){
+            log.info("监听到同步履约进度表---运单信息部分发生异常，异常原因：{}", ExceptionUtils.getStackTrace(e));
+        }
     }
 }

performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderGoodsListener.java

@@ -8,6 +8,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.PerformanceProgressService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
@@ -25,10 +26,14 @@ public class SyncPerformanceProgress4OrderGoodsListener {
 
     @RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_QUEUE)
     public void onMessage(Message message) {
-        log.info("监听到同步履约进度表---货单信息部分,消息内容{}", new String(message.getBody()));
-        OrderGoods data = JSON.parseObject(new String(message.getBody()),
-                new TypeReference<MqWrapper<OrderGoods>>() {
-                }).getData();
-        performanceProgressService.dealPerformanceProgress4OrderGoods(data);
+        try{
+            log.info("监听到同步履约进度表---货单信息部分,消息内容{}", new String(message.getBody()));
+            OrderGoods data = JSON.parseObject(new String(message.getBody()),
+                    new TypeReference<MqWrapper<OrderGoods>>() {
+                    }).getData();
+            performanceProgressService.dealPerformanceProgress4OrderGoods(data);
+        }catch (Exception e){
+            log.info("监听到同步履约进度表---货单信息部分发生异常，异常原因：{}", ExceptionUtils.getStackTrace(e));
+        }
     }
 }

performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderInfoListener.java

@@ -8,6 +8,7 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.service.PerformanceProgressService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
@@ -25,10 +26,14 @@ public class SyncPerformanceProgress4OrderInfoListener {
 
     @RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_INFO_QUEUE)
     public void onMessage(Message message) {
-        log.info("监听到同步履约进度表---订单信息部分,消息内容{}", new String(message.getBody()));
-        OrderInfoMessage data = JSON.parseObject(new String(message.getBody()),
-                new TypeReference<MqWrapper<OrderInfoMessage>>() {
-                }).getData();
-        performanceProgressService.dealPerformanceProgress4OrderInfo(data);
+        try{
+            log.info("监听到同步履约进度表---订单信息部分,消息内容{}", new String(message.getBody()));
+            OrderInfoMessage data = JSON.parseObject(new String(message.getBody()),
+                    new TypeReference<MqWrapper<OrderInfoMessage>>() {
+                    }).getData();
+            performanceProgressService.dealPerformanceProgress4OrderInfo(data);
+        }catch (Exception e){
+            log.info("监听到同步履约进度表---订单信息部分发生异常，异常原因：{}", ExceptionUtils.getStackTrace(e));
+        }
     }
 }