Merge branch 'feature/20200513_爱马哥兼容' into develop

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

@@ -41,7 +41,7 @@ public class MessagePushAdapter {
         PushMessageNoticeDto pushMessageNoticeDto = new PushMessageNoticeDto();
         pushMessageNoticeDto.setPartnerId(order.getCompanyId());
         pushMessageNoticeDto.setStoreId(order.getShopId());
-        pushMessageNoticeDto.setTargetId(order.getUserId());
+        pushMessageNoticeDto.setTargetId(null);
         pushMessageNoticeDto.setTargetType(2);
         pushMessageNoticeDto.setCmd(MessageCenterCmdType.JIEDAN_DAYIN_TIXING.getCmd());
         pushMessageNoticeDto.setTtl(0);

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -72,7 +72,8 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         /*****兼容爱马哥，送出即完成start******/
-        if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+        if (OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+            request.setOperator(OperateType.ORDER_AFFIRM.getOpType());
             return orderAffirm(request, orderBean);
         }
         /*****容爱马哥，送出即完成end******/