From 97f51bffe8ac3a31793b70d244011ff82c59c22f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 21:26:52 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 9b5a948..c352228 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.*;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
@@ -21,6 +22,7 @@
import cc.mrbird.febs.pay.util.Signature;
import cc.mrbird.febs.pay.util.Util;
import cc.mrbird.febs.pay.util.WechatConfigure;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
@@ -72,6 +74,8 @@
private IApiMallMemberService mallMemberService;
@Autowired
private MallAgentRecordMapper mallAgentRecordMapper;
+ @Autowired
+ private AgentProducer agentProducer;
@Autowired
private IXcxPayService iXcxPayService;
@@ -139,6 +143,7 @@
log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
//合伙人申请的充值，要更新会员状态为FIRST_LEVEL
if(2 == type){
+ log.info("微信充值回调" + agentApplyId);
MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(agentApplyId);
mallMemberService.updateMemberAgent(agentApplyId,mallAgentRecord.getAgentLevel());
}
@@ -298,6 +303,17 @@
if (order != null && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()) {
+ if(order.getPayMethod().equals("余额加微信")){
+ MallMemberWallet mallMemberWalletThree = mallMemberWalletMapper.selectWalletByMemberId(order.getMemberId());
+ BigDecimal balanceThree = mallMemberWalletThree.getBalance();
+
+ int reduceThree = memberWalletService.reduce(balanceThree, order.getMemberId(), "balance");
+ if (reduceThree == 2) {
+ throw new FebsException("余额不足");
+ }
+ mallMoneyFlowService.addMoneyFlow(order.getMemberId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
+ order.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
+ }
log.debug("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
order.setPayResult("1");
@@ -313,6 +329,13 @@
FlowTypeEnum.WECHAT.getValue(),
"微信支付",
2);
+
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append(order.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(order.getAmount().toString());
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
+
threadResult.success().message("支付成功");
} else {
log.info("订单状态不为待付款，order status=", order.getStatus());
--
Gitblit v1.9.1