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/OrderRepairServiceImpl.java

@@ -442,7 +442,7 @@
            if (commonOrder.getState() == CommonOrder.STATE_JS)

               payMent = commonOrder.getSettlement();

            if (payMent.compareTo(new BigDecimal(10)) < 0) {

               mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getOrderNo());

               mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getSourceType(),commonOrder.getOrderNo());

            }

         }