parent: aec36e0e | 补丁 | 提交 | ignore whitespace
yujian
2019-09-23 793ae2db932b509d6fe3412a62ab20183960b794 
奖励券 更改为9月10之后可用
2个文件已修改
4 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java


@@ -199,7 +199,7 @@


        }



        



        boolean valid = false;



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



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



        for (CommonOrder commonOrder: listOrder) {



            Integer wholeOrder = commonOrder.getStateWholeOrder();



            if (wholeOrder != null && CommonOrder.STATE_WHOLE_ORDER_SHIXIAO ==  wholeOrder) {





 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;



                }