|
@@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl; |
|
@@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl; |
2
|
|
2
|
|
3
|
import com.alibaba.fastjson.JSON;
|
3
|
import com.alibaba.fastjson.JSON;
|
4
|
import com.alibaba.fastjson.JSONObject;
|
4
|
import com.alibaba.fastjson.JSONObject;
|
|
|
5
|
+import com.google.common.collect.Lists;
|
5
|
import com.yoho.error.ServiceError;
|
6
|
import com.yoho.error.ServiceError;
|
6
|
import com.yoho.error.exception.ServiceException;
|
7
|
import com.yoho.error.exception.ServiceException;
|
7
|
import com.yohobuy.ufo.model.order.common.*;
|
8
|
import com.yohobuy.ufo.model.order.common.*;
|
|
@@ -704,11 +705,29 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
|
@@ -704,11 +705,29 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
704
|
|
705
|
|
705
|
ServiceOrderProcessor.ExistenceNode existenceNode = serviceOrderProcessor.findGoodsServiceInstanceAndExt(orderCode);
|
706
|
ServiceOrderProcessor.ExistenceNode existenceNode = serviceOrderProcessor.findGoodsServiceInstanceAndExt(orderCode);
|
706
|
|
707
|
|
|
|
708
|
+ // 确认收货过来的是子订单号
|
|
|
709
|
+ Long parentOrderCode = existenceNode.getAppraiseOrder().getParentOrderCode();
|
|
|
710
|
+ if (parentOrderCode == null){
|
707
|
// 平台收货 内部调拨信息
|
711
|
// 平台收货 内部调拨信息
|
708
|
EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
|
712
|
EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
|
709
|
EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
|
713
|
EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
|
710
|
EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.platform_receive;
|
714
|
EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.platform_receive;
|
711
|
- expressInfoService.saveOperateTransferExpressInfo(existenceNode.getAppraiseOrder().getUid(),orderCode,expressType.getCode(),expressDataType,operateTransferCode);
|
715
|
+ expressInfoService.saveOperateTransferExpressInfo(existenceNode.getAppraiseOrder().getUid(), orderCode ,expressType.getCode(),expressDataType,operateTransferCode);
|
|
|
716
|
+ return;
|
|
|
717
|
+ }
|
|
|
718
|
+ List<Integer> status = Lists.newArrayList(AppraiseOrderStatus.PLATFORM_RECEIVE.getCode(), AppraiseOrderStatus.CHECKING_FAKE.getCode());
|
|
|
719
|
+ int cnt = serviceOrderProcessor.getSubOrderCntNotDefinedStatus(parentOrderCode, status);
|
|
|
720
|
+ logger.info("no confirm delivery sub order cnt is {}, parentOrderCode {}", cnt, parentOrderCode);
|
|
|
721
|
+
|
|
|
722
|
+ // 父订单下所有的子订单都是 [平台已收货] or [虚假发货] 的情况
|
|
|
723
|
+ if (cnt == 0){
|
|
|
724
|
+ // 平台收货 内部调拨信息
|
|
|
725
|
+ EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
|
|
|
726
|
+ EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
|
|
|
727
|
+ EnumExpressDataOperateTransferCode operateTransferCode = EnumExpressDataOperateTransferCode.platform_receive;
|
|
|
728
|
+ expressInfoService.saveOperateTransferExpressInfo(existenceNode.getAppraiseOrder().getUid(),parentOrderCode ,expressType.getCode(),expressDataType,operateTransferCode);
|
|
|
729
|
+ }
|
|
|
730
|
+
|
712
|
return;
|
731
|
return;
|
713
|
}
|
732
|
}
|
714
|
|
733
|
|