From 5c5589c0d343437275563a1a84f3a415a4ea16d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 16:50:40 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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 a21cfb8..e97f141 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
@@ -59,6 +59,7 @@
private final AgentProducer agentProducer;
private final IPayService payService;
+ private final IMallAchieveService mallAchieveService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -90,6 +91,7 @@
this.baseMapper.insert(orderInfo);
BigDecimal total = BigDecimal.ZERO;
+ BigDecimal carriage = BigDecimal.ZERO;
for (AddOrderItemDto item : addOrderDto.getItems()) {
MallOrderItem orderItem = new MallOrderItem();
@@ -127,6 +129,15 @@
}
MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+
+ // 零撸专区购买
+ if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) {
+ List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId());
+ if (CollUtil.isNotEmpty(items)) {
+ throw new FebsException("无法重复领取同一个商品");
+ }
+ }
+
if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
throw new FebsException(mallGoods.getGoodsName() + "已下架");
}
@@ -146,6 +157,7 @@
orderItem.setCostPrice(sku.getCostPrice());
total = total.add(amount);
+ carriage = carriage.add(mallGoods.getCarriage());
sku.setStock(sku.getStock() - item.getCnt());
sku.setSkuVolume(sku.getSkuVolume() + item.getCnt());
@@ -159,6 +171,7 @@
}
orderInfo.setAmount(total);
+ orderInfo.setCarriage(carriage);
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -231,14 +244,19 @@
if (CollUtil.isNotEmpty(orderItems)) {
for (MallOrderItem orderItem : orderItems) {
MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
-
+ BigDecimal score = BigDecimal.ZERO;
+ MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
if (mallGoods.getIsNormal() == 2) {
hasTc = true;
- MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
- BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());
+ score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti());
+ }
+ if (score.compareTo(BigDecimal.ZERO) > 0) {
memberWalletService.add(score, member.getId(), "score");
mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+
+ // 添加业绩
+ mallAchieveService.add(orderItem.getId());
}
}
}
@@ -253,7 +271,7 @@
}
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
-// agentProducer.sendAutoLevelUpMsg(member.getId());
+ agentProducer.sendAutoLevelUpMsg(member.getId());
agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "4":
@@ -297,7 +315,7 @@
throw new FebsException("支付密码错误");
}
- memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), field);
+ memberWalletService.reduce(orderInfo.getAmount().add(orderInfo.getCarriage()), mallMember.getId(), field);
return orderInfo.getOrderNo();
}
@@ -404,6 +422,13 @@
orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
+
+ // 未发货则退运费，发货了则不退
+ if (beforeStatus == 2) {
+ orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage()));
+ } else {
+ orderRefund.setAmount(orderInfo.getAmount());
+ }
mallOrderRefundMapper.insert(orderRefund);
} else {
orderRefund.setDesp(addRefundDto.getDesp());
@@ -412,6 +437,12 @@
orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
+ // 未发货则退运费，发货了则不退
+ if (beforeStatus == 2) {
+ orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage()));
+ } else {
+ orderRefund.setAmount(orderInfo.getAmount());
+ }
mallOrderRefundMapper.updateById(orderRefund);
}
--
Gitblit v1.9.1