From 5d971aadea398a175e50b32371afb037d16b4bf7 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Mon, 15 Jun 2020 11:18:46 +0800 Subject: [PATCH] 1.用户注册,消费记录,续费记录,添加用户,重置密码,设为管理员接口增加 2.修改管理后台关联的改动。 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 75 insertions(+), 7 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java index 0207031..acdfb9a 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java @@ -1,21 +1,28 @@ package com.kidgrow.oprationcenter.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kidgrow.common.model.PageResult; -import com.kidgrow.common.model.ResultBody; +import com.kidgrow.common.model.*; import com.kidgrow.common.service.impl.SuperServiceImpl; +import com.kidgrow.common.utils.DateUtils; import com.kidgrow.oprationcenter.feign.DiagnosticService; +import com.kidgrow.oprationcenter.feign.RoleOrganizationService; import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.service.IProductOrderDetailService; +import com.kidgrow.oprationcenter.vo.DiagnosisRecord; import com.kidgrow.oprationcenter.vo.GroupProductDetail; import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; +import com.kidgrow.usercenter.feign.SysDoctorService; +import com.kidgrow.usercenter.feign.SysHospitalService; +import com.kidgrow.usercenter.model.SysHospital; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,6 +39,12 @@ public class ProductOrderDetailServiceImpl extends SuperServiceImpl<ProductOrderDetailMapper, ProductOrderDetail> implements IProductOrderDetailService { @Autowired DiagnosticService diagnosticService; + @Autowired + private RoleOrganizationService roleOrganizationService; + @Autowired + private SysDoctorService sysDoctorService; + @Autowired + private SysHospitalService sysHospitalService; /** * 列表 * @param params @@ -44,15 +57,23 @@ return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build(); } /** - * 列表 + * 获取已购买产品列表 * @param params * @return */ @Override - public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params) { - Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); - List<ProductOrderJoinDetail> list = baseMapper.findAllList(page,params); - return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build(); + public List<ProductOrderJoinDetail> findAllList(Map<String, Object> params){ + return baseMapper.findAllList(params); + } + + /** + * 获取诊断列表 + * @param params + * @return + */ + @Override + public PageResult<DiagnosisRecord> findAllDataList(Map<String, Object> params){ + return diagnosticService.getDiagnosticItemList(params).getData(); } /** @@ -95,4 +116,51 @@ int i = baseMapper.updateById(productOrder); return i > 0 ? ResultBody.ok().data(productOrder).msg("更新成功") : ResultBody.failed("更新失败"); } + + @Override + public ResultBody getTypeByUser(SysUser sysUser) { + List<SysOrganization> organizations = sysUser.getOrganizations(); + if(organizations.size()>0){ + SysOrganization sysOrganization = organizations.get(0); + List<ProductOrderJoinDetail> list=baseMapper.getTypeByUser(sysOrganization.getId()); + if (list.size()>0) { + ProductOrderJoinDetail productOrderJoinDetail = list.get(0); + //查询用户的真实姓名 + Map<String,Object> selectMap=new HashMap<>(); + selectMap.put("user_id",sysUser.getId()); + ResultBody listByMap = sysDoctorService.getListByMap(selectMap); + List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class); + String str=""; + if(sysDoctors!=null&&sysDoctors.size()>0){ + str= sysDoctors.get(0).getDoctorName(); + } + //查询医院的 logo + Map<String,Object> map=new HashMap<>(); + map.put("id",sysOrganization.getId()); + ResultBody allByMap = sysHospitalService.findAllByMap(map); + List<SysHospital> hospitals = JSON.parseArray(JSON.toJSONString(allByMap.getData()), SysHospital.class); + String logo=""; + if(hospitals.size()>0){ + logo = hospitals.get(0).getHospitalLogo(); + } + Map<String,Object> mapVo=new HashMap<>(); + mapVo.put("type",productOrderJoinDetail.getProType()); + mapVo.put("realName",str); + //剩余时间 + Date proEndtime = productOrderJoinDetail.getProEndtime(); + Double surplusDay=DateUtils.getDays(proEndtime, new Date()); + int surplus = surplusDay.intValue(); + mapVo.put("surplus",surplus); + mapVo.put("logo",logo); + //获取 售后服务工程师********不能从sysOrganization获取,从department获取 + /* mapVo.put("saleUserName",sysOrganization.getSaleUserName()); + mapVo.put("saleUserTel",sysOrganization.getSaleUserTel());*/ + return ResultBody.ok().data(mapVo); + }else { + return ResultBody.failed("该用户套餐已经失效"); + } + }else { + return ResultBody.failed("该用户的组织已经失效"); + } + } } -- Gitblit v1.8.0