hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new-dev' into 2.0-dev

Browse Source 
# 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
master
袁野 10 months ago
parent 7ed69e6279
commit 415a13e8ec
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java

4
hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
Unescape View File

@ -261,9 +261,9 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE13.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE13.getNumber())) {
blxOrderHandle(order); blxOrderHandle(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE14.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE14.getNumber())) {
oilCardHandle(childOrder.getGoodsSpecName(), order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE15.getNumber())) {
levelUp(order); levelUp(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE15.getNumber())) {
oilCardHandle(childOrder.getGoodsSpecName(), order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE17.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE17.getNumber())) {
group(order); group(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE18.getNumber())) { } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE18.getNumber())) {

Write Preview
Loading…
Cancel
Save