From abba1aff81da3cc9d74d75f64cbd48d25716aec3 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Mar 2021 19:19:10 +0800
Subject: [PATCH] 1、增加对于套餐中的剩余读片量、有效开始日期、结束日期的加密 2、增加扣费过程中对于剩余读片量的加密 3、为下载私有云数据库增加合同与明细的查询Feign接口 4、修改合作商数据库（影像版API）的合同与明细的查询bug
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
index 4b65b36..fb8f716 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/PartnerDockingInfoServiceImpl.java
+++ b/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;
}
- ;
}
--
Gitblit v1.8.0