添加报错信息

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

+package cn.freemud.entities.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+public class PushMessageNoticeDto {
+
+
+    /**
+     * 版本号  默认1
+     */
+    private String ver;
+    /**
+     * 商户ID
+     */
+    private String partnerId;
+    /**
+     * 门店ID
+     */
+    private String storeId;
+    /**
+     * 推送目标 1 小程序 2 pos机
+     */
+    private Integer targetType;
+    /**
+     * 推送目标 ID targetId
+     */
+    private String targetId;
+
+    private Integer cmd;
+
+    private String data;
+
+    /**
+     * "ttl":30 过期时间（秒）
+     */
+    private Integer ttl;
+
+    @Data
+    @NoArgsConstructor
+    public static class Message {
+        /**
+         * 1 表示新订单接单
+         */
+        private Integer type;
+
+        private cn.freemud.entities.dto.PushMessageNoticeDto.Message.Content content;
+
+        @Data
+        @NoArgsConstructor
+        public static class Content {
+
+            @JsonProperty("take_code")
+            private String take_code;
+
+            private String queueIndex;
+            /**
+             * 订单号
+             */
+            private String oid;
+            /**
+             * 订单状态
+             */
+            private Integer deliveryStatus;
+            /**
+             * 下单appid
+             */
+            private String fromAppId;
+            /**
+             * 取餐号
+             */
+            private String pickUpGoodsNo;
+            /**
+             * 用户id
+             */
+            private String userId;
+            /**
+             * 订单状态
+             */
+            private Integer orderState;
+            /**
+             * 订单渠道
+             */
+            private Integer orderClient;
+            /**
+             * 异常信息
+             */
+            private String errorMsg;
+
+
+        }
+    }
+
+}

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

@@ -136,7 +136,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             } else {
                 sendPosDeliveryStatus = 81;
             }
-            sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus);
+            sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark());
 
             // 取消外卖中台配送单 订单异常
             // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
@@ -325,7 +325,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     /**
      * 发送pos端消息
      */
-    public void sendPosMessage(String partnerId, String storeId, String orderId, Integer deliveryStatus) {
+    public void sendPosMessage(String partnerId, String storeId, String orderId, Integer deliveryStatus, String errorMsg) {
 
         PushMessageNoticeDto pushMessageNoticeDto = new PushMessageNoticeDto();
         pushMessageNoticeDto.setPartnerId(partnerId);
@@ -333,11 +333,12 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         pushMessageNoticeDto.setTargetId(null);
         pushMessageNoticeDto.setTargetType(2);
         pushMessageNoticeDto.setCmd(11);
-        PushMessageNoticeDto.Message message = new PushMessageNoticeDto.Message();
+        cn.freemud.entities.dto.PushMessageNoticeDto.Message message = new cn.freemud.entities.dto.PushMessageNoticeDto.Message();
         message.setType(1);
-        PushMessageNoticeDto.Message.Content content = new PushMessageNoticeDto.Message.Content();
+        cn.freemud.entities.dto.PushMessageNoticeDto.Message.Content content = new cn.freemud.entities.dto.PushMessageNoticeDto.Message.Content();
         content.setOid(orderId);
         content.setDeliveryStatus(deliveryStatus);
+        content.setErrorMsg(errorMsg);
         message.setContent(content);
 
         pushMessageNoticeDto.setData(new Gson().toJson(message));