From 779298eb527bce4c508ea9d1b050c4a795dddebe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 15:27:41 +0800
Subject: [PATCH] fix sign setting
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 72 insertions(+), 21 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 7ae82f7..972451a 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
@@ -1,8 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.OrderRefundStatusEnum;
-import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -20,6 +18,8 @@
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.pay.service.IPayService;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -59,6 +59,9 @@
private final IApiMallMemberService memberService;
private final RedisUtils redisUtils;
+ private final AgentProducer agentProducer;
+ private final IPayService payService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
@@ -95,7 +98,12 @@
}
if (sku.getStock() < item.getCnt()) {
- throw new FebsException("库存不足");
+ throw new FebsException(sku.getSkuName() + "库存不足");
+ }
+
+ MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+ if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
+ throw new FebsException(mallGoods.getGoodsName() + "已下架");
}
MallOrderItem orderItem = new MallOrderItem();
@@ -126,9 +134,7 @@
orderInfo.setAmount(total);
this.baseMapper.updateById(orderInfo);
- String redisKey = StrUtil.format(AppContants.REDIS_ORDER_OVERTIME, member.getId(), orderInfo.getId());
- redisUtils.set(redisKey, orderInfo.getId(), 900);
-
+ agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
return orderInfo.getId();
}
@@ -163,37 +169,67 @@
throw new FebsException("订单状态不能支付");
}
- String orderNo = "";
+ String payResultStr = "";
switch (payOrderDto.getType()) {
case "1":
- orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
- orderInfo.setPayImage(payOrderDto.getPayImage());
+// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+// orderInfo.setPayImage(payOrderDto.getPayImage());
orderInfo.setPayMethod("微信支付");
break;
case "2":
- orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
- orderInfo.setPayImage(payOrderDto.getPayImage());
+ if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
+ payResultStr = orderInfo.getPayOrderNo();
+ } else {
+ payResultStr = payService.aliPay(orderInfo);
+ }
+
+ orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("支付宝支付");
break;
case "3":
- orderNo = balancePay(orderInfo, payOrderDto.getTradePwd());
+ payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd());
orderInfo.setPayOrderNo(orderInfo.getOrderNo());
- orderInfo.setPayMethod("积分支付");
+ orderInfo.setPayMethod("余额支付");
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayResult("1");
+
+// MallMember mallMember = memberMapper.selectById(member.getId());
+// if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
+// mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+// memberMapper.updateById(mallMember);
+// }
+
+ // 静态倍数
+ List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
+ if (CollUtil.isNotEmpty(orderItems)) {
+ for (MallOrderItem orderItem : orderItems) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
+
+ MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
+ BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());
+
+ memberWalletService.add(score, member.getId(), "score");
+ memberService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), null, null, null, null, FlowTypeEnum.SCORE.getValue());
+ }
+ }
+
+ memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null, FlowTypeEnum.BALANCE.getValue());
+// agentProducer.sendAutoLevelUpMsg(member.getId());
+// agentProducer.sendReturnMoneyMsg(orderInfo.getId());
+
default:
}
- orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
- orderInfo.setPayTime(new Date());
- orderInfo.setPayResult("1");
this.baseMapper.updateById(orderInfo);
- memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
-
Map<String, Object> map = new HashMap<>();
- map.put("orderNo", orderNo);
+ map.put("orderInfo", payResultStr);
+ map.put("orderNo", orderInfo.getOrderNo());
map.put("orderId", orderInfo.getId());
+
return map;
}
@@ -212,7 +248,7 @@
throw new FebsException("支付密码错误");
}
- memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
+ memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), "balance");
return orderInfo.getOrderNo();
}
@@ -359,4 +395,19 @@
operation.setContent(StrUtil.format("用户:{}提交物流信息,快递公司:{},单号:{}", member.getName(), refundExpressDto.getExpressCom(), refundExpressDto.getExpressNo()));
mallOrderRefundOperationMapper.insert(operation);
}
+
+ @Override
+ public void autoCancelOrder(Long id) {
+ MallOrderInfo orderInfo = this.baseMapper.selectById(id);
+ if (orderInfo == null) {
+ log.error("自动取消订单参数错误:{}", id);
+ return;
+ }
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_PAY.getValue()) {
+ log.info("自动取消订单:{},{}", orderInfo.getMemberId(), id);
+ orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
+ this.baseMapper.updateById(orderInfo);
+ }
+ }
}
--
Gitblit v1.9.1