From 12112eaff727c3a4554b19840e735e2b60cbd1f2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 05 Jan 2024 11:19:07 +0800
Subject: [PATCH] 团队列表
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 84 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 16 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 f3b8cc3..db3f914 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -2,14 +2,12 @@
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;
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;
@@ -24,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;
@@ -73,6 +72,10 @@
private IApiMallMemberWalletService memberWalletService;
@Autowired
private IApiMallMemberService mallMemberService;
+ @Autowired
+ private MallAgentRecordMapper mallAgentRecordMapper;
+ @Autowired
+ private AgentProducer agentProducer;
@Autowired
private IXcxPayService iXcxPayService;
@@ -115,6 +118,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);
// 校验签名
@@ -137,8 +141,11 @@
if (ObjectUtil.isNotEmpty(mallMoneyFlow)) {
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);
@@ -154,21 +161,39 @@
DataDictionaryCustom giveAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.GIVE_AMOUNT.getType(),
DataDictionaryEnum.GIVE_AMOUNT.getCode());
- if(ObjectUtil.isNotEmpty(giveStateDic)
- && "1" == giveStateDic.getValue()
- && ObjectUtil.isNotEmpty(giveAmountDic)){
+
+ DataDictionaryCustom chargeAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.CHARGE_AMOUNT.getType(),
+ DataDictionaryEnum.CHARGE_AMOUNT.getCode());
+ /**
+ * 普通充值
+ * 开启了充值赠送
+ * 系统设置的赠送金额和充值金额不为空
+ * 充值金额大于等于系统设置的充值金额
+ */
+ if(1 == type
+ && ObjectUtil.isNotEmpty(giveStateDic)
+ && "1".equals(giveStateDic.getValue())
+ && ObjectUtil.isNotEmpty(giveAmountDic)
+ && ObjectUtil.isNotEmpty(chargeAmountDic)){
BigDecimal giveAmount = ObjectUtil.isEmpty(giveAmountDic.getValue()) ?
BigDecimal.ZERO :
new BigDecimal(giveAmountDic.getValue()).abs().setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal chargeAmount = ObjectUtil.isEmpty(chargeAmountDic.getValue()) ?
+ BigDecimal.ZERO :
+ new BigDecimal(chargeAmountDic.getValue()).abs().setScale(2,BigDecimal.ROUND_DOWN);
+ if(payMoney.compareTo(chargeAmount) >= 0){
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ giveAmount,
+ MoneyFlowTypeEnum.RECHARGE_SEND.getValue(),
+ rechargeNo+"ZS",
+ FlowTypeEnum.BALANCE.getValue(),
+ "充值赠送金额",
+ 2);
- mallMoneyFlowService.addMoneyFlow(
- memberId,
- giveAmount,
- MoneyFlowTypeEnum.RECHARGE.getValue(),
- rechargeNo+"ZS",
- FlowTypeEnum.BALANCE.getValue());
-
- memberWalletService.addBalance(giveAmount,memberId);
+ memberWalletService.addBalance(giveAmount,memberId);
+ }
}
RechargeWalletMessageSendDto rechargeWalletMessageSendDto = new RechargeWalletMessageSendDto();
@@ -278,12 +303,39 @@
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");
order.setPayTime(new Date());
order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
mallOrderInfoMapper.updateById(order);
+
+ mallMoneyFlowService.addMoneyFlow(
+ order.getMemberId(),
+ payMoney.negate(),
+ MoneyFlowTypeEnum.WECHAT_PAY.getValue(),
+ order.getOrderNo(),
+ FlowTypeEnum.WECHAT.getValue(),
+ "微信支付",
+ 2);
+
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append(order.getId().toString());
+ stringBuffer.append("@");
+ stringBuffer.append(payMoney.toString());
+ agentProducer.sendOrderGetMsg(stringBuffer.toString());
+
threadResult.success().message("支付成功");
} else {
log.info("订单状态不为待付款，order status=", order.getStatus());
--
Gitblit v1.9.1