Administrator
2025-05-16 9265a439968f7df5b93a9435f2dc958d8a9c45a3
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -147,62 +147,72 @@
                            mallMoneyFlow.setStatus(2);
                            mallMoneyFlowMapper.updateById(mallMoneyFlow);
                            /**
                             * 充值赠送金额
                             */
                            DataDictionaryCustom giveStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                    DataDictionaryEnum.GIVE_STATE.getType(),
                                    DataDictionaryEnum.GIVE_STATE.getCode());
                            mallMoneyFlowService.addMoneyFlow(
                                    memberId,
                                    payMoney,
                                    ScoreFlowTypeEnum.RECHARGE_ING.getValue(),
                                    rechargeNo,
                                    FlowTypeEnum.BALANCE.getValue(),
                                    StrUtil.format(ScoreFlowTypeEnum.RECHARGE.getDesc(),payMoney),
                                    2
                            );
                            DataDictionaryCustom giveAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                    DataDictionaryEnum.GIVE_AMOUNT.getType(),
                                    DataDictionaryEnum.GIVE_AMOUNT.getCode());
                            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);
                                    memberWalletService.addBalance(giveAmount,memberId);
                                }
                            }
                            RechargeWalletMessageSendDto rechargeWalletMessageSendDto = new RechargeWalletMessageSendDto();
                            rechargeWalletMessageSendDto.setRechargeNo(rechargeNo);
                            rechargeWalletMessageSendDto.setRechargeAmount(payMoney.toString());
                            MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
                            rechargeWalletMessageSendDto.setBalance(mallMemberWallet.getBalance().toString());
                            rechargeWalletMessageSendDto.setCreateTime(DateUtil.now());
                            rechargeWalletMessageSendDto.setOpenId(mallMemberMapper.selectById(memberId).getOpenId());
                            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_TWO.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_TWO.getCode());
                            rechargeWalletMessageSendDto.setTemplateId(dataDictionaryCustom.getValue());
                            iXcxPayService.rechargeWalletMessageSend(rechargeWalletMessageSendDto);
//                            /**
//                             * 充值赠送金额
//                             */
//                            DataDictionaryCustom giveStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                                    DataDictionaryEnum.GIVE_STATE.getType(),
//                                    DataDictionaryEnum.GIVE_STATE.getCode());
//
//                            DataDictionaryCustom giveAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                                    DataDictionaryEnum.GIVE_AMOUNT.getType(),
//                                    DataDictionaryEnum.GIVE_AMOUNT.getCode());
//
//                            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);
//
//                                    memberWalletService.addBalance(giveAmount,memberId);
//                                }
//                            }
//
//                            RechargeWalletMessageSendDto rechargeWalletMessageSendDto = new RechargeWalletMessageSendDto();
//                            rechargeWalletMessageSendDto.setRechargeNo(rechargeNo);
//                            rechargeWalletMessageSendDto.setRechargeAmount(payMoney.toString());
//
//                            MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
//                            rechargeWalletMessageSendDto.setBalance(mallMemberWallet.getBalance().toString());
//                            rechargeWalletMessageSendDto.setCreateTime(DateUtil.now());
//                            rechargeWalletMessageSendDto.setOpenId(mallMemberMapper.selectById(memberId).getOpenId());
//                            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_TWO.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_TWO.getCode());
//                            rechargeWalletMessageSendDto.setTemplateId(dataDictionaryCustom.getValue());
//                            iXcxPayService.rechargeWalletMessageSend(rechargeWalletMessageSendDto);
                            threadResult.success().message("充值成功");
                        } else {
                            log.info("充值失败", attrStr);