From 6fb0d9786c5cc9549fb485670ccb37bb0815aad2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Jul 2023 10:44:27 +0800
Subject: [PATCH] 商城商品修改
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 d22e412..9e68dfc 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -6,10 +6,7 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
-import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
-import cc.mrbird.febs.mall.entity.MallMemberWallet;
-import cc.mrbird.febs.mall.entity.MallMoneyFlow;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
@@ -73,6 +70,8 @@
private IApiMallMemberWalletService memberWalletService;
@Autowired
private IApiMallMemberService mallMemberService;
+ @Autowired
+ private MallAgentRecordMapper mallAgentRecordMapper;
@Autowired
private IXcxPayService iXcxPayService;
@@ -115,6 +114,7 @@
String rechargeNo = (String) jsonObject.get("rechargeNo");
Integer type = (Integer) jsonObject.get("type");
Long memberId = Long.parseLong(jsonObject.get("memberId").toString());
+ Long agentApplyId = Long.parseLong(jsonObject.get("agentApplyId").toString());
// 检验订单状态
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberId(rechargeNo,memberId);
// 校验签名
@@ -139,7 +139,9 @@
log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
//合伙人申请的充值，要更新会员状态为FIRST_LEVEL
if(2 == type){
- mallMemberService.updateMemberAgent(memberId);
+ log.info("微信充值回调" + agentApplyId);
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(agentApplyId);
+ mallMemberService.updateMemberAgent(agentApplyId,mallAgentRecord.getAgentLevel());
}
memberWalletService.addBalance(payMoney,memberId);
mallMoneyFlow.setStatus(2);
@@ -303,6 +305,15 @@
order.setPayTime(new Date());
order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
mallOrderInfoMapper.updateById(order);
+
+ mallMoneyFlowService.addMoneyFlow(
+ order.getMemberId(),
+ order.getAmount().negate(),
+ MoneyFlowTypeEnum.WECHAT_PAY.getValue(),
+ order.getOrderNo(),
+ FlowTypeEnum.WECHAT.getValue(),
+ "微信支付",
+ 2);
threadResult.success().message("支付成功");
} else {
log.info("订单状态不为待付款，order status=", order.getStatus());
--
Gitblit v1.9.1