添加套餐使用的状态

zhaoxiaohao

2020-09-10 d925c8b3e7a95e3618e53daa08c5c3160536dbf3

添加套餐使用的状态

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java

@@ -105,4 +105,9 @@
     * 状态，1启用，0停用
     */
    private Boolean enabled;

    /**
     * 使用状态
     */
    private String useType;
}

 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();
    }