From 1c2c8aa1910866733854e62b0ee4bc637af141d0 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 14 Oct 2020 14:50:50 +0800
Subject: [PATCH] 修改扣费流程中业务状态部分遗漏问题
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
index 0a853f6..9940f0d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderRecordServiceImpl.java
+++ b/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();
}
--
Gitblit v1.8.0