From d524c2c3f60032916218a638ee5fa610cd2a330c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:37 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
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