20220822

xiaoyong931011

2022-08-31 b61110af489ad1278732bf91ed239fcca8567ac8

20220822

 src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java

@@ -27,5 +27,6 @@
        registration.excludePathPatterns("/api/leader/leaderList");

        registration.excludePathPatterns("/api/leader/leaderTitle");

        registration.excludePathPatterns("/api/xcxPay/wxpayCallback");

        registration.excludePathPatterns("/api/xcxPay/rechargeCallBack");

    }

}


 src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java

@@ -33,6 +33,7 @@

    /**
     * 提现状态 1-提现中2-成功 3-拒绝
     * 充值状态 1-充值中2-成功 3-失败
     */
    private Integer status;


 src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java

@@ -11,6 +11,8 @@

    void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Integer flowType);

    void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Integer flowType, String remark,Integer status);

    void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Integer flowType, Integer isReturn);

    void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Long rtMemberId, Integer flowType);

 src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java

@@ -41,6 +41,11 @@
    }

    @Override
    public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Integer flowType, String remark,Integer status) {
        this.addMoneyFlow(memberId, amount, type, orderNo, null, remark, null, status, flowType, null);
    }

    @Override
    public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Integer flowType, Integer isReturn) {
        this.addMoneyFlow(memberId, amount, type, orderNo, null, null, null, null, flowType, isReturn);
    }

 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java

@@ -131,19 +131,22 @@
                                RoundingMode.HALF_UP);

                        if (ObjectUtil.isNotEmpty(mallMoneyFlow)) {
                                log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
                                memberWalletService.addBalance(payMoney,memberId);
                                RechargeWalletMessageSendDto rechargeWalletMessageSendDto = new RechargeWalletMessageSendDto();
                                rechargeWalletMessageSendDto.setRechargeNo(rechargeNo);
                                rechargeWalletMessageSendDto.setRechargeAmount(payMoney.toString());
                            log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
                            memberWalletService.addBalance(payMoney,memberId);
                            mallMoneyFlow.setStatus(2);
                            mallMoneyFlowMapper.updateById(mallMoneyFlow);

                                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);
                            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);

 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java

@@ -91,7 +91,8 @@
                money,
                MoneyFlowTypeEnum.RECHARGE.getValue(),
                rechargeNo,
                FlowTypeEnum.BALANCE.getValue());
                FlowTypeEnum.BALANCE.getValue(),
                "余额充值",1);
        return payData;
    }