20220902

xiaoyong931011

2022-09-24 17d9a0bacd9389a913c6f6f51ae9a082f143c0fe

20220902

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

@@ -30,4 +30,6 @@
    private String name;

    private String withdrawNo;
    
    private String remark;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java

@@ -29,4 +29,5 @@
    private String phone;

    private String bindPhone;
    private String remark;
}

 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));
@@ -263,6 +265,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 +286,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();

 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml

@@ -73,6 +73,7 @@
        a.amount amount,
        a.amount_fee amountFee,
        a.withdraw_no withdrawNo,
        a.remark remark,
        a.status status,
        b.name,
        b.bind_phone bindPhone,

 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html

@@ -125,6 +125,7 @@
                    {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
                    {field: 'amountFee', title: '手续费', minWidth: 150,align:'left'},
                    {field: 'remark', title: '错误信息', minWidth: 150,align:'left'},
                    {field: 'status', title: '状态',
                        templet: function (d) {
                            if (d.status === 1) {