入机成功配送确认接口

order-management/src/main/java/cn/freemud/management/entities/dto/request/delivery/DeliveryOrderAssemblyackRequest.java

+package cn.freemud.management.entities.dto.request.delivery;
+
+import lombok.Data;
+
+@Data
+public class DeliveryOrderAssemblyackRequest {
+
+    //门店ID
+    private String storeId;
+    //订单ID
+    private String orderKey;
+    //入机成功 UTC 时间 yyyy-MM-dd'T'HH:mm:ss'Z'
+    private String assemblyTimeUTC;
+    //入机成功单号
+    private String displayOrderNumber;
+}

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
+import cn.freemud.management.thirdparty.DeliveryMCCafeClient;
 import cn.freemud.management.util.ResponseUtil;
 import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
@@ -15,6 +17,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -41,6 +45,8 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
     private PaymentHandle paymentHandle;
     @Resource
     private StockHandle stockHandle;
+    @Resource
+    private DeliveryMCCafeClient deliveryMCCafeClient;
 
     @Override
     public BaseResponse<OrderManagerResponse> orderConfirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
@@ -54,6 +60,15 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
             if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
                 //更新取餐码
                 saasOrderHandle.updatePickUpGoodNo(request,orderBean);
+
+                SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest();
+                assemblyAckRequest.setOrderKey(request.getOrderId());
+                assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
+                assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(new Date()));
+                assemblyAckRequest.setStoreId(orderBean.getShopId());
+                //入机成功通知配送
+                deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
             }
 
             // 异步核销券码

order-management/src/main/java/cn/freemud/management/thirdparty/DeliveryMCCafeClient.java

 package cn.freemud.management.thirdparty;
 
+import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssemblyackRequest;
 import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderHaltedRequest;
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
 import org.springframework.cloud.netflix.feign.FeignClient;
@@ -13,4 +14,10 @@ public interface DeliveryMCCafeClient {
     // 配送停单
     @PostMapping("/delivery/halted")
     DeliveryResponseDto halted(DeliveryOrderHaltedRequest deliveryOrderHaltedRequest);
+
+    /**、
+     * 入机成功通知配送
+      */
+    @PostMapping("/delivery/assemblyack")
+    DeliveryResponseDto assemblyAck(DeliveryOrderAssemblyackRequest request);
 }