From c27fcb5b3784d0a3d476903c2f314f9eec51e968 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Mar 2023 11:26:46 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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 d9e54c8..53db50f 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -137,6 +137,7 @@
if (ObjectUtil.isNotEmpty(mallMoneyFlow)) {
log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
+ //合伙人申请的充值，要更新会员状态为FIRST_LEVEL
if(2 == type){
mallMemberService.updateMemberAgent(memberId);
}
@@ -154,21 +155,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_SEND.getValue(),
- rechargeNo+"ZS",
- FlowTypeEnum.BALANCE.getValue());
-
- memberWalletService.addBalance(giveAmount,memberId);
+ memberWalletService.addBalance(giveAmount,memberId);
+ }
}
RechargeWalletMessageSendDto rechargeWalletMessageSendDto = new RechargeWalletMessageSendDto();
@@ -284,6 +303,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