From 415a13e8ec4f805e87a9d4e64849cd8180b2087c Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 15 Jan 2024 10:06:37 +0800
Subject: [PATCH] Merge branch 'new-dev' into 2.0-dev

# Conflicts:
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java
---
 .../hai/order/service/impl/OrderPaySuccessServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
index 60ba6544..e916ba4e 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
@@ -261,9 +261,9 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
             } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE13.getNumber())) {
                 blxOrderHandle(order);
             } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE14.getNumber())) {
-                oilCardHandle(childOrder.getGoodsSpecName(), order);
-            } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE15.getNumber())) {
                 levelUp(order);
+            } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE15.getNumber())) {
+                oilCardHandle(childOrder.getGoodsSpecName(), order);
             } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE17.getNumber())) {
                 group(order);
             } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE18.getNumber())) {