版本管理

xiaoyong931011

2023-10-25 0e7e1cfea951c7aee59a862c514e08a040523d9f

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

@@ -78,6 +78,8 @@
    @Autowired
    private MallMoneyFlowMapper mallMoneyFlowMapper;

    private final IApiMallMemberWalletService iApiMallMemberWalletService;

    @GetMapping(value = "/unipayCallBack")
    public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
        log.info("进入汇聚支付聚合支付回调"+ JSONUtil.parseObj(uniPayCallBackDto));
@@ -135,8 +137,6 @@
                    }

                    mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
                    agentProducer.sendAutoLevelUpMsg(mallMember.getId());
                    agentProducer.sendOrderReturn(orderInfo.getId());
                }
            }
        }
@@ -248,8 +248,6 @@
                    }

                    mallMoneyFlowService.addMoneyFlow(mallMember.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
                    agentProducer.sendAutoLevelUpMsg(mallMember.getId());
                    agentProducer.sendOrderReturn(orderInfo.getId());
                }
            }
        }
@@ -263,6 +261,7 @@
        BigDecimal paidAmount = singlePayCallBackDto.getPaidAmount();
        BigDecimal paidAmountFee = singlePayCallBackDto.getFee();
        String errorCode = singlePayCallBackDto.getErrorCode();
        String errorCodeDesc = singlePayCallBackDto.getErrorCodeDesc();
        String merchantOrderNo = singlePayCallBackDto.getMerchantOrderNo();

        log.info("进入汇聚支付代付回调"+status+";"+paidAmount+";"+paidAmountFee+";");
@@ -283,6 +282,14 @@
                    mallMoneyFlowMapper.updateById(mallMoneyFlow);
                }
            }
        }else{
            QueryWrapper<MallMemberWithdraw> objectQueryWrapper = new QueryWrapper<>();
            objectQueryWrapper.eq("withdraw_no",merchantOrderNo);
            MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectOne(objectQueryWrapper);
            if(ObjectUtil.isNotEmpty(mallMemberWithdraw)){
                mallMemberWithdraw.setRemark(errorCodeDesc);
                mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
            }
        }

        SinglePayCallBackVo singlePayCallBackVo = new SinglePayCallBackVo();