sunyu::update::resolve conflicts

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/UpdateDeliveryInfoByIdRequest.java

@@ -71,4 +71,13 @@ public class UpdateDeliveryInfoByIdRequest extends BaseConfig {
      */
     private Integer orderSubState;
 
+    /**
+     * 配送平台统一异常Id
+     */
+    private Integer exceptionId;
+    /**
+     * 配送平台统一异常描述
+     */
+    private String exceptionDesc;
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1048,6 +1048,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         expressReq.setOrderSubState(request.getOrderSubState());
         expressReq.setRemark(request.getRemark());
         expressReq.setOrderSubState(request.getOrderSubState());
+        expressReq.setExceptionDesc(request.getExceptionDesc());
+        expressReq.setExceptionId(request.getExceptionId());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.updateDeliveryInfo(expressReq, request.getTrackingNo());
         OrderBaseResponse baseResponse = new OrderBaseResponse();
         baseResponse.setErrcode(response.getCode() != null ? Integer.parseInt(response.getCode()) : null);

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

@@ -68,4 +68,13 @@ public class CallbackUrlRequestDto {
      */
     private String updateTime = DateUtil.getCurrentDate(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
 
+    /**
+     * 配送平台统一异常Id
+     */
+    private Integer exceptionId;
+    /**
+     * 配送平台统一异常描述
+     */
+    private String exceptionDesc;
+
 }

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class SendMessageRequest {
+    /**
+     * 消息类型。 UNUSUAL_ORDER：异常订单提醒
+     */
+    private String messageType;
+
+    /**
+     * 三方小程序appid
+     */
+    private String miniAppId;
+
+    /**
+     * 非码订单编号
+     */
+    private String orderId;
+
+    /**
+     * 商户ID
+     */
+    private String partnerId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 门店ID
+     */
+    private String storeId;
+
+    /**
+     * 订单异常原因
+     */
+    private String orderStatus;
+
+    /**
+     * 订单异常发生时间
+     */
+    private String utcTime;
+
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SendMessageResponse {
+
+    private Integer code;
+
+    private String message;
+
+    private String subMsg;
+
+    private String ver;
+
+}

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

@@ -5,13 +5,12 @@ import cn.freemud.amp.service.ProduceMQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.entities.dto.delivery.*;
-import cn.freemud.entities.dto.ecology.DeliveryErrorReminder;
-import cn.freemud.entities.dto.ecology.OrderDeliveryScene;
-import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
+import cn.freemud.entities.dto.ecology.*;
 import cn.freemud.entities.dto.pos.PosBaseRequestDto;
 import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
 import cn.freemud.enums.DeliveryReviewStatus;
 import cn.freemud.enums.DeliveryStatus;
+import cn.freemud.enums.OrderStatus;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
@@ -126,6 +125,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         requestDto.setExpressNo(request.getChannelDeliveryId());
         requestDto.setOrderSubState(deliveryStatus);
         requestDto.setRemark(request.getRemark());
+        requestDto.setExceptionDesc(request.getExceptionDesc());
+        requestDto.setExceptionId(request.getExceptionId());
         if (StringUtils.isNotBlank(request.getRemark()))
         {
             requestDto.setRemark("配送:"+request.getRemark());
@@ -161,6 +162,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                 sendPosDeliveryStatus = 81;
             }
             sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark());
+            //推送异常到生态
+            sendException(request.getOrderId(),request.getExceptionDesc(),request.getUpdateTime(),DeliveryStatus.getDeliveryStatusByCode(deliveryStatus).getDesc());
             // 取消外卖中台配送单 订单异常
             // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
             if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
@@ -460,4 +463,32 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             }
         }
     }
+    /**
+     * 通知生态发送调用消息
+     */
+    public void sendException(String orderId,String unusualReason,String unusualTime,String desc) {
+        try{
+            BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+            baseQueryOrderRequest.setOrderId(orderId);
+            baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+            QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+            QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
+            SubscribeMessageRequest request = new SubscribeMessageRequest();
+            OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {});
+            request.setMiniAppId(extInfoDto.getAppid());
+            SendMessageRequest sendMessageRequest = new SendMessageRequest();
+            sendMessageRequest.setMessageType("UNUSUAL_ORDER");
+            sendMessageRequest.setMiniAppId(extInfoDto.getAppid());
+            sendMessageRequest.setOrderId(orderId);
+            sendMessageRequest.setPartnerId(orderBean.getCompanyId());
+            sendMessageRequest.setRemark(unusualReason);
+            sendMessageRequest.setStoreId(orderBean.getShopId());
+            sendMessageRequest.setOrderStatus(desc);
+            sendMessageRequest.setUtcTime(unusualTime);
+            SendMessageResponse sendMessageResponse = ecologyAdminApplicationClient.sendTemplateMessage(sendMessageRequest);
+            log.info("调用生态返回参数，订单编号:{},返回信息：{}",orderId,JSONObject.toJSONString(sendMessageResponse));
+        }catch (Exception e){
+            log.error("调用生态返回参数失败，订单编号:{}，失败原因：{}",orderId,e.getMessage());
+        }
+    }
 }

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

 package cn.freemud.service.thirdparty;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
-import cn.freemud.entities.dto.ecology.SubscribeMessageResponse;
-import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
-import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
+import cn.freemud.entities.dto.ecology.*;
 import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
 import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
 import org.springframework.cloud.netflix.feign.FeignClient;
@@ -33,4 +30,7 @@ public interface EcologyAdminApplicationClient {
 
     @PostMapping(value = "/ecology/api/subscribeMessage/send")
     SubscribeMessageResponse subscribeMessage(SubscribeMessageRequest request);
+
+    @PostMapping(value = "/ecology/api/templateMessage/send")
+    SendMessageResponse sendTemplateMessage(SendMessageRequest request);
 }

order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java

@@ -4,6 +4,7 @@ import cn.freemud.entities.vo.CreateOrderVo;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
+import cn.freemud.service.delivery.ThirdDeliveryServiceImpl;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
@@ -36,7 +37,7 @@ import java.util.Set;
 public class MallOrderServiceImplTest {
 
     @Autowired
-    private OrderDownLoadSdkService orderDownLoadSdkService;
+    private ThirdDeliveryServiceImpl thirdDeliveryServiceImpl;
 
 //    @Autowired
 //    private MallOrderServiceImpl mallOrderService;
@@ -105,10 +106,7 @@ public class MallOrderServiceImplTest {
 
     @Test
     public void test() {
-        String version = SpringVersion.getVersion();
-        String version1 = SpringBootVersion.getVersion();
-        System.out.println(version);
-        System.out.println(version1);
+        thirdDeliveryServiceImpl.sendException("19828644895966012600001","异常单子测试","2021-01-22 00:00:00","");
     }
 
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExpressReq.java

@@ -53,4 +53,13 @@ public class OrderExpressReq {
     //操作人
     private String operator;
 
+    /**
+     * 配送平台统一异常Id
+     */
+    private Integer exceptionId;
+    /**
+     * 配送平台统一异常描述
+     */
+    private String exceptionDesc;
+
 }