From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
index 61b165b..09acbd5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -14,12 +14,14 @@
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
-import com.matrix.system.hive.bean.*;
+import com.matrix.system.hive.bean.ShoppingGoods;
+import com.matrix.system.hive.bean.ShoppingGoodsAssemble;
+import com.matrix.system.hive.bean.ShoppingGoodsCategory;
+import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.MoneyCardAssembleDao;
import com.matrix.system.hive.dao.ShoppingGoodsAssembleDao;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
-import com.matrix.system.hive.plugin.message.StringUtil;
import com.matrix.system.hive.service.ShoppingGoodsService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.NotNull;
-import java.awt.event.WindowStateListener;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -438,6 +438,10 @@
return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
}
+ if (type == 2 && shoppingGoods.getUseDateNum() == null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {
+ return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
+ }
+
if (type == 2 && buyDate == null) {
throw new GlobleException("购买日期不能为空");
}
@@ -518,11 +522,12 @@
ShoppingGoodsDetailVo goodsDetailVo = new ShoppingGoodsDetailVo();
goodsDetailVo.setImg(shoppingGoods.getImg());
goodsDetailVo.setGoodsName(shoppingGoods.getName());
- goodsDetailVo.setGoodsNo(shoppingGoods.getGoodsNo());
+ goodsDetailVo.setGoodsNo(shoppingGoods.getCode());
goodsDetailVo.setGoodsType(shoppingGoods.getGoodType());
goodsDetailVo.setDesc(shoppingGoods.getDescription());
goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount());
- goodsDetailVo.setLimitBuyCnt(shoppingGoods.getCarUseCount().toString());
+ goodsDetailVo.setLimitBuyCnt(shoppingGoods.getIsOnce());
+ goodsDetailVo.setMaxUseCnt(shoppingGoods.getCarUseCount());
goodsDetailVo.setMeasure(shoppingGoods.getMeasure());
goodsDetailVo.setVolume(shoppingGoods.getVolume());
goodsDetailVo.setSalePrice(BigDecimal.valueOf(shoppingGoods.getSealPice()));
--
Gitblit v1.9.1