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);