From e52365c05872f09b8cd047b7e72200a39440abe8 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 11 Jan 2023 15:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diam?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderPayBeforeServiceImpl.java  | 16 +++++++++-------
 .../hai/order/service/impl/OrderServiceImpl.java |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java
index c0c567bd..7982d0bf 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java
@@ -1,13 +1,12 @@
 package com.hai.order.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.config.WxOrderConfig;
-import com.hai.entity.HighChildOrder;
-import com.hai.entity.HighGasChannelConfig;
-import com.hai.entity.HighMerchantTripartitePlatform;
-import com.hai.entity.HighOrder;
+import com.hai.entity.*;
 import com.hai.enum_type.GasChannel;
 import com.hai.enum_type.GasChannelPayPlatformType;
 import com.hai.enum_type.MerchantStoreSourceType;
@@ -19,6 +18,8 @@ import com.hai.service.HighGasService;
 import com.hai.service.HighMerchantStoreService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * @className: payOrderCheckImpl
  * @author: HuRui
@@ -27,17 +28,18 @@ import org.springframework.stereotype.Service;
 @Service("orderPayBeforeService")
 public class OrderPayBeforeServiceImpl implements OrderPayBeforeService {
 
+    @Resource
     private HighMerchantStoreService merchantStoreService;
-
+    @Resource
     private HighGasService gasService;
-
+    @Resource
     private HighGasChannelConfigService gasChannelConfigService;
 
     @Override
     public void payOrderCheck(HighOrder order) {
         if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE6.getNumber())) {
             // 查询油站
-            HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(order.getHighChildOrderList().get(0).getGoodsId());
+            HighMerchantStore store = merchantStoreService.getDetailById(order.getHighChildOrderList().get(0).getGoodsId());
             if (store == null) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的加油站");
             }
diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
index 23b36ea2..7dc57fa8 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
@@ -421,7 +421,7 @@ public class OrderServiceImpl implements OrderService {
 
         } else if (orderData.getOrderStatus().equals(OrderStatus.STATUS2.getNumber())) {
             // 支付校验
-            orderPayBeforeService.payOrderCheck(orderData);
+            orderPayBeforeService.payOrderCheck(order);
             // 处理业务
             return paySuccessService.orderPaySuccessHandle(orderData.getOrderNo(), OrderPayType.PAY_TYPE3, null, new BigDecimal("0"), null);
         }