...
|
...
|
@@ -3,7 +3,6 @@ package com.yohoufo.order.mq.consumer; |
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.yoho.core.rabbitmq.YhConsumer;
|
|
|
import com.yohobuy.ufo.model.order.common.EnumExpressDataOperateTransferCode;
|
|
|
import com.yohobuy.ufo.model.order.common.EnumExpressDataType;
|
|
|
import com.yohobuy.ufo.model.order.common.EnumExpressType;
|
|
|
import com.yohoufo.common.constant.ExpressInfoConstant;
|
...
|
...
|
@@ -17,14 +16,11 @@ import com.yohoufo.dal.order.model.ExpressRecord; |
|
|
import com.yohoufo.order.model.bo.ErpExpressBo;
|
|
|
import com.yohoufo.order.mq.publisher.ConsumerExceptionPublisher;
|
|
|
import com.yohoufo.order.utils.LoggerUtils;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
@Component
|
|
|
public class ExpressInfoUpdateConsumer implements YhConsumer {
|
...
|
...
|
@@ -143,9 +139,9 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger(); |
|
|
expressInfo.setExpressType(initExpressType);
|
|
|
expressInfo.setState(state);
|
|
|
|
|
|
//TODO 1 清关失败的物流信息,需要记录下相应的code ,以便后续调用
|
|
|
//expressInfo.setOperateTransferCode(EnumExpressDataOperateTransferCode.express_clear_fail_cause_buyer.getCode());
|
|
|
//TODO 1 清关失败和清关成功的物流信息,需要记录下相应的code ,以便后续调用
|
|
|
//TODO 2 清关失败需要告诉order,更改订单状态,并退费
|
|
|
//expressInfo.setOperateTransferCode(EnumExpressDataOperateTransferCode.express_clear_fail_cause_buyer.getCode());
|
|
|
|
|
|
expressInfoMapper.insert(expressInfo);
|
|
|
|
...
|
...
|
@@ -169,6 +165,12 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger(); |
|
|
createTime = DateUtil.getCurrentTimeSecond();
|
|
|
}
|
|
|
|
|
|
|
|
|
// TODO 鉴定中心到买家的 ,需要确认收货的,需要调用
|
|
|
if(expressType!=null&&EnumExpressType.EXPRESS_TYPE_2.getCode().intValue()==expressType.intValue()){
|
|
|
//调用确认收货接口 method=ufo.buyer.confirm
|
|
|
|
|
|
}
|
|
|
processExpressInfo( state, logisticsType, orderCode, waybillCode, acceptAddress, acceptRemark, createTime, uid, expressType);
|
|
|
}
|
|
|
|
...
|
...
|
|