冥想

无关风月

2025-03-07 1d44c20eabc99e9970fb58d4dbd3a94d77e83e39

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

@@ -147,7 +147,18 @@
            return R.ok(empty);
        }
        for (AppUserWalletRecord record : page.getRecords()) {
            record.setId(record.getId());
            if (record.getReason().equals("后台退款")){
                record.setId(record.getOrderId());
            }
            if (record.getReason().contains("课程")){
                record.setId(record.getOrderId());
            }
            if (record.getReason().contains("疗愈")){
                record.setId(record.getOrderId());
            }
            if (record.getReason().contains("会员")){
                record.setId(record.getOrderId());
            }
        }
        return R.ok(PageDTO.of(page, OrderListVO.class));
    }
@@ -178,6 +189,7 @@
            appUserWalletRecordLambdaQueryWrapper.eq(AppUserWalletRecord::getChangeType, state-1);
        }
        appUserWalletRecordLambdaQueryWrapper.eq(AppUserWalletRecord::getAppUserId, userId);
        appUserWalletRecordLambdaQueryWrapper.ne(AppUserWalletRecord::getAmount, 0);
        appUserWalletRecordLambdaQueryWrapper.orderByDesc(BaseModel::getCreateTime);
        Page<AppUserWalletRecord> page = walletRecordService
                .page(new Page<>(pageCurr, pageSize),appUserWalletRecordLambdaQueryWrapper);
@@ -207,7 +219,7 @@
                orderDetailVO.setWithdrawType(byId1.getWithdrawType());
                orderDetailVO.setAmount(byId1.getAmount());
                orderDetailVO.setChangeType(byId.getChangeType());
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
                orderDetailVO.setPaymentTime(byId1.getCreateTime());
            }else if (byId.getReason().equals("充值")){
                Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (one!=null){
@@ -352,6 +364,25 @@
                    if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
                }
                return R.ok(orderDetailVO);
            }else if (byId.getReason().contains("退款")){
                Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (data!=null){
                    orderDetailVO.setType("后台退款");
                    orderDetailVO.setPayOrderNo(data.getRefundCode());
                    orderDetailVO.setAmount(byId.getAmount());
                    orderDetailVO.setChangeType(1);
                    orderDetailVO.setPaymentTime(data.getRefundTime());
                    switch (data.getOrderFrom()){
                        case 1:
                            Meditation data1 = remoteMeditationService.getMeditationById(data.getBusinessId()).getData();
                            if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
                            break;
                        case 2:
                            Course data2 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
                            if (data2!=null)orderDetailVO.setRemark("课程购买【"+data2.getCourseTitle()+"】");
                            break;
                    }
                }

            }
        }