订单物流推送订单

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: EditLogisticsReq
+ * @Package cn.freemud.entities.vo
+ * @Description:
+ * @author: ping.wu
+ * @date: 22-5-26 下午10:24
+ * @Copyright: 2022 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class EditLogisticsReq {
+
+    /**
+     * 【必填】订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 【必填】物流接入渠道 1.人工 2.旺店通ERP
+     */
+    private String logisticsAccessChannel;
+
+    /**
+     * 【非必填】操作人
+     */
+    private String operator;
+
+    /**
+     * 【必填】商户编号
+     */
+    private String partnerId;
+
+    /**
+     * 物流
+     */
+    private String logisticsList;
+
+
+
+    /**
+     * 【非必填】物流公司编号
+     */
+    private String logisticsCompanyCode;
+
+    /**
+     * 【必填】物流公司名称
+     */
+    private String logisticsCompanyName;
+
+    /**
+     * 【必填】物流单号
+     */
+    private String expressNo;
+
+    /**
+     * 【必填】物流状态 1:已发货 2:已签收 4:异常 5:取消
+     */
+    private Integer state;
+
+}

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

@@ -6,6 +6,7 @@ import cn.freemud.base.entity.BaseResponse;
 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.delivery.DeliveryAmountVo;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
@@ -16,6 +17,7 @@ import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.service.ThirdDeliveryService;
 import cn.freemud.service.thirdparty.DeliveryFeiginClient;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
+import cn.freemud.service.thirdparty.OrderServiceClient;
 import cn.freemud.service.thirdparty.PosClient;
 import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.DateTimeUtil;
@@ -91,6 +93,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     private OrderManagerAdapter orderManagerAdapter;
     @Autowired
     private OrderSdkService orderSdkService;
+    OrderServiceClient orderServiceClient;
     @Autowired
     private MessageNoticeAdapter messageNoticeAdapter;
     @Autowired
@@ -308,6 +311,12 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
 
     @Override
     public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
+
+        orderSdkService.getOrderInfo(null,request.getOrderId(),null,null,null);
+
+        EditLogisticsReq editLogisticsReq = new EditLogisticsReq();
+        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 com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.QueryInvoiceRepDto;
@@ -65,4 +66,12 @@ public interface OrderServiceClient {
     @PostMapping(value = "/order/v2/refundFailures/successful")
     BaseResponse refundFailuresSuccessful(@RequestBody RefundFailuresSuccessfulReq refundFailuresSuccessfulReq);
 
+
+    /**
+     * 订单物流推送订单
+     */
+    @LogIgnoreFeign(logMessage="editLogistics")
+    @PostMapping(value = "/order/v2/editLogistics")
+    BaseResponse editLogistics(@RequestBody EditLogisticsReq editLogisticsReq);
+
 }