Showing
1 changed file
with
8 additions
and
6 deletions
@@ -3,7 +3,6 @@ package com.yohoufo.order.mq.consumer; | @@ -3,7 +3,6 @@ package com.yohoufo.order.mq.consumer; | ||
3 | 3 | ||
4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
5 | import com.yoho.core.rabbitmq.YhConsumer; | 5 | import com.yoho.core.rabbitmq.YhConsumer; |
6 | -import com.yohobuy.ufo.model.order.common.EnumExpressDataOperateTransferCode; | ||
7 | import com.yohobuy.ufo.model.order.common.EnumExpressDataType; | 6 | import com.yohobuy.ufo.model.order.common.EnumExpressDataType; |
8 | import com.yohobuy.ufo.model.order.common.EnumExpressType; | 7 | import com.yohobuy.ufo.model.order.common.EnumExpressType; |
9 | import com.yohoufo.common.constant.ExpressInfoConstant; | 8 | import com.yohoufo.common.constant.ExpressInfoConstant; |
@@ -17,14 +16,11 @@ import com.yohoufo.dal.order.model.ExpressRecord; | @@ -17,14 +16,11 @@ import com.yohoufo.dal.order.model.ExpressRecord; | ||
17 | import com.yohoufo.order.model.bo.ErpExpressBo; | 16 | import com.yohoufo.order.model.bo.ErpExpressBo; |
18 | import com.yohoufo.order.mq.publisher.ConsumerExceptionPublisher; | 17 | import com.yohoufo.order.mq.publisher.ConsumerExceptionPublisher; |
19 | import com.yohoufo.order.utils.LoggerUtils; | 18 | import com.yohoufo.order.utils.LoggerUtils; |
20 | -import org.apache.commons.collections.CollectionUtils; | ||
21 | import org.apache.commons.lang3.StringUtils; | 19 | import org.apache.commons.lang3.StringUtils; |
22 | import org.slf4j.Logger; | 20 | import org.slf4j.Logger; |
23 | import org.springframework.beans.factory.annotation.Autowired; | 21 | import org.springframework.beans.factory.annotation.Autowired; |
24 | import org.springframework.stereotype.Component; | 22 | import org.springframework.stereotype.Component; |
25 | 23 | ||
26 | -import java.util.List; | ||
27 | - | ||
28 | 24 | ||
29 | @Component | 25 | @Component |
30 | public class ExpressInfoUpdateConsumer implements YhConsumer { | 26 | public class ExpressInfoUpdateConsumer implements YhConsumer { |
@@ -143,9 +139,9 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger(); | @@ -143,9 +139,9 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger(); | ||
143 | expressInfo.setExpressType(initExpressType); | 139 | expressInfo.setExpressType(initExpressType); |
144 | expressInfo.setState(state); | 140 | expressInfo.setState(state); |
145 | 141 | ||
146 | - //TODO 1 清关失败的物流信息,需要记录下相应的code ,以便后续调用 | ||
147 | - //expressInfo.setOperateTransferCode(EnumExpressDataOperateTransferCode.express_clear_fail_cause_buyer.getCode()); | 142 | + //TODO 1 清关失败和清关成功的物流信息,需要记录下相应的code ,以便后续调用 |
148 | //TODO 2 清关失败需要告诉order,更改订单状态,并退费 | 143 | //TODO 2 清关失败需要告诉order,更改订单状态,并退费 |
144 | + //expressInfo.setOperateTransferCode(EnumExpressDataOperateTransferCode.express_clear_fail_cause_buyer.getCode()); | ||
149 | 145 | ||
150 | expressInfoMapper.insert(expressInfo); | 146 | expressInfoMapper.insert(expressInfo); |
151 | 147 | ||
@@ -169,6 +165,12 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger(); | @@ -169,6 +165,12 @@ private static final Logger LOGGER = LoggerUtils.getMqConsumerLogger(); | ||
169 | createTime = DateUtil.getCurrentTimeSecond(); | 165 | createTime = DateUtil.getCurrentTimeSecond(); |
170 | } | 166 | } |
171 | 167 | ||
168 | + | ||
169 | + // TODO 鉴定中心到买家的 ,需要确认收货的,需要调用 | ||
170 | + if(expressType!=null&&EnumExpressType.EXPRESS_TYPE_2.getCode().intValue()==expressType.intValue()){ | ||
171 | + //调用确认收货接口 method=ufo.buyer.confirm | ||
172 | + | ||
173 | + } | ||
172 | processExpressInfo( state, logisticsType, orderCode, waybillCode, acceptAddress, acceptRemark, createTime, uid, expressType); | 174 | processExpressInfo( state, logisticsType, orderCode, waybillCode, acceptAddress, acceptRemark, createTime, uid, expressType); |
173 | } | 175 | } |
174 | 176 |
-
Please register or login to post a comment