Merge branch 'feature/去除支付超时时间' into qa

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

@@ -57,12 +57,6 @@ public class ExposureOrderController {
 
 
     @ApiAnnotation(logMessage = "获取超时时间, 生成取餐码")
-    @PostMapping("/getPaySuccessData")
-    public BaseResponse<PaySuccessDataVo> generateTackCode(@Validated @LogParams @RequestBody GetPaySuccessDataRequest request) {
-        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/GetPaySuccessDataRequest.java

-package cn.freemud.entities.vo;
-
-import lombok.Data;
-
-@Data
-public class GetPaySuccessDataRequest {
-
-    private Integer orderType;
-
-    private String orderClient;
-
-    private String partnerId;
-
-    private String storeId;
-
-
-}

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

@@ -16,11 +16,6 @@ public class PayConfigVo {
     private String principalName;
 
     /**
-     * 支付超时时间
-     */
-    private String payTimeOut;
-
-    /**
      * 门店支付编号
      */
     private String payCode;

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

@@ -43,31 +43,13 @@ public class ExposureOrderService {
     public PayConfigVo getPayConfig(GetPayConfigVo req) {
         PayConfigVo vo = new PayConfigVo();
         vo.setPrincipalName(payService.getPaymentPrincipalName(req.getPartnerId(), req.getAppId()));
-        vo.setPayTimeOut(payService.getPartnerPayOvertime(req.getPartnerId()));
         vo.setPayCode(payService.getPayCodeByCondition(req.getAppId(), req.getStoreId(), req.getChannel()));
         return vo;
     }
 
-    public PaySuccessDataVo getPaySuccessData(GetPaySuccessDataRequest reqVo) {
-        Integer type = TakeCodeOrderType.getTakeCodeOrderType(reqVo.getOrderType());
-        String takeCode = orderTackCodeManager.generateTackCode(type,
-                reqVo.getPartnerId(),
-                reqVo.getStoreId(),
-                null,
-                OrderTackCodeFactory.getByOrderClient(reqVo.getOrderClient()).getGenerateTackCodeFunc());
-
-        Integer v1Type = orderCenterSdkAdapter.getOldOrderType(reqVo.getOrderType());
-        Integer timeout = orderBusinessService.getPaySuccessTimeout(reqVo.getPartnerId(),
-                reqVo.getStoreId(),
-                v1Type);
-        PaySuccessDataVo vo = new PaySuccessDataVo();
-        vo.setTakeCode(takeCode);
-        vo.setTimeout(timeout);
-        return vo;
-    }
 
     /**
-     * 获取超时时间, 生成取餐码，上线后删除getPaySuccessData
+     * 获取超时时间, 生成取餐码
      * @param reqVo
      * @return
      */
@@ -79,7 +61,7 @@ public class ExposureOrderService {
                 null,
                 OrderTackCodeFactory.getByOrderClient(reqVo.getOrderClient()).getGenerateTackCodeFunc());
 
-        Integer timeout = 0;
+        int timeout = 0;
         //查询待支付订单时效配置
         BaseResponse<List<QueryByKeysResp>> listBaseResponse = orderServiceClient.queryByKeys(new QueryByKeysReq(reqVo.getPartnerId()));
         if (listBaseResponse == null || !Objects.equals("100", listBaseResponse.getCode())) {
@@ -89,15 +71,15 @@ public class ExposureOrderService {
         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());
+                timeout = Integer.parseInt(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())){
+                    && Objects.equals("UNPAID_TIMEOUT_CLOSE_TIME_TSXF",resp.getConfigName())){
                 //堂食先付
-                timeout = Integer.valueOf(resp.getConfigValue());
+                timeout = Integer.parseInt(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());
+                timeout = Integer.parseInt(resp.getConfigValue());
             }
         }
         PaySuccessDataVo vo = new PaySuccessDataVo();
@@ -113,7 +95,6 @@ public class ExposureOrderService {
     public PayConfigVo getMallPayConfig(GetMallPayConfigVo req) {
         PayConfigVo vo = new PayConfigVo();
         vo.setPrincipalName(payService.getPaymentPrincipalName(req.getPartnerId(), req.getAppId()));
-        vo.setPayTimeOut(payService.getPartnerPayOvertime(req.getPartnerId()));
         AssortmentOpenPlatformIappWxappStore wxAppStore = payService.getIappWxappStoreInfo(req.getAppId(), AggregationTypeEnum.TYPE_7.getCode());
         if (wxAppStore == null) {
             wxAppStore = new AssortmentOpenPlatformIappWxappStore();

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

@@ -452,11 +452,11 @@ public class PayServiceImpl {
         paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
         paymentRequest.setPayCode(payCode);
 //        if ("2080".equals(partnerId)) {
-            //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
+        //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
 //            paymentRequest.setPrincipalName("蜜雪冰城" + storeId + "店");
 //        } else {
-            // saas 查询小程序配置
-            paymentRequest.setPrincipalName(this.getPaymentPrincipalName(partnerId, appId));
+        // saas 查询小程序配置
+        paymentRequest.setPrincipalName(this.getPaymentPrincipalName(partnerId, appId));
 //        }
         return paymentRequest;
     }
@@ -585,51 +585,51 @@ public class PayServiceImpl {
         }
         //使用支付FeignClient
 //        if (usePayFeignClient) {
-            orderPayResponse = new OrderPayResponse();
-            String clientCode = this.getPayCodeByChanel(paymentRequest.getWxAppId(), orderBean.getShopId());
-            if (StringUtils.isBlank(clientCode)) {
-                orderPayResponse.setMsg("请先联系相关人员配置商户对应的支付渠道");
-                return orderPayResponse;
-            }
-            requestDto.setClientCode(Long.parseLong(clientCode));
+        orderPayResponse = new OrderPayResponse();
+        String clientCode = this.getPayCodeByChanel(paymentRequest.getWxAppId(), orderBean.getShopId());
+        if (StringUtils.isBlank(clientCode)) {
+            orderPayResponse.setMsg("请先联系相关人员配置商户对应的支付渠道");
+            return orderPayResponse;
+        }
+        requestDto.setClientCode(Long.parseLong(clientCode));
 //            com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> response = paymentNewClient.unifiedOrder(requestDto);
-            com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> response = null;
-            //处理超时情况，后续冲正mq正常冲正，同支付sdk逻辑
-            try {
-                response = this.unifiedOrder(requestDto);
-            } catch (Exception e) {
-                AppLogUtil.errorLog("获取预支付信息异常", JSONObject.toJSONString(requestDto), null, e);
-            }
-            //预支付接口失败
-            if (null == response || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, response.getCode())
-                    || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getData().getResultCode())) {
-                String errorMessage = "unified fail";
-                if (null != response) {
-                    errorMessage = StringUtils.isNotEmpty(response.getMessage()) ? response.getMessage() : response.getData().getResultMsg();
-                }
-                //打印业务异常
-                if (response != null && printUnifiedPayResponseError) {
-                    AppLogUtil.errorLog("获取预支付信息失败", JSONObject.toJSONString(requestDto), JSONObject.toJSONString(response), null);
-                }
-                //预支付失败需要把原因进行记录
-                orderPayResponse.setMsg(errorMessage);
-                return orderPayResponse;
-            }
-            putDelMq(request.getPartnerId(), request.getStoreId(), response.getData().getFmId(), orderBean.getOid(), null);
-            this.convent2CreateOrderResponseVo(orderPayResponse, paymentRequest.getWxAppId(), response.getData());
-            orderPayResponse.setOpenId(paymentRequest.getOpenId());
-            orderPayResponse.setPartnerId(orderBean.getCompanyId());
-            orderPayResponse.setOrderId(orderBean.getOid());
-            orderPayResponse.setPayChannelType(PayChannelType.WECHAT);
-            if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())
-                    && !orderPayResponse.getPayOrder().getAliPayOrder().startsWith("wx")) {
-                orderPayResponse.setPayChannelType(PayChannelType.ALIPAY);
+        com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> response = null;
+        //处理超时情况，后续冲正mq正常冲正，同支付sdk逻辑
+        try {
+            response = this.unifiedOrder(requestDto);
+        } catch (Exception e) {
+            AppLogUtil.errorLog("获取预支付信息异常", JSONObject.toJSONString(requestDto), null, e);
+        }
+        //预支付接口失败
+        if (null == response || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, response.getCode())
+                || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getData().getResultCode())) {
+            String errorMessage = "unified fail";
+            if (null != response) {
+                errorMessage = StringUtils.isNotEmpty(response.getMessage()) ? response.getMessage() : response.getData().getResultMsg();
             }
-            //抖音支付
-            if (PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())) {
-                orderPayResponse.setPayChannelType(PayChannelType.TIKTOKPAY);
+            //打印业务异常
+            if (response != null && printUnifiedPayResponseError) {
+                AppLogUtil.errorLog("获取预支付信息失败", JSONObject.toJSONString(requestDto), JSONObject.toJSONString(response), null);
             }
+            //预支付失败需要把原因进行记录
+            orderPayResponse.setMsg(errorMessage);
             return orderPayResponse;
+        }
+        putDelMq(request.getPartnerId(), request.getStoreId(), response.getData().getFmId(), orderBean.getOid(), null);
+        this.convent2CreateOrderResponseVo(orderPayResponse, paymentRequest.getWxAppId(), response.getData());
+        orderPayResponse.setOpenId(paymentRequest.getOpenId());
+        orderPayResponse.setPartnerId(orderBean.getCompanyId());
+        orderPayResponse.setOrderId(orderBean.getOid());
+        orderPayResponse.setPayChannelType(PayChannelType.WECHAT);
+        if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())
+                && !orderPayResponse.getPayOrder().getAliPayOrder().startsWith("wx")) {
+            orderPayResponse.setPayChannelType(PayChannelType.ALIPAY);
+        }
+        //抖音支付
+        if (PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())) {
+            orderPayResponse.setPayChannelType(PayChannelType.TIKTOKPAY);
+        }
+        return orderPayResponse;
 //        }
 //        com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
 //        if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
@@ -1392,7 +1392,7 @@ public class PayServiceImpl {
         paymentQueryOrderRequest.setPartnerId(refundRequest.getPartnerId());
         paymentQueryOrderRequest.setStoreId(refundRequest.getStoreId());
         paymentQueryOrderRequest.setFrontTransId(refundRequest.getOrgTransId());
-       com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = null;
+        com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = null;
         try {
             payQueryOrderResponse = omsPaymentClient.payQueryOrder(paymentQueryOrderRequest);
         }catch (Exception e){