Merge branch '2.0-master' into 2.0-dev

# Conflicts:
#	hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
#	hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

hai-service/src/main/java/com/hai/order/utils/OrderUtil.java

@@ -51,7 +51,7 @@ public class OrderUtil {
      * @return
      * @throws Exception
      */
-    public static String generateOrderNo()  {
+    public static String generateOrderNo(){
         try {
             // 5位随机数 + 1位线程生成数
             String randomNum = (new Random().nextInt(8999) + 1000) + IDGenerator.nextId(1);
@@ -60,7 +60,6 @@ public class OrderUtil {
         } catch (Exception e) {
             return null;
         }
-
     }
 
     /**

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -1001,11 +1001,13 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         return childOrder;
     }
 
+
     @Override
     public boolean rechargeOrderAbnormal(OutRechargeOrder order) {
 
         HighOrder highOrder = highOrderService.getOrderByOrderNo(order.getOrderNo());
 
+
         if (secConfigService.isConfig("RECHARGE_ORDER" , order.getRechargeContent())) {
             highOrder.setExceptionStatus(true);
             highOrder.setExceptionContent("当前订单存在以前多充值！");
@@ -1014,13 +1016,16 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             outRechargeOrderMapper.updateByPrimaryKey(order);
             return true;
         }
-        if (secConfigService.isConfig("RECHARGE_ORDER" , order.getLaborUnionCard())) {
+        if (highOrder.getPayType() == 4) {
-            highOrder.setExceptionStatus(true);
+
-            highOrder.setExceptionContent("当前订单存在以前多充值！");
+            if (secConfigService.isConfig("RECHARGE_ORDER" , order.getLaborUnionCard())) {
-            order.setRechargeStatus(204);
+                highOrder.setExceptionStatus(true);
-            orderService.updateOrderData(highOrder);
+                highOrder.setExceptionContent("当前订单存在以前多充值！");
-            outRechargeOrderMapper.updateByPrimaryKey(order);
+                order.setRechargeStatus(204);
-            return true;
+                orderService.updateOrderData(highOrder);
+                outRechargeOrderMapper.updateByPrimaryKey(order);
+                return true;
+            }
         }
 
         return false;