商城订单回调

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -319,45 +319,48 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     @Override
     public BaseResponse mallCallbackUrl(MallCallbackRequestDto request) {
 
-        return ResponseUtil.success();
-
-//        QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null);
-//        if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
-//            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
-//        }
-//        OrderInfoReqs orderInfoReqs = responseDto.getResult();
-//        if (NewOrderStatus.PLACE_AN_ORDER.getIndex() == orderInfoReqs.getOrderState()){
-//            DirectDeliveryReq directDeliveryReq = new DirectDeliveryReq();
-//            directDeliveryReq.setOrderCode(request.getTid());
-//            directDeliveryReq.setPartnerId(request.getPartnerId());
-//            directDeliveryReq.setOperator("");
-//            directDeliveryReq.setTaskTime(DateUtil.addDays(new Date(),15).getTime());
-//            orderServiceClient.directDelivery(directDeliveryReq);
-//        }
-//
-//        EditLogisticsReq editLogisticsReq = new EditLogisticsReq();
-//        editLogisticsReq.setOrderCode(orderInfoReqs.getOrderCode());
-//        editLogisticsReq.setLogisticsAccessChannel(2);
-//        editLogisticsReq.setPartnerId(orderInfoReqs.getPartnerId());
-//        editLogisticsReq.setOperator("");
-//        List<LogisticsList> logisticsList = new ArrayList<>();
-//        LogisticsList logistics = new LogisticsList();
-//        logistics.setExpressNo("");
-//        logistics.setLogisticsCompanyName("");
-//        logistics.setLogisticsCompanyCode("");
-//        logistics.setState(1);
-//        logisticsList.add(logistics);
-//        List<OrderPack> orderPackList = new ArrayList<>();
-//
-//        OrderPack orderPack = new OrderPack();
-//        orderPackList.add(orderPack);
-//        logistics.setOrderPackList(orderPackList);
-//        logisticsList.add(logistics);
-//
-//        editLogisticsReq.setLogisticsList(logisticsList);
-//        orderServiceClient.editLogistics(editLogisticsReq);
-//
 //        return ResponseUtil.success();
+
+        QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getTid(), null, null, null);
+        if (responseDto == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), responseDto.getCode())|| responseDto.getResult().getOrderCode() == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
+        OrderInfoReqs orderInfoReqs = responseDto.getResult();
+        if (NewOrderStatus.ACCEPTED.getIndex() == orderInfoReqs.getOrderState()){
+            DirectDeliveryReq directDeliveryReq = new DirectDeliveryReq();
+            directDeliveryReq.setOrderCode(request.getTid());
+            directDeliveryReq.setPartnerId(request.getPartnerId());
+            directDeliveryReq.setOperator("");
+            directDeliveryReq.setTaskTime(DateUtil.addDays(new Date(),15).getTime());
+            BaseResponse response = orderServiceClient.directDelivery(directDeliveryReq);
+            if (response == null || !Objects.equals(SUCCESS_RESPONSE_CODE.toString(), response.getCode())) {
+                return ResponseUtil.error(ResponseResult.SYSTEM_BUSINESS_ERROR);
+            }
+        }
+
+        EditLogisticsReq editLogisticsReq = new EditLogisticsReq();
+        editLogisticsReq.setOrderCode(orderInfoReqs.getOrderCode());
+        editLogisticsReq.setLogisticsAccessChannel(2);
+        editLogisticsReq.setPartnerId(orderInfoReqs.getPartnerId());
+        editLogisticsReq.setOperator("");
+        List<LogisticsList> logisticsList = new ArrayList<>();
+        LogisticsList logistics = new LogisticsList();
+        logistics.setExpressNo("");
+        logistics.setLogisticsCompanyName("");
+        logistics.setLogisticsCompanyCode("");
+        logistics.setState(1);
+        logisticsList.add(logistics);
+        List<OrderPack> orderPackList = new ArrayList<>();
+
+        OrderPack orderPack = new OrderPack();
+        orderPackList.add(orderPack);
+        logistics.setOrderPackList(orderPackList);
+        logisticsList.add(logistics);
+
+        editLogisticsReq.setLogisticsList(logisticsList);
+        orderServiceClient.editLogistics(editLogisticsReq);
+
+        return ResponseUtil.success();
     }
 
     @Override