Merge branch '20201127_coco配送进程' into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1039,7 +1039,9 @@ public class OrderSdkAdapter {
      */
     public QueryOrdersResponse.DataBean.OrderBean convent2NEWOrderInfo(OrderInfoReqs orderInfoReqs) {
         QueryOrdersResponse.DataBean.OrderBean data = new QueryOrdersResponse.DataBean.OrderBean();
-
+        if(Objects.nonNull(orderInfoReqs.getEstimateDeliveryCompleteTime())){
+            data.setEstimateDeliveryCompleteTime(Long.parseLong(orderInfoReqs.getEstimateDeliveryCompleteTime()));
+        }
         data.setOrderClient(orderInfoReqs.getOrderClient().toString());
         data.setCompanyId(orderInfoReqs.getPartnerId());
         data.setShopId(orderInfoReqs.getStoreId());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -427,6 +427,9 @@ public class QueryOrdersResponse {
             private List<OrderPayItem> orderPayItem;
 
 
+            // 预计到达时间
+            private Long estimateDeliveryCompleteTime;
+
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {
@@ -722,7 +725,7 @@ public class QueryOrdersResponse {
             @NoArgsConstructor
             @Data
             public static class OperationHistory {
-                private Long createTime;
+                private String createTime;
                 private String operationDesc;
                 private String operationMethod;
                 private String orderCode;

order-application-service/pom.xml

@@ -87,8 +87,8 @@
         <!--  商户门店sdk  -->
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
+            <version>3.3.5-SNAPSHOT</version>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.2.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

order-application-service/src/main/java/cn/freemud/constant/RedisKeyConstant.java

@@ -13,6 +13,8 @@
 
 package cn.freemud.constant;
 
+import cn.freemud.utils.DateTimeUtil;
+
 public class RedisKeyConstant {
     /**
      * userInfoMap的redisKey前缀
@@ -51,7 +53,7 @@ public class RedisKeyConstant {
      * 支付回掉标记在redis的key前缀
      */
     public final static String KGD_PAYMENT_CALLBACK_FMID = "kgd:payment:callback:fmid:";
-    
+
     /**
      * 点餐门店绑定的商城门店redis的key前缀
      */
@@ -67,4 +69,24 @@ public class RedisKeyConstant {
      */
     public final static String KGD_SENDPOINT_ORDERID = "kgd:sendpoint:orderid:";
 
+
+    private final static String REDIS_KEY_SEP = ":";
+
+
+    /**
+     * cocoNotMadeGoods:商户号:门店号:yyyy-MM-dd
+     *
+     * @param partnerId
+     * @param storeId
+     * @return
+     */
+    public static String notMadeGoodsNumber(String partnerId, String storeId) {
+        StringBuilder sb = new StringBuilder("cocoNotMadeGoods");
+        sb.append(REDIS_KEY_SEP);
+        sb.append(partnerId).append(REDIS_KEY_SEP);
+        sb.append(storeId).append(REDIS_KEY_SEP);
+        sb.append(DateTimeUtil.getCurrentDateStr());
+        return sb.toString();
+    }
+
 }

order-application-service/src/main/java/cn/freemud/controller/CallerController.java

+package cn.freemud.controller;
+
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.TakeMealNoticesVO;
+import cn.freemud.service.CallerService;
+import cn.freemud.utils.ResponseUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 叫号器
+ */
+@Slf4j
+@RequestMapping("/caller")
+@RestController
+@Validated
+public class CallerController {
+
+private CallerService callerService;
+
+    public CallerController(CallerService callerService) {
+        this.callerService = callerService;
+    }
+
+    /**
+     * 取餐通知
+     * @return
+     */
+    public BaseResponse takeMealNotices(TakeMealNoticesVO vo){
+        return  callerService.takeMealNotices(vo);
+    }
+
+}

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -366,5 +366,15 @@ public class OrderController {
         return orderservice.mcCafePollingPickUpCode(vo);
     }
 
+    /**
+     * 根据订单号查询配送操作日志及骑手位置
+     * @param requestVo
+     * @return
+     */
+    @ApiAnnotation(logMessage = "queryOrderRider")
+    @PostMapping("/queryOrderRider")
+    public BaseResponse<OrderRiderResponseVo> queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
+        return orderservice.queryOrderRider(requestVo);
+    }
 
 }

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

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+@Data
+public class DeliveryBaseResponse<T> {
+
+    private Integer code;
+
+    private String msg;
+
+    private T data;
+}

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

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+@Data
+public class DeliveryStatusAndRiderPositionDto {
+    /**
+     * 订单号
+     */
+    private String orderId;
+    /**
+     * 配送号
+     */
+    private String deliveryId;
+    /**
+     * 经纬度
+     */
+    private String currentPoint;
+    /**
+     * 配送状态
+     */
+    private Integer devlieryStatus;
+    /**
+     * 距离
+     */
+    private Integer distance;
+
+}

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

+package cn.freemud.entities.dto.delivery;
+
+import lombok.Data;
+
+@Data
+public class QueryDeliveryBaseRequest {
+    private String deliveryId;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class BookingOrderPayedScene {
+
+    /**
+     * 商户地址
+     */
+    private String merchantAddress;
+
+    /**
+     * 商户名
+     */
+
+    private String merchantName;
+    /**
+     * 取单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 预计取单时间
+     */
+    private String takeOrderTime;
+
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class DeliveryErrorReminder {
+    /**
+     * 配送地址
+     */
+    private String address;
+
+    /**
+     * 下单时间
+     */
+    private String createTime;
+
+    /**
+     * 客户电话
+     */
+    private String customerPhone;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class GroupBuyingStatusReminder {
+    /**
+     * 温馨提示
+     */
+    private String friendlyTips;
+
+    /**
+     * 商户地址
+     */
+    private String merchantAddress;
+
+    /**
+     * 商户名
+     */
+    private String merchantName;
+
+    /**
+     * 完成点单人数
+     */
+    private String peopleNumber;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class InstantOrderPayedScene {
+    /**
+     * 温馨提示
+     */
+    private String friendlyTips;
+
+    /**
+     * 商户地址
+     */
+    private String merchantAddress;
+
+    /**
+     * 商户名
+     */
+    private String merchantName;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class OrderDeliveryScene {
+
+    /**
+     * 配送地址
+     */
+    private String address;
+
+    /**
+     * 预计达到时间
+     */
+    private String estimateArrivalTime;
+
+    /**
+     * 商户电话
+     */
+    private String merchantPhone;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SceneCouponRequest {
+    /**
+     * 券名称,
+     */
+    private String couponName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SceneInviteGiftRequest {
+    /**
+     * 活动id,
+     */
+    private String activityId;
+
+    /**
+     * 被邀请人
+     */
+    private String inviteeName;
+
+    /**
+     * 通过时间,
+     */
+    private String passTime;
+
+    /**
+     * relationId,
+     */
+    private String relationId;
+    /**
+     * remark,
+     */
+    private String 备注;
+
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SceneMemberCardExpiredRequest {
+
+    /**
+     * 到期时间
+     */
+    private Integer  expiredAt;
+
+    /**
+     * 备注说明 / 温馨提示
+     */
+    private String remark;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SceneMemberLevelChangedRequest {
+
+    /**
+     * 等级变更时间
+     */
+    private Integer changedAt;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SceneOrderPayedRequest {
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 金额
+     */
+    private Integer amount;
+
+    /**
+     * 序号 必填
+     */
+    private Integer daySeq;
+
+
+    /**
+     * 备注
+     */
+    private String formId;
+
+
+    /**
+     * 创建时间
+     */
+    private Long gmtCreate;
+
+
+    /**
+     * 预约时间
+     */
+    private Long gmtExpect;
+
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+
+    /**
+     * 取餐码
+     */
+    private String otherCode;
+
+    /**
+     * prepayId
+     */
+    private String prepayId;
+
+    /**
+     * 积分变动
+     */
+    private String scoreChangedNum;
+
+    /**
+     * 积分变动原因
+     */
+    private String scoreChangedReason;
+
+    /**
+     * 门店名称
+     */
+    private String shopName;
+
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SelfDeliveryOrderPayedScene {
+
+    /**
+     * 配送地址
+     */
+    private String address;
+
+    /**
+     * 预计达到时间
+     */
+    private String estimateArrivalTime;
+
+    /**
+     * 商户电话
+     */
+    private String merchantPhone;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+
+}

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

+package cn.freemud.entities.dto.ecology;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class SubscribeMessageRequest {
+
+
+    private BookingOrderPayedScene bookingOrderPayedScene;
+
+    private BookingOrderPayedScene bookingOrderTakeReminderScene;
+
+    /**
+     * 渠道
+     */
+    private Integer channel;
+
+    private  DeliveryErrorReminder  deliveryErrorReminder;
+
+    private GroupBuyingStatusReminder groupBuyingStatusReminder;
+
+    private InstantOrderPayedScene instantOrderPayedScene;
+
+    private InstantOrderPayedScene instantOrderTakeReminderScene;
+
+    private  String messageEventType;
+
+    /**
+     * 小程序id
+     */
+    private String miniAppId;
+
+    /**
+     * 小程序集合
+     */
+    private List<String> openIdList;
+
+    private OrderDeliveryScene orderDeliveryScene;
+
+    private SceneCouponRequest sceneCouponExpiredRequest;
+
+    private SceneCouponRequest sceneCouponReceiveRequest;
+
+    private SceneInviteGiftRequest sceneInviteGiftRequest;
+
+    private SceneMemberCardExpiredRequest sceneMemberCardExpiredRequest;
+
+    private SceneMemberLevelChangedRequest sceneMemberLevelChangedRequest;
+
+    private SceneOrderPayedRequest sceneOrderPayedRequest;
+
+    private SelfDeliveryOrderPayedScene selfDeliveryOrderPayedScene;
+
+
+
+
+
+
+
+
+
+
+
+}

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

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

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+@Data
+public class OrderRiderRequestVo {
+
+    @NotEmpty(message = "sessionId 不能为空")
+    private String sessionId;
+
+    @NotEmpty(message = "订单ID 不能为空")
+    private String oid;
+}

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

+package cn.freemud.entities.vo;
+
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import lombok.Data;
+import org.omg.PortableInterceptor.INACTIVE;
+
+import java.util.List;
+
+@Data
+public class OrderRiderResponseVo {
+    /**
+     * 订单号
+     */
+    private String orderId;
+    /**
+     * 配送号
+     */
+    private String deliveryId;
+    /**
+     * 经纬度
+     */
+    private String currentPoint;
+    /**
+     * 配送状态
+     */
+    private Integer devlieryStatus;
+    /**
+     * 距离
+     */
+    private Integer distance;
+    /**
+     * 操作日志
+     */
+    private List<Operation> operationList;
+    @Data
+    public static class Operation{
+        private String createTime;
+        private String operationDesc;
+        private String operationMethod;
+        private String operator;
+    }
+}

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

+package cn.freemud.entities.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author freemud
+ */
+@Getter
+@Setter
+public class TakeMealNoticesVO {
+
+
+    @ApiModelProperty(value = "商户Id")
+    private String partnerId;
+
+    @ApiModelProperty(value = "门店id")
+    private String storeCode;
+
+    @ApiModelProperty(value = "订单数量")
+    private Integer orderTotalNum;
+
+    @ApiModelProperty(value = "待制作杯数")
+    private Integer cupTotalNum;
+
+    @ApiModelProperty(value = "订单")
+    private String[] orders;
+}

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -163,6 +163,9 @@ public enum ResponseResult {
     ORDER_NOT_CREATE_ERROR("45065", "请不要重复创建订单"),
     MULTIORDER__ERRORREFUND("45005", "订单申请退款失败"),
 
+    ORDER_CANCEL_ERROR_EXPECT_TIME("45067", "预约时间还剩15分钟，无法取消"),
+    ORDER_CANCEL_ERROR_ESTIMATE_TIME("45068", "预计送达还剩30分钟，无法取消"),
+
 
     /**
      * 支付
@@ -210,6 +213,7 @@ public enum ResponseResult {
     DELIVERY_QUERY_RIDER_STATUS_ERROR("53014", "订单状态不是配送中，不能查询骑手位置"),
     DELIVERY_REMINDER_ERROR("53015","催单失败"),
     DELIVERY_QUERY_RIDER_ERROR("53016","查询骑手位置失败"),
+    DELIVERY_NOT_EXIST("53017","当前订单不是没有配送单"),
 
     /**
      * 配送信息

order-application-service/src/main/java/cn/freemud/service/CallerService.java

+package cn.freemud.service;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.constant.RedisKeyConstant;
+import cn.freemud.entities.vo.TakeMealNoticesVO;
+import cn.freemud.utils.ResponseUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class CallerService {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 缓存 待制作杯数量
+     * @param vo
+     */
+    private void  cacheTakeMealNotices(TakeMealNoticesVO vo){
+        String redisKey = RedisKeyConstant.notMadeGoodsNumber(vo.getPartnerId(), vo.getStoreCode());
+        redisTemplate.boundValueOps(redisKey).set(vo.getCupTotalNum(),1, TimeUnit.DAYS);
+    }
+
+    public BaseResponse takeMealNotices(TakeMealNoticesVO vo){
+        cacheTakeMealNotices(vo);
+        //发送取餐通知消息 cc 生态
+        return  ResponseUtil.success();
+    }
+
+}

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.ConfirmOrderDto;
 import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.entities.vo.*;
+import com.freemud.sdk.api.assortment.order.enums.OrderSdkType;
 
 import java.util.Map;
 
@@ -130,13 +131,4 @@ public interface Orderservice {
     BaseResponse mcCafeQueryOrders(McCafeQueryOrderVo queryOrderVo);
 
     BaseResponse mcCafePollingPickUpCode(MaCafeQueryOrderVo vo );
-
-    /**
-     * 通过订单号查询订单详情
-     *
-     * @param sessionId 用户会话ID
-     * @param oid       订单ID
-     * @return
-     */
-    BaseResponse queryCollageOrderById(Integer operation,String sessionId, String oid, String partnerId,String channel);
 }

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

@@ -5,6 +5,7 @@ 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.SubscribeMessageRequest;
 import cn.freemud.entities.dto.pos.PosBaseRequestDto;
 import cn.freemud.entities.vo.delivery.DeliveryAmountVo;
 import cn.freemud.enums.DeliveryReviewStatus;
@@ -18,6 +19,7 @@ import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.service.Orderservice;
 import cn.freemud.service.ThirdDeliveryService;
 import cn.freemud.service.thirdparty.DeliveryFeiginClient;
+import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
 import cn.freemud.service.thirdparty.PosClient;
 import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
@@ -33,8 +35,11 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.order.request.order.AssortmentUpdateDeliveryAbnormalRequest;
+import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.UpdateDeliveryInfoByIdRequest;
 import com.freemud.sdk.api.assortment.order.response.order.OrderBaseResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -42,6 +47,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -80,6 +86,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     private MessageNoticeAdapter messageNoticeAdapter;
     @Autowired
     private MessageCenterClient messageNoticeClient;
+    @Value("${delivery.micro.message.partner}")
+    private String deliveryMicroMessagePartner;
+    @Autowired
+    private EcologyAdminApplicationClient ecologyAdminApplicationClient;
 
     @Override
     public BaseResponse callbackUrl(CallbackUrlRequestDto request) {
@@ -102,6 +112,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         requestDto.setExpressChannelName(request.getChannelName());
         requestDto.setExpressNo(request.getChannelDeliveryId());
         requestDto.setOrderSubState(deliveryStatus);
+        requestDto.setRemark(request.getRemark());
         if (StringUtils.isNotBlank(request.getRemark()))
         {
             requestDto.setRemark("配送:"+request.getRemark());
@@ -123,9 +134,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             posBaseRequestDto.setDelivery_status(DeliveryStatus.ALLOTRIDER.getCode());
             posBaseRequestDto.setPartner_id(partnerId);
             sendPosService(deliveryStatus,posBaseRequestDto);
+            sendMicroMessage(partnerId,request.getOrderId());
         } else if (deliveryStatus == DeliveryStatus.RIDERGETMEAL.getCode() || deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode()) {
             // 订单配送
             sendPosService(deliveryStatus,posBaseRequestDto);
+            sendMicroMessage(partnerId,request.getOrderId());
         } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode()) {
             // 订单已完成
             sendPosService(deliveryStatus,posBaseRequestDto);
@@ -137,6 +150,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                 sendPosDeliveryStatus = 81;
             }
             sendPosMessage(partnerId, storeCode, request.getOrderId(), sendPosDeliveryStatus, request.getRemark());
+            sendMicroMessage(partnerId,request.getOrderId());
 
             // 取消外卖中台配送单 订单异常
             // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
@@ -154,6 +168,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             produceMQService.sendOfDeliveryInfo(request);
             produceMQService.sendRocketMqOfDeliveryInfo(request);
         }
+
 //        else {
 //            return ResponseUtil.error(ResponseResult.SYSTEM_ERROR.getCode(), "订单回调状态有误");
 //        }
@@ -352,5 +367,23 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         messageNoticeClient.createMessage(pushMessageNoticeDto, LogThreadLocal.getTrackingNo());
     }
 
-
+    /**
+     * 配送消息推送
+     */
+    public void  sendMicroMessage(String partnerId,  String orderId){
+        //如果商户配置了配送订阅消息推送
+        if(deliveryMicroMessagePartner.contains(partnerId)){
+            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();
+                ecologyAdminApplicationClient.subscribeMessage(request);
+            }catch (Exception e){
+                log.error("配送订阅消息推送失败:{},失败原因:{}",orderId,e.getMessage());
+            }
+        }
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -87,7 +87,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCr
 import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSendCouponResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
@@ -114,14 +113,12 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
-import com.freemud.sdk.api.assortment.order.request.payment.UnifiedOrderApplicationRequest;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
 import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
 import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
-import com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest;
 import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
@@ -159,8 +156,6 @@ public class OrderServiceImpl implements Orderservice {
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
 
-    public final static String RESPONSE_SUCCESS_STR = "100";
-
     private static Gson gson = new Gson();
 
     @Value("${saas.reverseNotifyiDcUrl}")
@@ -174,11 +169,6 @@ public class OrderServiceImpl implements Orderservice {
     @Value("${mq.cloud_print_exchange}")
     private String cloud_print_exchange;
 
-    /**
-     * coco商户
-     */
-    @Value("#{'${coco.partnerId}'.split(',')}")
-    private List<String> cocoPartnerId;
 
     @Autowired
     private AssortmentCloudPrinterManager cloudPrinterManager;
@@ -261,12 +251,10 @@ public class OrderServiceImpl implements Orderservice {
     private OrderDownLoadSdkService orderDownLoadSdkService;
     @Autowired
     private OrderSdkAdapter orderSdkAdapter;
- 	@Autowired
-    private DeliveryFeiginClient deliveryFeiginClient;
-  	@Autowired
+    @Autowired
     private OfflineCouponSdkService offlineCouponSdkService;
     @Autowired
-    private PaymentApplicationClient paymentApplicationClient;
+    private DeliveryFeiginClient deliveryFeiginClient;
     @Autowired
     private MulitiPaymentClient mulitiPaymentClient;
 
@@ -278,8 +266,6 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
 
-    @Autowired
-    private SvcComPayClient svcComPayClient;
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
@@ -497,8 +483,6 @@ public class OrderServiceImpl implements Orderservice {
         newShoppingCartClearDto.setSessionId(sessionId);
         newShoppingCartClearDto.setOperationType(1);
         shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
-        shoppingCartClient.clearCollageOrder(newShoppingCartClearDto);
-
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
             orderBean.setAddress(storeAddress);
@@ -542,6 +526,9 @@ public class OrderServiceImpl implements Orderservice {
         }
         //支付回掉成功标记
         redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
+        log.info("调用券码核销==" + message.getTrans_id());
+        verificationCoupon(message.getTrans_id());
+        log.info("调用券码结束=="+ message.getTrans_id());
         return sendPaySuccessNoticeMessage();
     }
 
@@ -618,9 +605,6 @@ public class OrderServiceImpl implements Orderservice {
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
-                log.info("调用券码核销==" + message.getTrans_id());
-                verificationCoupon(message.getTrans_id());
-                log.info("调用券码结束=="+ message.getTrans_id());
                 return newSendPaySuccessNoticeMessage();
             } else {
                 return newSendPayFaileMessage();
@@ -629,7 +613,7 @@ public class OrderServiceImpl implements Orderservice {
         return newSendPayFaileMessage();
     }
 
-    private BaseResponse verificationCoupon(String transId){
+    private String verificationCoupon(String transId){
         String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(transId));
         if (StringUtils.isNotBlank(orderId)) {
             log.info("从缓存中获取的订单数据,trackingNo:{},transId:{},orderId:{}", LogTreadLocal.getTrackingNo(),transId, orderId);
@@ -637,7 +621,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(transId);
         if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {
-            return ResponseUtil.error(String.valueOf(queryOrderByIdResponseDto.getErrcode()), queryOrderByIdResponseDto.getErrmsg());
+            return refundFaileMessage("order query fail" + queryOrderByIdResponseDto);
         }
         OrderBean orderBean = new OrderBean();
         if (1 == queryOrderByIdResponseDto.getData().size()) {
@@ -649,8 +633,8 @@ public class OrderServiceImpl implements Orderservice {
             }
         }
         //核销券
-        return couponActivityService.verificationCoupon(orderBean, CouponReqType.WRITEOFF);
-        //return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
+        BaseResponse baseResponse = couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
+        return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
     }
 
     @Override
@@ -891,28 +875,10 @@ public class OrderServiceImpl implements Orderservice {
                     // 取红包图片
                     queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
                     queryOrderResponseVo.setActivityId(activityId);
-
-                    // coco订单不考略是否查询待取餐的订单，直接调用支付有礼活动
-                    // 所以在这个地方排除掉coco，在下边单独实现
                     //参与支付有礼活动
-                    if(!cocoPartnerId.contains(queryOrderVo.getPartnerId())){
-                        joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
-                    }
-
-                } catch (Exception e) {
-                    LogUtil.error("queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
-                }
-            });
-        }
-
-        // coco订单参与支付有礼活动
-        if(cocoPartnerId.contains(queryOrderVo.getPartnerId())){
-            queryOrderResponseVos.forEach(queryOrderResponseVo -> {
-                try {
                     joinPayGift(queryOrderVo.getSessionId(), queryOrderResponseVo);
-
                 } catch (Exception e) {
-                    LogUtil.error("coco_queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
+                    LogUtil.error("queryOrders_activity_error", gson.toJson(queryOrdersDto), gson.toJson(queryOrderResponseVo), e);
                 }
             });
         }
@@ -1126,41 +1092,6 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responseMap);
     }
 
-    @Override
-    public BaseResponse queryCollageOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel) {
-
-        BaseResponse orderInfoRes = this.queryOrderById(operation,sessionId, oid,partnerId,channel);
-
-        if(null == orderInfoRes.getResult() || !String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoRes.getCode())){
-            return orderInfoRes;
-        }
-
-        // 根据用户聚合商品信息
-        QueryCollageOrderResponseVo queryCollageOrderResponseVo = new QueryCollageOrderResponseVo();
-        QueryOrderResponseVo queryOrderResponseVo  = (QueryOrderResponseVo)orderInfoRes.getResult();
-        List<ProductVo> productVo = queryOrderResponseVo.getProducts();
-        // 根据用户id分类商品
-        Map<String,List<ProductVo>> orderItemMap = productVo.stream().collect(Collectors.groupingBy(ProductVo::getUserId));
-        List<UserProductVo> userProducts = new ArrayList<>();
-        for(Map.Entry<String,List<ProductVo>> m : orderItemMap.entrySet()){
-            List<ProductVo> products = m.getValue();
-
-            UserProductVo userProductVo = new UserProductVo();
-            userProductVo.setUserId(products.get(0).getUserId());
-            userProductVo.setOpenId(products.get(0).getOpenId());
-            userProductVo.setNickName(products.get(0).getNickName());
-            userProductVo.setPhotoUrl(products.get(0).getPhotoUrl());
-            userProductVo.setProducts(products);
-            userProducts.add(userProductVo);
-        }
-
-        queryCollageOrderResponseVo = JSONObject.parseObject(JSONObject.toJSONString(queryOrderResponseVo),QueryCollageOrderResponseVo.class);
-        queryCollageOrderResponseVo.setUserProducts(userProducts);
-
-        return ResponseUtil.success(queryCollageOrderResponseVo);
-
-    }
-
     private String getRedpacketsPicture(String activityId) {
         if (StringUtils.isNotBlank(activityId)) {
             try {
@@ -1204,7 +1135,6 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setActivityName(payGiftResponse.getActivityName());
             queryOrderResponseVo.setCoupons(payGiftResponse.getCoupons());
             queryOrderResponseVo.setWechatCouponInfo(payGiftResponse.getWechatCouponInfo());
-            queryOrderResponseVo.setActivitySendType(payGiftResponse.getSendType());
         }
     }
 
@@ -1352,14 +1282,6 @@ public class OrderServiceImpl implements Orderservice {
             queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
         }
 
-        // 支付有礼
-        // 目前只有coco在订单详情参加支付有礼，且不检查订单的状态
-        if(cocoPartnerId.contains(partnerId)){
-            joinPayGift(sessionId, queryOrderResponseVo);
-        }
-
-        buildQueryOrderResponseVo(queryOrderResponseVo,response);
-
         return ResponseUtil.success(queryOrderResponseVo);
     }
 
@@ -1762,7 +1684,6 @@ public class OrderServiceImpl implements Orderservice {
                 if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
                     return ResponseUtil.error(ResponseResult.MULTIORDER__ERRORREFUND.getCode(), "multiOrderRefund_failed");
                 }
-
                 List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
                 if(null != refundPlatformResponseList && refundPlatformResponseList.size()>0){
                     redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
@@ -1771,9 +1692,9 @@ public class OrderServiceImpl implements Orderservice {
                 state = PayRefundStatus.SUCCESS.getCode();
             }else {
                 //调用支付退款
-                OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
                 response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
-                if (response == null || response.getData() == null || !RESPONSE_SUCCESS_STR.equals(response.getCode())) {
+                if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
                 }
                 //获取支付返回退款状态
@@ -2333,7 +2254,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse = uSvcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
         } else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
             String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
-            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, partnerPayOvertime, createPrepayRequestDto.getOrderExtInfoDTO());
+            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, partnerPayOvertime);
         }
         //混合支付+svc卡
         else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
@@ -2399,10 +2320,11 @@ public class OrderServiceImpl implements Orderservice {
             , String storeId
             , String trackingNo) {
 
+        boolean tigger = false;
         OrderPayResponse orderPayResponse = new OrderPayResponse();
-        boolean check = this.checkSvcComPay(orderBean.getCompanyId(), orderBean.getShopId());
+        tigger = true;
         //混合支付
-        if (check && StringUtils.isNotBlank(channel)) {
+        if (tigger && StringUtils.isNotBlank(channel)) {
             log.info("混合支付:");
             String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
             orderPayResponse = comPayOrder(cardCode,orderBean,paymentRequest,partnerPayOvertime,totalAmount.intValue(),channel,storeId,LogThreadLocal.getTrackingNo());
@@ -2528,13 +2450,10 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(), ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getMessage(), null);
     }
 
-    public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) {
+    public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime) {
         OrderPayResponse orderPayResponse;
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
-            if (orderExtInfoDto != null && StringUtils.isNotBlank(orderExtInfoDto.getStationId())) {
-                request.setStationId(orderExtInfoDto.getStationId());
-            }
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
                 log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
@@ -2627,7 +2546,7 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     public OrderExtInfoDto getExtInfo(AssortmentCustomerInfoVo userLoginInfoDto, StoreResponse.BizVO storeResponseDto,
-                                      Integer pushOrderTime, CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto ) {
+                                      Integer pushOrderTime, CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto) {
 
         Integer serviceTime = storeResponseDto.getServiceTime();
         String sessionId = createOrderVo.getSessionId();
@@ -3024,7 +2943,7 @@ public class OrderServiceImpl implements Orderservice {
         //唤起微信支付
         if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
             String partnerPayOvertime = this.getPartnerPayOvertime(createOrderVo.getPartnerId());
-            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount, fatherBeanListOne.getOid(), partnerPayOvertime, null);
+            orderPayResponse = getPreOrderPay(fatherBeanListOne, paymentRequest, LogThreadLocal.getTrackingNo(), cardAmount, fatherBeanListOne.getOid(), partnerPayOvertime);
             return orderPayResponse;
         }
         //储值卡支付
@@ -3298,7 +3217,7 @@ public class OrderServiceImpl implements Orderservice {
 
         if (combPayResponse==null || !ResponseCodeConstant.PAYMENT_RESPONSE_SUCCESS.equals(combPayResponse.getCode())) {
             log.info("混合支付返回信息错误,trackingNo:{} request:{} response:{}",trackingNo, JSONObject.toJSONString(combPayRequest), JSONObject.toJSONString(combPayResponse));
-            orderPayResponse.setMsg(combPayResponse!=null ? "支付："+combPayResponse.getMsg() :"混合支付忙不过来啦，请稍后再试");
+            orderPayResponse.setMsg(combPayResponse.getMsg());
             return orderPayResponse;
         }
         Integer svcAmount = 0;
@@ -3315,7 +3234,7 @@ public class OrderServiceImpl implements Orderservice {
                 .orElse(null);
 
         //现金+svc   现金
-        if (payPlatforms.size()==2 || (payPlatforms.size()==1 && cashPay!=null)) {
+        if (payPlatforms.size()==2 || payPlatforms.size()==1 && cashPay!=null) {
             orderPayResponse = orderAdapter.convent2OrderCombPayResponse(combPayResponse.getData().getPayPlatformResponseList(),orderBean.getCompanyId(),storeId);
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
@@ -3419,50 +3338,4 @@ public class OrderServiceImpl implements Orderservice {
     //    // TODO: 2019/9/10 hubowen mq推送变更
     //    backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
     //}
-
-
-    public void buildQueryOrderResponseVo(QueryOrderResponseVo queryOrderResponseVo,QueryOrderByIdResponse response) {
-
-        List<QueryOrderResponseVo.chooseGood> chooseGoods = new ArrayList<>();
-
-        List<OrderSendCouponResp> orderSendCouponRespList = response.getData().getOrderSendCouponRespList();
-
-        if(orderSendCouponRespList == null || orderSendCouponRespList.isEmpty()){
-            return;
-        }
-
-        orderSendCouponRespList.forEach(orderSendCouponResp -> {
-            QueryOrderResponseVo.chooseGood chooseGood = new QueryOrderResponseVo.chooseGood();
-            chooseGood.setGoodsName(orderSendCouponResp.getGoodsName());
-            chooseGoods.add(chooseGood);
-        });
-
-        queryOrderResponseVo.setChooseGoods(chooseGoods);
-
-    }
-    /**
-     * 获取混合支付是否开启
-     * @param partnerId
-     * @return
-     */
-    private boolean checkSvcComPay(String partnerId,String storeId) {
-        SvcComPayRequestDto requestDto = new SvcComPayRequestDto();
-        requestDto.setPartnerId(partnerId);
-        requestDto.setStoreId(storeId);
-        SvcComPayResponseDto query = null;
-        for (int i=0;i<3;i++) {
-            query = svcComPayClient.query(requestDto);
-            if (query!=null) break;
-        }
-        log.info("order checkSvcComPay:{}",JSON.toJSONString(query));
-        if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
-            return false;
-        }
-        if (query.getResult()!=null && query.getResult().getValue()) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
 }

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

 package cn.freemud.service.thirdparty;
 
-import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.BaseResponseDto;
 import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.delivery.QueryDeliveryAmountRequestDto;
@@ -28,5 +26,7 @@ public interface DeliveryFeiginClient {
     MCCafeDeliveryBaseResponse<ResRiderTrackDto> listFreeRider(@RequestBody QueryLocusRiderTrackDto request);
 
 
+    @PostMapping("/delivery/getDeliveryStatusAndRiderPosition")
+    DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> queryDeliveryStatusAndRiderPosition(@RequestBody QueryDeliveryBaseRequest queryDeliveryBaseRequest);
 
 }

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.wechat.GetAuthorizerRequestDto;
@@ -28,4 +30,7 @@ public interface EcologyAdminApplicationClient {
     @PostMapping(value = "/ecology/api/getAuthorizerAccessToken")
     GetTokenResponseDto getAuthorizerAccessToken(@RequestBody GetAuthorizerRequestDto request);
 
+    @PostMapping(value = "/ecology/api/subscribeMessage/send")
+    SubscribeMessageResponse subscribeMessage(SubscribeMessageRequest request);
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderOperationHistoryResp.java

@@ -17,7 +17,7 @@ import lombok.Data;
 @Data
 public class OrderOperationHistoryResp {
 
-    private Long createTime;
+    private String createTime;
     //操作描述
     private String operationDesc;
     //操作方法