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
10 months ago · 415a13e8ec
parent 7ed69e6279
commit 415a13e8ec
1 changed files with 2 additions and 2 deletions
--- 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())) {