From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容
---
meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
index 882d75f..002d6ed 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
@@ -253,7 +253,7 @@
// 美天销售价
sellCost = skuVo.getPriceSale();
} else {
- if (user != null && user.getMemberGradeId() != EnumMemberGrade.G_1.index) {
+ if (user != null && user.getMemberGradeId() != EnumMemberGrade.G_1.index && EnumMemberGrade.G_2.index != user.getMemberGradeId()) {
// 会员价
sellCost = skuVo.getPriceMember();
} else {
@@ -263,14 +263,15 @@
}
} else {
// 套餐商品（优先销售价（门店价存得值），未设置为美天销售价）
- if (skuVo.getPriceMerchant() == null || skuVo.getPriceMerchant().compareTo(BigDecimal.ZERO) <= 0) {
+ /* if (skuVo.getPriceMerchant() == null || skuVo.getPriceMerchant().compareTo(BigDecimal.ZERO) <= 0) {
// 美天销售价
sellCost = skuVo.getPriceSale();
} else {
// 销售价
sellCost = skuVo.getPriceMerchant();
- }
-
+ }*/
+ // 美天销售价
+ sellCost = skuVo.getPriceSale();
// 查询套餐规格组ID
MallGroupSpec mallGroupSpec = mallGroupSpecService.getById(skuVo.getSpecIds());
List<GroupSpecGoodsSkuJsonVo> groupSpecGoodsSkuJsonVoList = JSONUtil.parseArray(mallGroupSpec.getGoodsSkuJson()).toList(GroupSpecGoodsSkuJsonVo.class);
--
Gitblit v1.7.1