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

admin

2020-06-29 48934b8c3da5a6791d0805ff0c1d327da834cc2d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -809,7 +809,7 @@
            long currentTime = java.lang.System.currentTimeMillis();

            if (endDay.getTime() > currentTime && !vip) {

               UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo,

                     null);

                     sourceType, null);

               if (couponRecord == null) {

                  orderRebateVO.setCoupon(true);

                  orderRebateVO.setCouponType(1);