From d3e9f57c91ffc08e090bf8d4b8fcbf60f0d3a86f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:45:15 +0800
Subject: [PATCH] feat(mall): 添加会员等级当前进度相关数据
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 52c314f..2a89336 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
@@ -109,7 +109,7 @@
throw new FebsException("请重新选择收货地址信息");
}
- String orderNo = MallUtils.getOrderNum();
+ String orderNo = MallUtils.getOrderNum("O");
MallOrderInfo orderInfo = new MallOrderInfo();
orderInfo.setOrderNo(orderNo);
orderInfo.setOrderTime(new Date());
@@ -317,6 +317,7 @@
for (AddOrderItemDto item : items) {
Long skuId = item.getSkuId();
+ Integer cnt = item.getCnt();
MallGoodsSku sku = skusAll.stream().filter(s -> s.getId().equals(skuId)).findFirst().orElse(null);
if (ObjectUtil.isNotEmpty(sku)) {
Long goodsId = sku.getGoodsId();
@@ -324,7 +325,7 @@
if (ObjectUtil.isNotEmpty(mallGoods)) {
BigDecimal multi = mallGoods.getStaticProp().divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_DOWN);
//获取该商品该规格的积分
- BigDecimal scoreAmount = sku.getOriginalPrice().multiply(multi).setScale(0, RoundingMode.HALF_DOWN);
+ BigDecimal scoreAmount = sku.getOriginalPrice().multiply(multi).multiply(new BigDecimal(cnt)).setScale(0, RoundingMode.HALF_DOWN);
scoreAmountMap.put(skuId, scoreAmount);
}
}
@@ -621,7 +622,7 @@
ScoreFlowTypeEnum.PAY_BALANCE.getValue(),
orderInfo.getOrderNo(),
FlowTypeEnum.BALANCE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getScoreAmount()),
+ StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getAmount()),
2
);
agentProducer.sendOrderCoupon(orderInfo.getId());
@@ -950,7 +951,7 @@
mallGoodsComment.setSkuName(mallGoodsSku.getSkuName());
mallGoodsComment.setStyleId(mallGoodsSku.getStyleId());
mallGoodsComment.setStyleName(mallGoodsSku.getStyleName());
- mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_ENABLE);
+ mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_DISABLED);
mallGoodsCommentMapper.insert(mallGoodsComment);
}
}
--
Gitblit v1.9.1