From a27c45a501d059bca456bac7b561786232d3ecf3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:30:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java | 9 +++++----
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 2 +-
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 23 ++++++++++++++++++-----
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index 9a9304f..e7e992d 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -75,11 +75,11 @@
vipInfoListDto.setOrder("asc");
}
+
int offset = (vipInfoListDto.getPageNum() - 1) * vipInfoListDto.getPageSize();
int limit = vipInfoListDto.getPageSize();
vipInfoListDto.setOffset(offset);
vipInfoListDto.setLimit(limit);
-
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 89e2ca7..2b11597 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
@@ -1239,11 +1239,20 @@
//赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
if(zsConsumeAchieve){
- if (taocanId == null) {
- puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
- } else {
- puse.setPrice(goodsAssemble.getPrice());
+ if(sysOrderItem.getPrice()>0){
+
+
+
+
+ }else{
+ //等于0取原价
+ if (taocanId == null) {
+ puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
+ } else {
+ puse.setPrice(goodsAssemble.getPrice());
+ }
}
+
}else{
puse.setPrice(0D);
}
@@ -1347,7 +1356,11 @@
//赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
if(zsConsumeAchieve){
- puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
+ if(sysOrderItem.getPrice()>0){
+ puse.setPrice(sysOrderItem.getZkPrice());
+ }else{
+ puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
+ }
}else{
puse.setPrice(0D);
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
index 927d041..8980936 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java
@@ -17,6 +17,7 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
@@ -429,10 +430,10 @@
@Override
public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
//todo 会员查询单独做控制
-// SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-// if (!DataAuthUtil.hasAllShopAuth()) {
-// vipInfoListDto.setShopId(sysUsers.getShopId());
-// }
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ if (!DataAuthUtil.hasAllCustomerAuth()) {
+ vipInfoListDto.setShopId(sysUsers.getShopId());
+ }
QueryUtil.setQueryLimitCom(vipInfoListDto);
return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
}
--
Gitblit v1.9.1