From 0893fd52576e75d073902c29b11ec94ad2dba2ab Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 18:05:51 +0800
Subject: [PATCH] modify add order and servier order invalid time
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index ada929f..ba5d616 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -97,6 +97,8 @@
private SysOrderService sysOrderService;
@Autowired
WarehouseDao warehouseDao;
+ @Resource
+ private ShoppingGoodsService shoppingGoodsService;
/**
* 新增服务单 jyy
@@ -118,7 +120,6 @@
sysProjServices.setServiceNo(codeService.getServiceOrderCode());
Double hkPrice = 0.0;
int i = sysProjServicesDao.insert(sysProjServices);
-
// 计算项目总时长
int totalTime = 0;
//处理订单明细
@@ -144,6 +145,14 @@
//本次消费金额
Double bcxfje = MoneyUtil.mul(sysProjUse.getPrice(), Double.valueOf(sysBeauticianState.getCount()));
upProjUse.setBalance(MoneyUtil.sub(sysProjUse.getBalance(), bcxfje));
+
+ // 判断是否第一次使用该项目， 若是则根据商品消耗有效期更新到期时间
+ List<SysBeauticianState> sysBeauticianStates = beauticianStateDao.selectBeauticianStateByPuseIdAndNoStatus(sysBeauticianState.getPuseId(), Dictionary.SERVICE_STATU_YYQX);
+ if (CollectionUtils.isEmpty(sysBeauticianStates)) {
+ Date useInvalidTime = shoppingGoodsService.calInvalidTime(sysProjInfo, 2, sysProjUse.getFailTime());
+ upProjUse.setFailTime(useInvalidTime);
+ }
+
//更新余次信息
sysProjUseDao.updateSurplusCount(upProjUse);
//如果项目是套餐 中项目则判断套餐是否失效
@@ -167,6 +176,13 @@
taocan.setSurplusCount(tcSurplusCount);
}
}
+
+ // 根据套餐内所有项目查询该套餐是否第一次使用，若第一次使用则更新该套餐有效期
+ List<SysBeauticianState> taocanHas = beauticianStateDao.selectByProjUse(taocanProjUses, Dictionary.SERVICE_STATU_YYQX);
+ if (CollectionUtils.isEmpty(taocanHas)) {
+ Date useInvalidTime = shoppingGoodsService.calInvalidTime(sysProjInfo, 2, sysProjUse.getFailTime());
+ taocan.setFailTime(useInvalidTime);
+ }
sysProjUseDao.updateSurplusCount(taocan);
}
--
Gitblit v1.9.1