From f76c9c5beb39916771402de95f05be18f39a9db6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 17 Dec 2020 14:34:33 +0800
Subject: [PATCH] finish vip_detail vipInfo fn
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 b0bf857..23c1e7e 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
@@ -22,6 +22,7 @@
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) {
@@ -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);
}
@@ -1198,6 +1200,8 @@
}
-
-
+ @Override
+ public SysOrder findSysOrderTjByVipId(Long vipId) {
+ return sysOrderDao.selectVipOrderInfoTotal(vipId);
+ }
}
--
Gitblit v1.9.1