From ea8363882d5607e338f092baadba618d86312c17 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Feb 2023 10:06:37 +0800
Subject: [PATCH] 去掉合伙人和样品购买限制
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index efece73..78fbb90 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -146,17 +146,17 @@
throw new FebsException("购买商品或sku不存在");
}
- if("样品".equals(sku.getSample())){
- List<MallOrderItem> items = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
- if (CollUtil.isNotEmpty(items)) {
- throw new FebsException("样品一个用户只能购买一次");
- }
- Integer cnt = item.getCnt();
- if(1 < cnt){
- throw new FebsException("样品只能购买一件");
- }
-
- }
+// if("样品".equals(sku.getSample())){
+// List<MallOrderItem> items = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
+// if (CollUtil.isNotEmpty(items)) {
+// throw new FebsException("样品一个用户只能购买一次");
+// }
+// Integer cnt = item.getCnt();
+// if(1 < cnt){
+// throw new FebsException("样品只能购买一件");
+// }
+//
+// }
if (sku.getStock() < item.getCnt()) {
throw new FebsException(sku.getSkuName() + "库存不足");
@@ -179,8 +179,15 @@
if(1 != goodsResult){
throw new FebsException(mallGoods.getGoodsName() + "库存不足");
}
-
- BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
+ BigDecimal amount = BigDecimal.ZERO;
+ if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
+ //普通用户使用原价购买
+ amount = sku.getOriginalPrice().multiply(BigDecimal.valueOf(item.getCnt()));
+ }else{
+ //合伙人使用折扣价
+ amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
+ }
+// BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
orderItem.setAmount(amount);
orderItem.setCnt(item.getCnt());
orderItem.setOrderId(orderInfo.getId());
@@ -851,21 +858,21 @@
if (sku == null) {
return new FebsResponse().fail().message("购买商品或sku不存在");
}
- if("样品".equals(sku.getSample())){
- List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
- if (CollUtil.isNotEmpty(mallOrderItems)) {
- return new FebsResponse().fail().message("样品只能购买一次");
- }
- Integer cnt = item.getCnt();
- if(1 < cnt){
- return new FebsResponse().fail().message("样品只能购买一件");
- }
- }else{
- //验证用户的等级
- if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
- return new FebsResponse().fail().message("请先申请成为合伙人");
- }
- }
+// if("样品".equals(sku.getSample())){
+// List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
+// if (CollUtil.isNotEmpty(mallOrderItems)) {
+// return new FebsResponse().fail().message("样品只能购买一次");
+// }
+// Integer cnt = item.getCnt();
+// if(1 < cnt){
+// return new FebsResponse().fail().message("样品只能购买一件");
+// }
+// }else{
+// //验证用户的等级
+// if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
+// return new FebsResponse().fail().message("请先申请成为合伙人");
+// }
+// }
if (sku.getStock() < item.getCnt()) {
return new FebsResponse().fail().message(sku.getSkuName() + "库存不足");
--
Gitblit v1.9.1