Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java

@@ -83,6 +83,18 @@
        Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
        params.putAll(roleOrgMap);
        List<ProductOrderJoinDetail> list = baseMapper.findAllList(page, params);
        for (ProductOrderJoinDetail productOrderJoinDetail : list) {
            Date proBegintime = productOrderJoinDetail.getProBegintime();
            Date proEndtime = productOrderJoinDetail.getProEndtime();
            Date nowDate = new Date();
            if(nowDate.getTime()<proBegintime.getTime()){
                productOrderJoinDetail.setUseType("未使用");
            }else if (proBegintime.getTime()<=nowDate.getTime()&&nowDate.getTime()<proEndtime.getTime()){
                productOrderJoinDetail.setUseType("使用中");
            }else if(nowDate.getTime()>=proEndtime.getTime()){
                productOrderJoinDetail.setUseType("已结束");
            }
        }
        return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build();
    }