ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit e80a83957a5cc5ed3a7b042345edaa250f2e9681 2 parents 3ff2978d c6866e27

Merge remote-tracking branch 'origin/test6.9.10' into test6.9.10

Inline Side-by-side
Showing 1 changed file with 10 additions and 5 deletions
@@ -6,10 +6,7 @@ import com.yoho.error.exception.ServiceException; @@ -6,10 +6,7 @@ import com.yoho.error.exception.ServiceException;
6 import com.yohobuy.ufo.model.order.bo.AppraiseOrderBo; 6 import com.yohobuy.ufo.model.order.bo.AppraiseOrderBo;
7 import com.yohobuy.ufo.model.order.bo.DepositOrderStatisticInfo; 7 import com.yohobuy.ufo.model.order.bo.DepositOrderStatisticInfo;
8 import com.yohobuy.ufo.model.order.bo.OrderInfo; 8 import com.yohobuy.ufo.model.order.bo.OrderInfo;
9 -import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus;  
10 -import com.yohobuy.ufo.model.order.common.OrderAttributes;  
11 -import com.yohobuy.ufo.model.order.common.OrderCodeType;  
12 -import com.yohobuy.ufo.model.order.common.Payment; 9 +import com.yohobuy.ufo.model.order.common.*;
13 import com.yohobuy.ufo.model.order.req.*; 10 import com.yohobuy.ufo.model.order.req.*;
14 import com.yohobuy.ufo.model.order.resp.SellerDepositOrderComputeResp; 11 import com.yohobuy.ufo.model.order.resp.SellerDepositOrderComputeResp;
15 import com.yohobuy.ufo.model.order.resp.SellerDepositOrderSubmitResp; 12 import com.yohobuy.ufo.model.order.resp.SellerDepositOrderSubmitResp;
@@ -38,6 +35,7 @@ import com.yohoufo.order.mq.DelayTime; @@ -38,6 +35,7 @@ import com.yohoufo.order.mq.DelayTime;
38 import com.yohoufo.order.mq.TopicConstants; 35 import com.yohoufo.order.mq.TopicConstants;
39 import com.yohoufo.order.mq.producer.TradeMqSender; 36 import com.yohoufo.order.mq.producer.TradeMqSender;
40 import com.yohoufo.order.service.DepositService; 37 import com.yohoufo.order.service.DepositService;
  38 +import com.yohoufo.order.service.IExpressInfoService;
41 import com.yohoufo.order.service.IGoodsService; 39 import com.yohoufo.order.service.IGoodsService;
42 import com.yohoufo.order.service.IPaymentService; 40 import com.yohoufo.order.service.IPaymentService;
43 import com.yohoufo.order.service.handler.GoodsServiceRefundHandler; 41 import com.yohoufo.order.service.handler.GoodsServiceRefundHandler;
@@ -66,7 +64,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -66,7 +64,7 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
66 private AppraiseOrderGoodsMapper appraiseOrderGoodsMapper; 64 private AppraiseOrderGoodsMapper appraiseOrderGoodsMapper;
67 65
68 @Autowired 66 @Autowired
69 - private AppraiseOrderStorageMapper appraiseOrderStorageMapper; 67 + private IExpressInfoService expressInfoService;
70 68
71 @Autowired 69 @Autowired
72 private SellerDepositOrderPrepareService sellerDepositOrderPrepareService; 70 private SellerDepositOrderPrepareService sellerDepositOrderPrepareService;
@@ -758,6 +756,13 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple @@ -758,6 +756,13 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple
758 logger.info("detectAppraiseFinish event {},parentOrderCode {} PLATFORM_RECEIVE count {}", event, parentOrderCode, cnt); 756 logger.info("detectAppraiseFinish event {},parentOrderCode {} PLATFORM_RECEIVE count {}", event, parentOrderCode, cnt);
759 if (cnt == 0){ 757 if (cnt == 0){
760 int prows = platformFinishAppraiseGoods(parentOrderCode); 758 int prows = platformFinishAppraiseGoods(parentOrderCode);
  759 +
  760 + // 鉴定已经完成的物流信息
  761 + EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
  762 + EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
  763 + EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.appraise_finished;
  764 + expressInfoService.saveOperateTransferExpressInfo(appraiseOrder.getUid(), orderCode ,expressType.getCode(),expressDataType,operateTransferCode);
  765 +
761 logger.info("detectAppraiseFinish platformFinishReceiveGoods, orderCode {},parentOrderCode {} parent count {}", 766 logger.info("detectAppraiseFinish platformFinishReceiveGoods, orderCode {},parentOrderCode {} parent count {}",
762 orderCode, parentOrderCode, prows); 767 orderCode, parentOrderCode, prows);
763 if (prows>0){ 768 if (prows>0){