From 61ed1478b876b9869a43334ad9e537645aef2492 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 9 Jul 2024 17:20:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=AC=A7?=
 =?UTF-8?q?=E6=B4=BE=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receiver/HwyOrderStatusHandler.java       | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java
index d36c04c84..40b9b481b 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java
@@ -1,35 +1,22 @@
 package com.logpm.factory.receiver;
 
 import cn.hutool.json.JSONUtil;
-import com.logpm.basicdata.feign.IBasicdataTrayClient;
-import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.factory.comfac.constant.FactoryConstant;
 import com.logpm.factory.comfac.dto.OrderStatusDTO;
 import com.logpm.factory.mt.service.IMtFactoryDataService;
 import com.logpm.factory.oupai.service.IOuPaiFactoryService;
 import com.logpm.factory.pan.service.IPanFactoryDataService;
-import com.logpm.factory.zb.service.IZbFactoryDataService;
-import com.logpm.oldproject.entity.AdvanceEntity;
-import com.logpm.oldproject.feign.IAdvanceClient;
-import com.logpm.oldproject.feign.ITrayClient;
-import com.logpm.oldproject.feign.ITrayScanClient;
-import com.logpm.oldproject.feign.ITrayScanDesClient;
 import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.feign.ITrunklineAdvanceClient;
-import com.logpm.warehouse.feign.*;
 import com.rabbitmq.client.Channel;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -51,6 +38,7 @@ public class HwyOrderStatusHandler {
 
 	private final IPanFactoryDataService panFactoryDataService;
 	private final IMtFactoryDataService mtFactoryDataService;
+	private final IOuPaiFactoryService ouPaiFactoryService;
 	private final ITrunklineAdvanceClient trunklineAdvanceClient;
 
 
@@ -89,6 +77,14 @@ public class HwyOrderStatusHandler {
 					throw new CustomerException(r.getCode(), r.getMsg());
 				}
 				break;
+			case FactoryConstant.OUPAI:
+				r = ouPaiFactoryService.handleStatusData(orderStatusDTO);
+				if (r.getCode() == 400 || r.getCode() == 200) {
+					log.info("TAG {} ##################hwyOrderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum);
+				} else {
+					throw new CustomerException(r.getCode(), r.getMsg());
+				}
+				break;
 
 			default:
 				log.info("##################hwyOrderStatusHandler: 新系统推送未知品牌 type={}", type);