Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java

@@ -43,9 +43,12 @@
         if (find != null) {

            return false;

         }



         Integer orderType = order.getOrderType();

         if (orderType == null) {

            orderType = Order.ORDER_TYPE_TAOBAO;

         }

         // 查找是否存在分享赚订单

         if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS) > 0)

         if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS, orderType) > 0)

            return false;

         orderMapper.insertSelective(order);

      } finally {