From 9f0f265de03e582df2baca0dc2ae7ce5586b48b0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 16 Dec 2020 18:37:51 +0800
Subject: [PATCH] modify vip_detail.html
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 603a346..7acacec 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -15,13 +15,14 @@
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.hievEnum.PayMethodEnum;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.CodeService;
+import com.matrix.system.hive.service.ShoppingGoodsService;
import com.matrix.system.hive.service.SysOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +81,9 @@
@Autowired
private WarehouseDao warehouseDao;
+
+ @Autowired
+ private ShoppingGoodsService shoppingGoodsService;
@Override
public int add(SysOrder sysOrder) {
@@ -738,7 +742,7 @@
cal.set(2200, 1, 1);
moneyCardUse.setFailTime(cal.getTime());
} else {
- moneyCardUse.setFailTime(DateUtils.nextNDate(new Date(), 30 * moneyCar.getValidity()));
+ moneyCardUse.setFailTime(DateUtil.nextNDate(new Date(), 30 * moneyCar.getValidity()));
}
moneyCardUseDao.insert(moneyCardUse);
}
@@ -954,7 +958,6 @@
}
-
public void addZongheCarUse(SysOrder order, SysOrderItem sysOrderItem) {
@@ -1046,16 +1049,16 @@
taocanProjUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
taocanProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
taocanProjUse.setIsCourse(taocanShoppingGoods.getIsCourse());
+ taocanProjUse.setIsInfinite(taocanShoppingGoods.getIsInfinite());
// 赠送和打折后金额为0的都视为赠送项目
if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
taocanProjUse.setSource(Dictionary.TAOCAN_SOURCE_GM);
} else {
taocanProjUse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
}
- // TODO 设置失效时间
- Calendar cal = Calendar.getInstance();
- cal.set(2200, 1, 1);
- taocanProjUse.setFailTime(cal.getTime());
+ // 失效时间
+ Date invalidTime = shoppingGoodsService.calInvalidTime(taocanShoppingGoods, 1, null);
+ taocanProjUse.setFailTime(invalidTime);
sysProjUseDao.insert(taocanProjUse);
//计划次数
int surplusCount=0;
@@ -1105,9 +1108,8 @@
puse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
}
// 设置失效时间
- Calendar cal = Calendar.getInstance();
- cal.set(2300, 1, 1);
- puse.setFailTime(cal.getTime());
+ Date invalidTime = shoppingGoodsService.calInvalidTime(sysOrderItem.getShoppingGoods(), 1, null);
+ puse.setFailTime(invalidTime);
sysProjUseDao.insert(puse);
}
@@ -1148,7 +1150,7 @@
order.setVipId(czVo.getVipId());
Date orderTime = new Date();
if (StringUtils.isNotBlank(czVo.getDateTime())) {
- orderTime = DateUtils.stringToDateNew(czVo.getDateTime(), DateUtils.DATE_FORMAT_DD);
+ orderTime = DateUtil.stringToDateNew(czVo.getDateTime(), DateUtil.DATE_FORMAT_DD);
}
order.setOrderTime(orderTime);
order.setPayTime(orderTime);
--
Gitblit v1.9.1