Merge branch 'feature/订单宝快餐点餐支持取消订单' into qa

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

@@ -12,6 +12,7 @@ import cn.freemud.service.impl.PayServiceImpl;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -112,6 +113,8 @@ public class ExposureOrderController {
 
     /**
      * 公共支付接口查询mq,死信队列
+     * 支付回调的url必须在订单ext里的payCallbackUrl属性
+     * @see OrderExtInfoDto#getPayCallbackUrl()
      */
     @ApiAnnotation(logMessage = "支付结果查询mq-(会员，点餐下单公共),死信队列")
     @PostMapping("/payQueryMq")

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

@@ -134,15 +134,13 @@ public class OrderQueueService {
     public void putPayQueryDelMq(PaymentMqMessageDto dto) {
         MQMessage<PaymentMqMessageDto> mqMessage = new MQMessage<PaymentMqMessageDto>();
         mqMessage.setBody(dto);
-        Integer ttl = 20 * 1000;
         Header header = new Header();
         header.setKey("1");
         mqMessage.setHeader(header);
         byte[] notifyMsgBytes = JSON.toJSONString(mqMessage).getBytes();
         MessageProperties messageProperties = new MessageProperties();
-        messageProperties.setExpiration(ttl.toString());
+        messageProperties.setExpiration("5000"); //5秒
         messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON);
-        Message delmessage = new Message(notifyMsgBytes, messageProperties);
-        mqService.convertAndSend(TopicExchangeConfig.EXCHANGE_NAME, DlPayQueryMqConfig.KGD_PAY_QUERY_DL_KEY, delmessage);
+        mqService.convertAndSend(TopicExchangeConfig.EXCHANGE_NAME, DlPayQueryMqConfig.KGD_PAY_QUERY_DL_KEY, new Message(notifyMsgBytes, messageProperties));
     }
 }

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

@@ -337,7 +337,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
             return ResponseUtil.success();
         }
         List<Integer> newOrderStatusList = Arrays.asList(OrderStatusV1.RECEIPT.getV2Code(), OrderStatusV1.COMPLETE.getV2Code(), OrderStatusV1.COMPLETE_MAKE.getV2Code());
-        List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(), OrderSourceV1.ALIPAY.getCode(), OrderSourceV1.APP.getCode());
+        List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(), OrderSourceV1.ALIPAY.getCode(), OrderSourceV1.ALAPOS.getCode());
         if (sourceList.contains(orderBean.getSource()) && newOrderStatusList.contains(orderBean.getStatusV2())) {
             return cancelDeliveryAndOrder(request, orderBean);
         } else if (OrderSourceV1.MEAL.getCode().equals(orderBean.getSource())) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderSourceV1.java

@@ -35,6 +35,7 @@ public enum  OrderSourceV1 {
 //    BEAUTIFUL("beautiful","美业", 28),
     ASSISTANT("assistant","非码小助手", 29),
     SHERPAS("sherpas","食派士", 30),
+    ALAPOS("alapos","订单宝", 38),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     ;

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

@@ -210,11 +210,10 @@ public class OrderExtInfoDto {
     private String saleCouponPhone;
 
     /**
-     * 【华莱士】【订单C端记录不分账的卡面编号】不让走分账，卡面编号--11840，11845，11846，11853，11854，11855，11857，11858，11859，11860，11861，11862，11863，11864，11865，11866，11906
-     *
-     *  1 表示不分账 ,其他情况 不传值 给基础服务
+     * 支付成功回调通知url
+     * 记录在ext中， 支付成功补偿任务中会取
      */
-//    private Integer unDistribution;
+    private String payCallbackUrl;
 
 
     /**