From 839bb7b8512193b73991c302b62dc71692280350 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 01 Apr 2022 15:55:54 +0800
Subject: [PATCH] 开服务单，报系统异常。项目的单词划扣次数没有初始化数据
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java | 2 ++
zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java | 5 +++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java b/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java
index 6b284ed..138c742 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java
@@ -86,6 +86,11 @@
* -- 添加套餐下的项目必传
*/
private Long tcId;
+
+ /**
+ * 项目单次划扣数量,默认设置为1
+ */
+ private Integer deductionNum;
/**
* 操作人id
*/
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
index e9416e8..788d974 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
@@ -788,6 +788,7 @@
projUseDto.setVipId(projUseOperationDto.getVipId());
projUseDto.setTcId(taocanProjUse.getId());
projUseDto.setUpdateUserId(projUseOperationDto.getUpdateUserId());
+ projUseDto.setDeductionNum(assemble.getDeductionNum());
SysProjUse tempUse = createProjectUse(projUseDto, assemble.getShoppingGoods());
sumBanance += tempUse.getBalance();
surplusCount += tempUse.getSurplusCount();
@@ -820,6 +821,7 @@
puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
puse.setProjName(shoppingGoods.getName());
puse.setTaocanId(projUseOperationDto.getTcId());
+ puse.setDeductionNum(projUseOperationDto.getDeductionNum());
// 赠送和打折后金额为0的都视为赠送项目
if (!projUseOperationDto.isFree()) {
puse.setSource(Dictionary.TAOCAN_SOURCE_GM);
--
Gitblit v1.9.1