代码提交

无关风月

2024-11-11 79857a556aa0a983eee05730b0566a62e0be73c0

 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWalletRecordController.java

@@ -279,7 +279,6 @@
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
            }else if (byId.getReason().equals("充值")){
                Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (byId.getChildAppUserId() == null && one!=null){
                    orderDetailVO.setType("充值");
                    orderDetailVO.setPayType(one.getPayType());
                    orderDetailVO.setPayOrderNo(one.getBizOrderNo());
@@ -288,7 +287,6 @@
                    orderDetailVO.setAmount(byId.getAmount());
                    orderDetailVO.setPaymentTime(one.getPaymentTime());
                    return R.ok(orderDetailVO);
                }
            }else if (byId.getReason().equals("分佣收益")){
                Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (byId.getChildAppUserId()!=null && one!=null){
@@ -299,11 +297,11 @@
                    orderDetailVO.setAmount(byId.getAmount());
                    orderDetailVO.setRemark(one.getRemark());
                    if (one.getCommissionId()!=null){
                        AppUser appUserById = appUserService.getById(one.getCommissionId());
                        AppUser appUserById = appUserService.getById(one.getAppUserId());
                        orderDetailVO.setUserName(appUserById.getNickname());
                        orderDetailVO.setAvatar(appUserById.getAvatar());
                    }
                    return R.ok(new OrderDetailVO());
                    return R.ok(orderDetailVO);
                }
            }else if (byId.getReason().equals("提现回退")){
                AppUserWithdraw byId1 = appUserWithdrawService.getById(byId.getOrderId());
@@ -313,7 +311,7 @@
                orderDetailVO.setAmount(byId1.getAmount());
                orderDetailVO.setChangeType(byId.getChangeType());
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
                return R.ok(new OrderDetailVO());
                return R.ok(orderDetailVO);
            }else if (byId.getReason().contains("课程")){
                Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (data!=null){
@@ -324,6 +322,8 @@
                    orderDetailVO.setChangeType(byId.getChangeType());
                    orderDetailVO.setPaymentTime(data.getPaymentTime());
                }
                return R.ok(orderDetailVO);

            } else if (byId.getReason().contains("疗愈")) {
                Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (data!=null){
@@ -334,6 +334,8 @@
                    orderDetailVO.setChangeType(2);
                    orderDetailVO.setPaymentTime(data.getPaymentTime());
                }
                return R.ok(orderDetailVO);

            }
        }
        return R.ok(orderDetailVO);