...
|
...
|
@@ -2,28 +2,27 @@ package com.yohoufo.order.service; |
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.github.rholder.retry.*;
|
|
|
import com.github.rholder.retry.Retryer;
|
|
|
import com.github.rholder.retry.RetryerBuilder;
|
|
|
import com.github.rholder.retry.StopStrategies;
|
|
|
import com.github.rholder.retry.WaitStrategies;
|
|
|
import com.yoho.error.ServiceError;
|
|
|
import com.yoho.error.exception.ServiceException;
|
|
|
import com.yoho.message.sdk.utils.DateUtils;
|
|
|
import com.yohobuy.ufo.model.order.bo.OrderInfo;
|
|
|
import com.yohobuy.ufo.model.order.common.*;
|
|
|
import com.yohobuy.ufo.model.order.common.OrderAttributes;
|
|
|
import com.yohobuy.ufo.model.order.common.OrderCodeType;
|
|
|
import com.yohobuy.ufo.model.order.common.OrderStatus;
|
|
|
import com.yohobuy.ufo.model.order.constants.DepotType;
|
|
|
import com.yohobuy.ufo.model.order.constants.OrderConstant;
|
|
|
import com.yohobuy.ufo.model.order.constants.SkupType;
|
|
|
import com.yohobuy.ufo.model.order.req.SellerDeliverToDepotReq;
|
|
|
import com.yohoufo.common.alarm.EventBusPublisher;
|
|
|
import com.yohoufo.common.exception.UfoServiceException;
|
|
|
import com.yohoufo.common.utils.DateUtil;
|
|
|
import com.yohoufo.common.utils.StringUtil;
|
|
|
import com.yohoufo.dal.order.BuyerOrderGoodsMapper;
|
|
|
import com.yohoufo.dal.order.BuyerOrderMapper;
|
|
|
import com.yohoufo.dal.order.BuyerOrderMetaMapper;
|
|
|
import com.yohoufo.dal.order.SellerOrderGoodsMapper;
|
|
|
import com.yohoufo.dal.order.model.*;
|
|
|
import com.yohoufo.dal.user.model.ZhiMaCert;
|
|
|
import com.yohoufo.order.constants.ClearanceFailType;
|
|
|
import com.yohoufo.order.constants.ClientSpecialSemanticCode;
|
|
|
import com.yohoufo.order.constants.MetaKey;
|
|
|
import com.yohoufo.order.event.DeliverNoticeEvent;
|
|
|
import com.yohoufo.order.event.ErpBuyerOrderEvent;
|
...
|
...
|
@@ -37,9 +36,6 @@ import com.yohoufo.order.service.cache.CacheCleaner; |
|
|
import com.yohoufo.order.service.impl.*;
|
|
|
import com.yohoufo.order.service.listener.BuyerOrderChangeEvent;
|
|
|
import com.yohoufo.order.service.listener.OrderChangeListenerContainer;
|
|
|
import com.yohoufo.order.service.pay.alipay.AlipayCrossBorderService;
|
|
|
import com.yohoufo.order.service.pay.alipay.bean.AlipayCustomsResponse;
|
|
|
import com.yohoufo.order.service.pay.alipay.bean.CustomsErrorMsg;
|
|
|
import com.yohoufo.order.service.proxy.*;
|
|
|
import com.yohoufo.order.service.support.CustomsSupportService;
|
|
|
import com.yohoufo.order.utils.BuyerOrderUtils;
|
...
|
...
|
@@ -58,7 +54,6 @@ import java.util.concurrent.Executors; |
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
import static com.yohobuy.ufo.model.order.common.EnumExpressDataOperateTransferCode.judge_pass;
|
|
|
import static com.yohobuy.ufo.model.order.common.EnumExpressDataOperateTransferCode.platform_express_cause_pass;
|
|
|
import static com.yohobuy.ufo.model.order.common.EnumExpressDataOperateTransferCode.platform_receive;
|
|
|
import static com.yohobuy.ufo.model.order.common.EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
|
|
|
|
...
|
...
|
@@ -119,21 +114,11 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { |
|
|
FastDeliveryProxyService fastDeliveryProxyService;
|
|
|
|
|
|
@Autowired
|
|
|
private AlipayCrossBorderService crossBorderService;
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
BuyerOrderCancelService buyerOrderCancelService;
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
private UserProxyService userProxyService;
|
|
|
|
|
|
@Autowired
|
|
|
CustomsSupportService customsSupportService;
|
|
|
|
|
|
|
|
|
|
|
|
private ExecutorService executors = Executors.newFixedThreadPool(1);
|
|
|
|
|
|
Retryer<Object> retryer = RetryerBuilder.<Object>newBuilder()
|
...
|
...
|
@@ -194,8 +179,9 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { |
|
|
|
|
|
// 用于控制并发更新的
|
|
|
buyerOrder.setOriginalStatus(orderInfo.getStatus());
|
|
|
|
|
|
buyerOrder.setUpdateTime(DateUtil.getCurrentTimeSecond());
|
|
|
int cdt = DateUtil.getCurrentTimeSecond();
|
|
|
buyerOrder.setUpdateTime(cdt);
|
|
|
buyerOrder.setStatusStartTime(cdt);
|
|
|
int result = buyerOrderMapper.updateByOrderCode(buyerOrder);
|
|
|
//
|
|
|
if(result>0){
|
...
|
...
|
|