From b05f3c36b4ec6edf570e83c5b6c638799823a856 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 18:18:43 +0800
Subject: [PATCH] add alipay
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 5d3d9bd..fad46d2 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
@@ -20,6 +20,7 @@
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;
@@ -61,6 +62,7 @@
private final RedisUtils redisUtils;
private final AgentProducer agentProducer;
+ private final IPayService payService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -164,20 +166,21 @@
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());
+ 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("积分支付");
@@ -193,11 +196,12 @@
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());
- agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendReturnMoneyMsg(orderInfo.getId());
+// agentProducer.sendAutoLevelUpMsg(member.getId());
+// agentProducer.sendReturnMoneyMsg(orderInfo.getId());
return map;
}
--
Gitblit v1.9.1