Merge remote-tracking branch 'origin/div' into div

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -840,7 +840,7 @@
         throw new UserSystemCouponException(1, "订单信息获取失败");



      // 版本区分：2.0.2

      if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {

      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         Date thirdCreateTime = orderVO.getThirdCreateTime();

         if (thirdCreateTime != null) {

            long downOrderTime = thirdCreateTime.getTime();