From b295ea4c6f8233d2e0d4ad2a25f7184398b13cf3 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Wed, 24 Jan 2024 23:05:22 +0800
Subject: [PATCH] fxi
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 a38156f..923ed98 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
@@ -23,6 +23,8 @@
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
+import cc.mrbird.febs.vip.service.IMallVipConfigBenefitsService;
+import cc.mrbird.febs.vip.service.IMallVipConfigService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -86,6 +88,8 @@
private final MallMemberCouponMapper mallMemberCouponMapper;
private final MallGoodsCouponMapper mallGoodsCouponMapper;
private final CouponGoodsMapper couponGoodsMapper;
+
+ private final IMallVipConfigService mallVipConfigService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -201,14 +205,6 @@
//卷是否和商品绑定
Long skuGoodsId = sku.getGoodsId();
Long couponId = mallMemberCoupon.getCouponId();
- List<CouponGoods> couponGoods = couponGoodsMapper.selectByGoodIdAndCouponId(skuGoodsId, couponId);
- if(ObjectUtil.isEmpty(couponGoods)){
- throw new FebsException(sku.getGoodsName()+"无法使用"+mallMemberCoupon.getCouponName());
- }
-// Long goodsId = mallMemberCoupon.getGoodsId();
-// if(goodsId != sku.getGoodsId()){
-// throw new FebsException(sku.getGoodsName()+"无法使用"+mallMemberCoupon.getCouponName());
-// }
MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(mallMemberCoupon.getCouponId());
if(ObjectUtil.isEmpty(mallGoodsCoupon)){
throw new FebsException(mallGoodsCoupon.getName()+"无法使用");
@@ -217,10 +213,26 @@
if(2 != stateCoupon){
throw new FebsException(mallGoodsCoupon.getName()+"无法使用");
}
+ List<CouponGoods> couponGoods = couponGoodsMapper.selectByGoodIdAndCouponId(skuGoodsId, couponId);
+ if(ObjectUtil.isEmpty(couponGoods)){
+ throw new FebsException(sku.getGoodsName()+"无法使用"+mallMemberCoupon.getCouponName());
+ }
+// Long goodsId = mallMemberCoupon.getGoodsId();
+// if(goodsId != sku.getGoodsId()){
+// throw new FebsException(sku.getGoodsName()+"无法使用"+mallMemberCoupon.getCouponName());
+// }
BigDecimal costAmount = mallGoodsCoupon.getCostAmount();
BigDecimal realAmount = mallGoodsCoupon.getRealAmount();
if(amount.compareTo(costAmount) >= 0){
- amount = (amount.subtract(realAmount).compareTo(BigDecimal.ZERO) > 0 ? amount.subtract(realAmount) : BigDecimal.ZERO);
+ Integer type = mallGoodsCoupon.getType();
+ if(MallGoodsCoupon.TYPE_TWO == type){
+ BigDecimal divideTime = amount.divide(costAmount, 0, BigDecimal.ROUND_DOWN);//累计减免次数
+ BigDecimal multiply = divideTime.multiply(realAmount);//实际减免金额
+ amount = (amount.subtract(multiply).compareTo(BigDecimal.ZERO) > 0 ? amount.subtract(multiply) : BigDecimal.ZERO);
+ }
+ if(MallGoodsCoupon.TYPE_ONE == type){
+ amount = (amount.subtract(realAmount).compareTo(BigDecimal.ZERO) > 0 ? amount.subtract(realAmount) : BigDecimal.ZERO);
+ }
orderItem.setMemberCouponId(memberCouponId);
mallMemberCoupon.setState(2);
mallMemberCouponMapper.updateById(mallMemberCoupon);
@@ -280,6 +292,12 @@
//过期时间修改成24小时
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
return orderInfo.getId();
+ }
+
+ public static void main(String[] args) {
+ BigDecimal bigDecimal = new BigDecimal(980);
+ BigDecimal divide = bigDecimal.divide(new BigDecimal(100), 0, BigDecimal.ROUND_DOWN);
+ System.out.println(divide);
}
@@ -424,6 +442,7 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
agentProducer.sendOrderCoupon(orderInfo.getId());
+ agentProducer.sendGetScoreMsg(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -922,10 +941,6 @@
}
return new FebsResponse().success();
- }
-
- public static void main(String[] args) {
- System.out.print(AgentLevelEnum.ZERO_LEVEL.name());
}
}
--
Gitblit v1.9.1