forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java
@@ -34,4 +34,30 @@ */ @PostMapping(value = "/contract/getStatus") ResultBody getStatus(@RequestBody ProductOrder productOrder); /** * 私有云套餐验证 * @param params 参数 * hospitalId 医院ID * departmentId 科室ID * @return com.kidgrow.common.model.ResultBody */ @PostMapping("/productorderdetail/verificateProductOrderDetail") ResultBody verificateProductOrderDetail(@RequestBody Map<String,Object> params); /** * 根据Map的条件获取合同列表 * @param params * @return com.kidgrow.common.model.ResultBody */ @PostMapping("/contract/findProductOrderListByMap") ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params); /** * 根据Map的条件获取合同明细（套餐）列表 * @param params * @return com.kidgrow.common.model.ResultBody */ @PostMapping("/productorderdetail/findProductOrderDetailListByMap") ResultBody findProductOrderDetailListByMap(@RequestBody Map<String, Object> params); } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java
@@ -6,6 +6,7 @@ import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; import java.util.Map; @Slf4j @@ -23,6 +24,21 @@ public ResultBody getStatus(ProductOrder productOrder) { return ResultBody.failed().msg("获取正式和试用的的FeignClient接口失败"); } @Override public ResultBody verificateProductOrderDetail(@RequestBody Map<String,Object> params){ return ResultBody.failed().msg("私有云套餐验证的FeignClient接口失败"); } @Override public ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params){ return ResultBody.failed().msg("获取合同列表的FeignClient接口失败"); } @Override public ResultBody findProductOrderDetailListByMap(@RequestBody Map<String, Object> params){ return ResultBody.failed().msg("获取合同明细（套餐）列表的FeignClient接口失败"); } }; } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -84,6 +84,10 @@ */ @NotNull(message = "读片量不能为空") private Integer ailightCount; /** * 读片量加密串 */ private String ailightCountEncryption; /** * 报告量 @@ -96,11 +100,21 @@ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date proBegintime; /** * 有效的开始时间加密串 */ private String proBegintimeEncryption; /** * 有效的结束时间 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date proEndtime; /** * 有效的结束时间加密串 */ private String proEndtimeEncryption; /** * 状态，1启用，0停用 */ private Boolean enabled; kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -144,5 +144,13 @@ */ int getUserdProduct(Long hospitalId,Long departmentId); /** * 私有云套餐验证 * @param hospitalId 医院ID * @param departmentId 科室ID * @return com.kidgrow.common.model.ResultBody */ ResultBody verificateProductOrderDetail(Long hospitalId, Long departmentId ); }
@@ -6,6 +6,7 @@ import com.kidgrow.common.model.PageResult; import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.common.utils.AesUtils; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.common.utils.StringUtils; import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper; @@ -338,6 +339,13 @@ if (productOrderDetail != null) { //退还金额 productOrderDetail.setAilightCount(productOrderDetail.getAilightCount() + consumptionRecord.getConsumptionCount()); // 对于读片量进行加密 try { productOrderDetail.setAilightCountEncryption(AesUtils.encrypt(productOrderDetail.getAilightCount().toString())); } catch (Exception e) { e.printStackTrace(); } productOrderDetail.setUpdateTime(new Date()); //退费 boolean consumptionRe = productOrderDetailService.saveOrUpdate(productOrderDetail); @@ -504,6 +512,12 @@ productOrderDetail.setAilightCount(productOrderDetail.getAilightCount() - consumptionRequest.getConsumptionCount()); } } // 对于读片量进行加密 try { productOrderDetail.setAilightCountEncryption(AesUtils.encrypt(productOrderDetail.getAilightCount().toString())); } catch (Exception e) { e.printStackTrace(); } //3.1扣费！ boolean consumptionRe = productOrderDetailService.saveOrUpdate(productOrderDetail); if (consumptionRe) { kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
@@ -9,13 +9,10 @@ import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.common.utils.EncryptUtils; import com.kidgrow.oprationcenter.mapper.PartnerDockingInfoMapper; import com.kidgrow.oprationcenter.model.PartnerDockingInfo; import com.kidgrow.oprationcenter.model.PartnerInfo; import com.kidgrow.oprationcenter.model.ProductOrder; import com.kidgrow.oprationcenter.model.ProductOrderRecord; import com.kidgrow.oprationcenter.model.*; import com.kidgrow.oprationcenter.service.IPartnerDockingInfoService; import com.kidgrow.oprationcenter.service.IPartnerInfoService; import com.kidgrow.oprationcenter.service.IProductOrderRecordService; import com.kidgrow.oprationcenter.service.IProductOrderDetailService; import com.kidgrow.oprationcenter.service.IProductOrderService; import com.kidgrow.usercenter.feign.SysDepartmentService; import com.kidgrow.usercenter.feign.SysDoctorService; @@ -71,7 +68,7 @@ IProductOrderService productOrderService; @Autowired IProductOrderRecordService productOrderRecordService; IProductOrderDetailService productOrderDetailService; /** * 列表 @@ -333,44 +330,44 @@ orderMap.put("order_id", productOrder.getId()); orderMap.put("enabled", 1); orderMap.put("is_del", 0); List<ProductOrderRecord> productOrderRecordList = productOrderRecordService.listByMap(orderMap); List<ProductOrderDetail> productOrderDetailList = productOrderDetailService.listByMap(orderMap); if ((productOrderRecordList != null) && (productOrderRecordList.size() > 0)) { if ((productOrderDetailList != null) && (productOrderDetailList.size() > 0)) { for (i = 0; i < productOrderRecordList.size(); i++) { ProductOrderRecord productOrderRecord = productOrderRecordList.get(i); createTime = "'" + dateTimeFormat.format(productOrderRecord.getCreateTime()) + "'"; updateTime = (productOrderRecord.getUpdateTime() == null) ? "NULL" : "'" + dateTimeFormat.format(productOrderRecord.getUpdateTime()) + "'"; for (int j = 0; j < productOrderDetailList.size(); j++) { ProductOrderDetail productOrderDetail = productOrderDetailList.get(j); createTime = "'" + dateTimeFormat.format(productOrderDetail.getCreateTime()) + "'"; updateTime = (productOrderDetail.getUpdateTime() == null) ? "NULL" : "'" + dateTimeFormat.format(productOrderDetail.getUpdateTime()) + "'"; serviceSQL += "INSERT INTO order_detail VALUES( " + productOrderRecord.getId() + ", " + productOrderRecord.getOrderId() + ", " + productOrderRecord.getProId() + ", " + productOrderRecord.getProType() + ", " + "'" + productOrderRecord.getProName() + "', " + productOrderRecord.getAilightCount() + ", " + productOrderRecord.getRecordCount() + ", " + "'" + dateFormat.format(productOrderRecord.getProBegintime()) + "', " + "'" + dateFormat.format(productOrderRecord.getProEndtime()) + "', " + productOrderRecord.getIsShare() + ", " + productOrderDetail.getId() + ", " + productOrderDetail.getOrderId() + ", " + productOrderDetail.getProId() + ", " + productOrderDetail.getProType() + ", " + "'" + productOrderDetail.getProName() + "', " + productOrderDetail.getAilightCount() + ", " + productOrderDetail.getRecordCount() + ", " + "'" + dateFormat.format(productOrderDetail.getProBegintime()) + "', " + "'" + dateFormat.format(productOrderDetail.getProEndtime()) + "', " + productOrderDetail.getIsShare() + ", " + "0, 0, " + // 服务验证字符串【合作商ID、医院ID、科室ID、产品ID、开始日期、结束日期、读片数量、报告数量、已使用读片数量、已使用报告数量】 "'" + EncryptUtils.encryptAES((partnerDockingInfo.getPartnerId().toString() + "|" + partnerDockingInfo.getHospitalId().toString() + "|" + partnerDockingInfo.getDepartmentId().toString() + "|" + productOrderRecord.getProId().toString() + "|" + dateFormat.format(productOrderRecord.getProBegintime()) + "|" + dateFormat.format(productOrderRecord.getProEndtime()) + "|" + productOrderRecord.getAilightCount().toString() + "|" + productOrderRecord.getRecordCount() + "|" + productOrderDetail.getProId().toString() + "|" + dateFormat.format(productOrderDetail.getProBegintime()) + "|" + dateFormat.format(productOrderDetail.getProEndtime()) + "|" + productOrderDetail.getAilightCount().toString() + "|" + productOrderDetail.getRecordCount() + "|" + "0|0"), SecurityConstants.AES_KEY) + "', " + productOrderRecord.getIsDel() + ", " + productOrderRecord.getEnabled() + ", " + productOrderDetail.getIsDel() + ", " + productOrderDetail.getEnabled() + ", " + createTime + ", " + productOrderRecord.getCreateUserId() + ", " + "'" + productOrderRecord.getCreateUserName() + "', " + productOrderDetail.getCreateUserId() + ", " + "'" + productOrderDetail.getCreateUserName() + "', " + updateTime + ", " + productOrderRecord.getUpdateUserId() + ", " + "'" + productOrderRecord.getUpdateUserName() + "' " + productOrderDetail.getUpdateUserId() + ", " + "'" + productOrderDetail.getUpdateUserName() + "' " + ");\n\r"; } } else { @@ -405,5 +402,4 @@ return dbSql; } ; } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -1,10 +1,12 @@ package com.kidgrow.oprationcenter.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.model.*; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.common.utils.AesUtils; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.common.utils.StringUtils; import com.kidgrow.oprationcenter.feign.DiagnosticService; @@ -29,6 +31,7 @@ import org.springframework.cglib.beans.BeanCopier; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -442,4 +445,89 @@ return ResultBody.failed("医院和科室数据有误！"); } } /** * 私有云套餐验证 * @param hospitalId 医院ID * @param departmentId 科室ID * @return com.kidgrow.common.model.ResultBody */ public ResultBody verificateProductOrderDetail(Long hospitalId, Long departmentId ){ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); // 查询科室可用的合同列表【当前日期在合同开始、结束日期之间】 List<ProductOrder> productOrderList = iProductOrderService.list( new QueryWrapper<ProductOrder>() .eq("hospital_id",hospitalId) .eq("department_id",departmentId) //.le("contract_begin_time",dateFormat.format(DateTime.now())) //.ge("contract_end_time",dateFormat.format(DateTime.now())) .eq("enabled",1) .eq("is_del",0) ); if ((productOrderList != null) && (productOrderList.size() > 0)) { for (int i = 0 ; i < productOrderList.size(); i++) { ProductOrder productOrder = productOrderList.get(i); // 查询合同可用的套餐【当前日期在套餐开始、结束日期之间，剩余读片量大于零】 List<ProductOrderDetail> productOrderDetailList = baseMapper.selectList( new QueryWrapper<ProductOrderDetail>() .eq("order_id",productOrder.getId()) //.le("pro_begintime",dateFormat.format(DateTime.now())) //.ge("pro_endtime",dateFormat.format(DateTime.now())) //.gt("order_ailight_count",0) //.gt("order_ailight_count - ailight_count",0) .eq("enabled",1) .eq("is_del",0) ); if ((productOrderDetailList != null) && (productOrderDetailList.size() > 0)) { try { for (int j = 0; j < productOrderDetailList.size(); j++) { ProductOrderDetail productOrderDetail = productOrderDetailList.get(j); if ((productOrderDetail.getAilightCountEncryption() == null) || (productOrderDetail.getAilightCountEncryption().isEmpty())) { log.error("可用读片数量验证串为空"); return ResultBody.failed("可用读片数量验证串为空"); } if ((productOrderDetail.getProBegintimeEncryption() == null) || (productOrderDetail.getProBegintimeEncryption().isEmpty())) { log.error("套餐开始日期验证串为空"); return ResultBody.failed("套餐开始日期验证串为空"); } if ((productOrderDetail.getProEndtimeEncryption() == null) || (productOrderDetail.getProEndtimeEncryption().isEmpty())) { log.error("套餐结束日期验证串为空"); return ResultBody.failed("套餐结束日期验证串为空"); } String ailightCount = AesUtils.desEncrypt(productOrderDetail.getAilightCountEncryption()); String proBeginTime = AesUtils.desEncrypt(productOrderDetail.getProBegintimeEncryption()); String proEndTime = AesUtils.desEncrypt(productOrderDetail.getProEndtimeEncryption()); if ((ailightCount.isEmpty()) || (!productOrderDetail.getAilightCount().toString().equals(ailightCount))) { log.error("可用读片数量验证失败"); return ResultBody.failed("可用读片数量验证失败"); } if ((proBeginTime.isEmpty()) || (!dateFormat.format(productOrderDetail.getProBegintime()).equals(proBeginTime))) { log.error("套餐开始日期验证失败"); return ResultBody.failed("套餐开始日期验证失败"); } if ((proEndTime.isEmpty()) || (!dateFormat.format(productOrderDetail.getProEndtime()).equals(proEndTime))) { log.error("套餐结束日期验证失败"); return ResultBody.failed("套餐结束日期验证失败"); } } } catch (Exception e) { e.printStackTrace(); return ResultBody.failed(e.getMessage()); } } } // } else { // return ResultBody.failed("无有效的合同"); } log.error("私有云套餐验证通过"); return ResultBody.ok().msg("私有云套餐验证通过"); } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -198,4 +198,20 @@ return productOrderService.getStatus(productOrder); } /** * 根据Map的条件获取合同列表 * @param params * @return com.kidgrow.common.model.ResultBody */ @ApiOperation(value = "根据Map的条件获取合同列表") @PostMapping("/findProductOrderListByMap") public ResultBody findProductOrderListByMap(@RequestBody Map<String, Object> params) { List<ProductOrder> productOrderList = productOrderService.listByMap(params); if ((productOrderList!=null) && (productOrderList.size() > 0)) { return ResultBody.ok().data(productOrderList); } else { return ResultBody.failed(); } } } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -4,6 +4,7 @@ import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.controller.BaseController; import com.kidgrow.common.model.*; import com.kidgrow.common.utils.AesUtils; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.oprationcenter.model.HospitalInfo; import com.kidgrow.oprationcenter.model.ProductOrder; @@ -31,6 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.text.SimpleDateFormat; import java.util.*; @@ -58,6 +60,7 @@ private IProductOrderService productOrderService; @Autowired private SysUserService sysUserServiceFeign; /** * 列表 */ @@ -91,6 +94,7 @@ } return productOrderDetailService.all(params); } /** * 列表 */ @@ -143,6 +147,7 @@ } return productOrderDetailService.groupList(params); } /** * 查询到期列表 */ @@ -159,6 +164,7 @@ } return productOrderDetailService.productEndList(params); } /** * 获取医院套餐是否到期和到期时间 * data内 isend为true说明套餐到期 @@ -227,6 +233,18 @@ if (organizations.size() > 0) { productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode()); } // 对于读片量、产品有效的开始、结束日期进行加密 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); if ((productOrderDetail.getAilightCountEncryption() == null) || (productOrderDetail.getAilightCountEncryption().isEmpty())) { try { productOrderDetail.setAilightCountEncryption(AesUtils.encrypt(productOrderDetail.getAilightCount().toString())); productOrderDetail.setProBegintimeEncryption(AesUtils.encrypt(dateFormat.format(productOrderDetail.getProBegintime()))); productOrderDetail.setProEndtimeEncryption(AesUtils.encrypt(dateFormat.format(productOrderDetail.getProEndtime()))); } catch (Exception e) { e.printStackTrace(); } } boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail); if (v) { return ResultBody.ok().data(productOrderDetail).msg("保存成功"); @@ -289,6 +307,20 @@ } } } // 对于读片量、产品有效的开始、结束日期进行加密 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); for (int i = 0; i < list.size(); i++) { if ((list.get(i).getAilightCountEncryption() == null) || (list.get(i).getAilightCountEncryption().isEmpty())) { try { list.get(i).setAilightCountEncryption(AesUtils.encrypt(list.get(i).getAilightCount().toString())); list.get(i).setProBegintimeEncryption(AesUtils.encrypt(dateFormat.format(list.get(i).getProBegintime()))); list.get(i).setProEndtimeEncryption(AesUtils.encrypt(dateFormat.format(list.get(i).getProEndtime()))); } catch (Exception e) { e.printStackTrace(); } } } //写充值套餐给用户 Boolean v = productOrderDetailService.saveBatch(list); //写充值记录 @@ -320,9 +352,7 @@ if (v && r && p) { if (isenabled) { return ResultBody.ok().data(list.size()).msg("充值成功,但是试用套餐需要管理审核才可使用!"); } else { } else { return ResultBody.ok().data(list.size()).msg("产品充值成功..."); } } else { @@ -396,8 +426,8 @@ /** * 统计获取数据量 * @param datatype * 0 试用审核量 * * @param datatype 0 试用审核量 * 1 套餐总量 * 2 未处理用户反馈 * 3 未处理数据需求 @@ -412,8 +442,8 @@ /** * 按指定类型统计合同数量 * @param params * datatype 1 按年 * * @param params datatype 1 按年 * 2 按月 * 3 按天 * 4 按周 @@ -430,6 +460,7 @@ /** * 统计产品的使用数量 * * @return ccount 是数量 * units 是产品名称 */ @@ -442,7 +473,6 @@ /** * 获取软件服务周期 和 读片总量 * */ @ApiOperation(value = "获取软件服务周期") @GetMapping("/getContractBeginEndTimeAndNum") @@ -463,4 +493,35 @@ } return ResultBody.ok().data(map); } /** * 私有云套餐验证 * @param params 参数 * hospitalId 医院ID * departmentId 科室ID * @return com.kidgrow.common.model.ResultBody */ @ApiOperation(value = "私有云套餐验证") @PostMapping("/verificateProductOrderDetail") public ResultBody verificateProductOrderDetail(@RequestBody Map<String,Object> params ){ Long hospitalId = Long.valueOf(params.get("hospitalId").toString()); Long departmentId = Long.valueOf(params.get("departmentId").toString()); return productOrderDetailService.verificateProductOrderDetail(hospitalId,departmentId); } /** * 根据Map的条件获取合同明细（套餐）列表 * @param params * @return com.kidgrow.common.model.ResultBody */ @ApiOperation(value = "根据Map的条件获取合同明细（套餐）列表") @PostMapping("/findProductOrderDetailListByMap") public ResultBody findProductOrderDetailListByMap(@RequestBody Map<String, Object> params) { List<ProductOrderDetail> productOrderDetailList = productOrderDetailService.listByMap(params); if ((productOrderDetailList!=null) && (productOrderDetailList.size() > 0)) { return ResultBody.ok().data(productOrderDetailList); } else { return ResultBody.failed(); } } }
