Merge branch '2.0-dev' into new-dev

# Conflicts: # hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
11 months ago · f5d6281c4c
parent 4deb3dfbe3 f16c2cc000
commit f5d6281c4c
3 changed files with 9 additions and 10 deletions
--- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
--- 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
@ -258,11 +258,11 @@ 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.TYPE17.getNumber())) {
                group(order);
-            } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE15.getNumber())) {
-                oilCardHandle(childOrder.getGoodsSpecName(), order);
            } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE18.getNumber())) {
                petroCoupon(order , childOrder);
            }
--- a/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java
@ -55,12 +55,11 @@ public class ApiIpAddressServiceImpl implements ApiIpAddressService {
    @Override
    public Boolean validationIpAddressLegal(String mchId, String ipAddress) {

-//        ApiIpAddressExample example  = new ApiIpAddressExample();
-//        example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%");
-//
-//        List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example);
-//
-//        return list.size()>0;
-        return  true;
+        ApiIpAddressExample example  = new ApiIpAddressExample();
+        example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%");
+
+        List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example);
+
+        return list.size()>0;
    }
 }