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

yujian

2019-09-25 3c1f04d76fdd1f60bd78696f8a1aac6dafbbb543

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

@@ -649,7 +649,7 @@
            Date thirdCreateTime = order.getThirdCreateTime();

            if (thirdCreateTime != null) {

               long downOrderTime = thirdCreateTime.getTime();

               long limitDate = TimeUtil.convertDateToTemp("2019-09-05");

               long limitDate = TimeUtil.convertDateToTemp("2019-09-10");

               if (downOrderTime > limitDate)

                  hasRewardCoupon = true;

            }