订单物流推送订单

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java

@@ -31,7 +31,7 @@ public class CallbackUrlRequestDto {
      */
     private String channelDeliveryId;
     /**
-     * 订单状态枚举值
+     * 状态枚举值
      */
     private int deliveryStatus;
     /**

order-application-service/src/main/java/cn/freemud/entities/vo/order/DirectDeliveryReq.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: DirectDeliveryReq
+ * @Package cn.freemud.entities.vo.order
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-30 上午10:06
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class DirectDeliveryReq {
+
+    private  String orderCode;
+
+    private  String partnerId;
+
+    private String operator;
+
+    /**
+     * 自动收货任务执行时间毫秒时间戳
+     */
+    private Long taskTime;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/EditLogisticsReq.java → order-application-service/src/main/java/cn/freemud/entities/vo/order/EditLogisticsReq.java

-package cn.freemud.entities.vo;
+package cn.freemud.entities.vo.order;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -24,7 +26,7 @@ public class EditLogisticsReq {
     /**
      * 【必填】物流接入渠道 1.人工 2.旺店通ERP
      */
-    private String logisticsAccessChannel;
+    private Integer logisticsAccessChannel;
 
     /**
      * 【非必填】操作人
@@ -39,28 +41,6 @@ public class EditLogisticsReq {
     /**
      * 物流
      */
-    private String logisticsList;
-
-
-
-    /**
-     * 【非必填】物流公司编号
-     */
-    private String logisticsCompanyCode;
-
-    /**
-     * 【必填】物流公司名称
-     */
-    private String logisticsCompanyName;
-
-    /**
-     * 【必填】物流单号
-     */
-    private String expressNo;
-
-    /**
-     * 【必填】物流状态 1:已发货 2:已签收 4:异常 5:取消
-     */
-    private Integer state;
+    private List<LogisticsList> logisticsList;
 
 }

order-application-service/src/main/java/cn/freemud/entities/vo/order/LogisticsList.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: LogisticsList
+ * @Package cn.freemud.entities.vo.order
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-30 上午11:12
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class LogisticsList {
+
+    /**
+     * 【非必填】物流公司编号
+     */
+    private String logisticsCompanyCode;
+
+    /**
+     * 【必填】物流公司名称
+     */
+    private String logisticsCompanyName;
+
+    /**
+     * 【必填】物流单号
+     */
+    private String expressNo;
+
+    /**
+     * 【必填】物流状态 1:已发货 2:已签收 4:异常 5:取消
+     */
+    private Integer state;
+
+    /**
+     * 物流商品
+     */
+    private List<OrderPack> orderPackList;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/order/OrderPack.java

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: OrderPack
+ * @Package cn.freemud.entities.vo.order
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-30 上午11:13
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class OrderPack {
+
+    /**
+     * 订单商品明细ID
+     */
+    private String orderItemId;
+
+    /**
+     * 商品编号
+     */
+    private String productId;
+
+    /**
+     * 商品序号
+     */
+    private String productSeq;
+
+
+    /**
+     *
+     *
+     */
+
+}

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

@@ -3,11 +3,15 @@ package cn.freemud.service.delivery;
 import cn.freemud.adapter.MessageNoticeAdapter;
 import cn.freemud.amp.service.ProduceMQService;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.*;
 import cn.freemud.entities.dto.pos.PosBaseRequestDto;
-import cn.freemud.entities.vo.EditLogisticsReq;
+import cn.freemud.entities.vo.order.EditLogisticsReq;
 import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
+import cn.freemud.entities.vo.order.DirectDeliveryReq;
+import cn.freemud.entities.vo.order.LogisticsList;
+import cn.freemud.entities.vo.order.OrderPack;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
@@ -38,6 +42,8 @@ import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderCollectReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
@@ -62,6 +68,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -312,9 +319,40 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     @Override
     public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
 
-        orderSdkService.getOrderInfo(null,request.getOrderId(),null,null,null);
+        QueryByCodeResponse responseDto = orderSdkService.getOrderInfo(null, request.getOrderId(), 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.getOrderId());
+            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();

order-application-service/src/main/java/cn/freemud/service/thirdparty/OrderServiceClient.java

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.entities.vo.EditLogisticsReq;
+import cn.freemud.entities.vo.order.EditLogisticsReq;
+import cn.freemud.entities.vo.order.DirectDeliveryReq;
 import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.QueryInvoiceRepDto;
@@ -66,7 +67,6 @@ public interface OrderServiceClient {
     @PostMapping(value = "/order/v2/refundFailures/successful")
     BaseResponse refundFailuresSuccessful(@RequestBody RefundFailuresSuccessfulReq refundFailuresSuccessfulReq);
 
-
     /**
      * 订单物流推送订单
      */
@@ -74,4 +74,11 @@ public interface OrderServiceClient {
     @PostMapping(value = "/order/v2/editLogistics")
     BaseResponse editLogistics(@RequestBody EditLogisticsReq editLogisticsReq);
 
+    /**
+     * 订单发货
+     */
+    @LogIgnoreFeign(logMessage="directDelivery")
+    @PostMapping(value = "/order/v2/directDelivery")
+    BaseResponse directDelivery(@RequestBody DirectDeliveryReq DeditLogisticsReq);
+
 }