对接配置支付时间

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

@@ -62,6 +62,12 @@ public class ExposureOrderController {
         return ResponseUtil.success(exposureOrderService.getPaySuccessData(request));
     }
 
+    @ApiAnnotation(logMessage = "获取超时时间, 生成取餐码，上线后删除getPaySuccessData")
+    @PostMapping("/getPaySuccessDataV2")
+    public BaseResponse<PaySuccessDataVo> getPaySuccessDataV2(@Validated @LogParams @RequestBody GetPaySuccessDataV2Request request) {
+        return ResponseUtil.success(exposureOrderService.getPaySuccessDataV2(request));
+    }
+
 
     /**
      * 发送支付成功模板消息

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class GetPaySuccessDataV2Request {
+
+    private Integer orderType;
+
+    private String orderClient;
+
+    private String partnerId;
+
+    private String storeId;
+
+    /**
+     * 订单业务类型 1:普通订单 2:虚拟订单
+     */
+    private Integer bizType;
+
+    /**
+     * 订单特殊类型
+     */
+    private Integer marketingType;
+}

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

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+public class QueryByKeysReq {
+
+    /**
+     * 商户号
+     */
+    private  String partnerId;
+
+    /**
+     * 订单类型
+     * 外卖先付 UNPAID_TIMEOUT_CLOSE_TIME_WMXF
+     * 堂食先付 UNPAID_TIMEOUT_CLOSE_TIME_TSXF
+     * 堂食后付 UNPAID_TIMEOUT_CLOSE_TIME_TSHF
+     */
+    private List<String> configNames = Arrays.asList("UNPAID_TIMEOUT_CLOSE_TIME_WMXF","UNPAID_TIMEOUT_CLOSE_TIME_TSXF","UNPAID_TIMEOUT_CLOSE_TIME_TSHF");
+
+    public QueryByKeysReq(String partnerId) {
+        this.partnerId = partnerId;
+    }
+}

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

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+@Data
+public class QueryByKeysResp {
+
+    /**
+     * 外卖先付 UNPAID_TIMEOUT_CLOSE_TIME_WMXF
+     * 堂食先付 UNPAID_TIMEOUT_CLOSE_TIME_TSXF
+     * 堂食后付 UNPAID_TIMEOUT_CLOSE_TIME_TSHF
+     */
+    private  String configName;
+
+    /**
+     * 单位分钟
+     */
+    private  String configValue;
+
+}

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

 package cn.freemud.service;
 
+import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.GetMallPayConfigVo;
 import cn.freemud.entities.vo.GetPayConfigVo;
 import cn.freemud.entities.vo.GetPaySuccessDataRequest;
+import cn.freemud.entities.vo.GetPaySuccessDataV2Request;
 import cn.freemud.entities.vo.order.PayConfigVo;
 import cn.freemud.entities.vo.order.PaySuccessDataVo;
+import cn.freemud.entities.vo.order.QueryByKeysReq;
+import cn.freemud.entities.vo.order.QueryByKeysResp;
 import cn.freemud.enums.AggregationTypeEnum;
 import cn.freemud.enums.OrderTackCodeFactory;
 import cn.freemud.enums.TakeCodeOrderType;
 import cn.freemud.manager.OrderTackCodeManager;
 import cn.freemud.service.business.impl.OrderBusinessServiceImpl;
 import cn.freemud.service.impl.PayServiceImpl;
+import cn.freemud.service.thirdparty.OrderServiceClient;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
 import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
+import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * @author Clover.z
  * @version 1.0.0
@@ -30,6 +41,7 @@ public class ExposureOrderService {
     private final OrderTackCodeManager orderTackCodeManager;
     private final OrderBusinessServiceImpl orderBusinessService;
     private final OrderCenterSdkAdapter orderCenterSdkAdapter;
+    private final OrderServiceClient orderServiceClient;
 
     public PayConfigVo getPayConfig(GetPayConfigVo req) {
         PayConfigVo vo = new PayConfigVo();
@@ -57,6 +69,46 @@ public class ExposureOrderService {
         return vo;
     }
 
+    /**
+     * 获取超时时间, 生成取餐码，上线后删除getPaySuccessData
+     * @param reqVo
+     * @return
+     */
+    public PaySuccessDataVo getPaySuccessDataV2(GetPaySuccessDataV2Request reqVo) {
+        Integer type = TakeCodeOrderType.getTakeCodeOrderType(reqVo.getOrderType());
+        String takeCode = orderTackCodeManager.generateTackCode(type,
+                reqVo.getPartnerId(),
+                reqVo.getStoreId(),
+                null,
+                OrderTackCodeFactory.getByOrderClient(reqVo.getOrderClient()).getGenerateTackCodeFunc());
+
+        Integer timeout = 0;
+        //查询待支付订单时效配置
+        BaseResponse<List<QueryByKeysResp>> listBaseResponse = orderServiceClient.queryByKeys(new QueryByKeysReq(reqVo.getPartnerId()));
+        if (listBaseResponse == null || !Objects.equals("100", listBaseResponse.getCode())) {
+            timeout = 30;
+        }
+        Integer v1Type = orderCenterSdkAdapter.getOldOrderType(reqVo.getOrderType());
+        for(QueryByKeysResp resp : listBaseResponse.getResult()){
+            // 外卖订单
+            if (Objects.equals(v1Type, OrderTypeV1.TAKE_OUT.getCode()) && Objects.equals("UNPAID_TIMEOUT_CLOSE_TIME_WMXF",resp.getConfigName())) {
+                timeout = Integer.valueOf(resp.getConfigValue());
+            }else if(Objects.equals(reqVo.getBizType(), BizTypeEnum.ORDINARY.getBizType()) && (Objects.equals(reqVo.getMarketingType(), MarketTypeEnum.ORDER.getIndex()) || Objects.equals(reqVo.getMarketingType(), MarketTypeEnum.CASHIER.getIndex()) )
+                && Objects.equals("UNPAID_TIMEOUT_CLOSE_TIME_TSXF",resp.getConfigName())){
+                //堂食先付
+                timeout = Integer.valueOf(resp.getConfigValue());
+            }else if(Objects.equals(reqVo.getBizType(), BizTypeEnum.ORDINARY.getBizType()) && Objects.equals(reqVo.getMarketingType(), MarketTypeEnum.POST_ORDER.getIndex())
+                    && Objects.equals("UNPAID_TIMEOUT_CLOSE_TIME_TSHF",resp.getConfigName())){
+                //堂食后付
+                timeout = Integer.valueOf(resp.getConfigValue());
+            }
+        }
+        PaySuccessDataVo vo = new PaySuccessDataVo();
+        vo.setTakeCode(takeCode);
+        vo.setTimeout(timeout);
+        return vo;
+    }
+
 
     /**
      * 新商城支付门店配置

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

@@ -2,6 +2,8 @@ package cn.freemud.service.thirdparty;
 
 import cn.freemud.entities.vo.order.EditLogisticsReq;
 import cn.freemud.entities.vo.order.DirectDeliveryReq;
+import cn.freemud.entities.vo.order.QueryByKeysReq;
+import cn.freemud.entities.vo.order.QueryByKeysResp;
 import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.QueryInvoiceRepDto;
@@ -81,4 +83,11 @@ public interface OrderServiceClient {
     @PostMapping(value = "/order/v2/directDelivery")
     BaseResponse directDelivery(@RequestBody DirectDeliveryReq DeditLogisticsReq);
 
+    /**
+     * 查询待支付订单时效配置
+     */
+    @LogIgnoreFeign(logMessage="queryByKeys")
+    @PostMapping(value = "/order/config/queryByKeys")
+    BaseResponse<List<QueryByKeysResp>> queryByKeys(@RequestBody QueryByKeysReq req);
+
 }

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

@@ -14,6 +14,7 @@ public enum MarketTypeEnum {
     SVC(8, "储值卡充值"),
     WE_CHAT_LIVE_SELL(9, "微信视频号卖券"),
     TIKTOK_MARKET_ORDER(11, "抖音卖券换购营销"),
+    POST_ORDER(12, "多人点单后付"),
     ;
 
     private Integer index;