From c58a42aa1acc821e0c3e748de7205e58af6c350b Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Tue, 01 Sep 2020 16:44:25 +0800 Subject: [PATCH] 1.修改充值页面,可支持修改起始结束时间 2.修改添加医院/医生页面,增加自动选择当前服务/销售人员 3.调整页面部分显示细节问题 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java index 460c42b..213bb71 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java @@ -5,10 +5,12 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysUser; import com.kidgrow.common.service.impl.SuperServiceImpl; +import com.kidgrow.common.utils.DateUtil; import com.kidgrow.oprationcenter.feign.RoleOrganizationService; import com.kidgrow.oprationcenter.mapper.SysProductMapper; import com.kidgrow.oprationcenter.model.SysProduct; import com.kidgrow.oprationcenter.service.ISysProductService; +import com.kidgrow.oprationcenter.vo.ProductAllVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +47,36 @@ List<SysProduct> list = baseMapper.findList(page, params); return PageResult.<SysProduct>builder().data(list).code(0).count(page.getTotal()).build(); } + /** + * 列表 + * @param params + * @return + */ + @Override + public PageResult<ProductAllVo> findAllList(Map<String, Object> params, SysUser sysUser){ + List<ProductAllVo> list = baseMapper.findAllList(params); + if (list != null) { + for (int i = 0; i <list.size() ; i++) { + list.get(i).setBeginTime(new Date()); + switch (list.get(i).getProTimeUnit()) + { + //天 + case 0: + list.get(i).setEndTime(DateUtil.addDays(new Date(),list.get(i).getProTime())); + break; + //月 + case 1: + list.get(i).setEndTime(DateUtil.addMonths(new Date(),list.get(i).getProTime())); + break; + //年 + case 2: + list.get(i).setEndTime(DateUtil.addYears(new Date(),list.get(i).getProTime())); + break; + } + } + } + return PageResult.<ProductAllVo>builder().data(list).code(0).count(0L).build(); + } /** * 根据SysProduct对象当做查询条件进行查询 -- Gitblit v1.8.0