代码提交

无关风月

2024-11-15 06dad2095dbe4c465025e5bc6e0220521636e2c2

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

@@ -91,8 +91,8 @@
        String endTime = null;
        if (org.springframework.util.StringUtils.hasLength(dto.getTime())){
            String[] split = dto.getTime().split(" - ");
            startTime = split[0]+"00:00:00";
            endTime = split[1]+"23:59:59";
            startTime = split[0]+" 00:00:00";
            endTime = split[1]+" 23:59:59";
        }
        String userId = dto.getUid();
        LambdaQueryWrapper<AppUser> appUserWalletRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -147,7 +147,7 @@
            return R.ok(empty);
        }
        for (AppUserWalletRecord record : page.getRecords()) {
            record.setId(record.getOrderId());
            record.setId(record.getId());
        }
        return R.ok(PageDTO.of(page, OrderListVO.class));
    }
@@ -210,7 +210,7 @@
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
            }else if (byId.getReason().equals("充值")){
                Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (byId.getChildAppUserId() == null && one!=null){
                if (one!=null){
                    orderDetailVO.setType("充值");
                    orderDetailVO.setPayType(one.getPayType());
                    orderDetailVO.setPayOrderNo(one.getPayOrderNo());
@@ -218,6 +218,8 @@
                        orderDetailVO.setRemark("微信支付");
                    }else if (one.getPayType()==2){
                        orderDetailVO.setRemark("支付宝支付");
                    }else if (one.getPayType() == 3){
                        orderDetailVO.setRemark("IOS内购");
                    }
                    orderDetailVO.setChangeType(byId.getChangeType());
                    orderDetailVO.setAmount(byId.getAmount());
@@ -238,7 +240,7 @@
                        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());
@@ -248,7 +250,8 @@
                orderDetailVO.setAmount(byId1.getAmount());
                orderDetailVO.setChangeType(byId.getChangeType());
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
                return R.ok(new OrderDetailVO());
                orderDetailVO.setRemark(byId1.getReason());
                return R.ok(orderDetailVO);

            }
        }
@@ -277,6 +280,7 @@
                orderDetailVO.setAmount(byId1.getAmount());
                orderDetailVO.setChangeType(byId.getChangeType());
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
                orderDetailVO.setRemark("银行卡提现");
            }else if (byId.getReason().equals("充值")){
                Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                    orderDetailVO.setType("充值");
@@ -286,7 +290,15 @@
                    orderDetailVO.setChangeType(byId.getChangeType());
                    orderDetailVO.setAmount(byId.getAmount());
                    orderDetailVO.setPaymentTime(one.getPaymentTime());
                    return R.ok(orderDetailVO);
                    if (one.getPayType()==1){
                        orderDetailVO.setRemark("微信支付");
                    }else if (one.getPayType()==2){
                        orderDetailVO.setRemark("支付宝支付");
                    }else if (one.getPayType() == 3){
                        orderDetailVO.setRemark("IOS内购");
                    }

                return R.ok(orderDetailVO);
            }else if (byId.getReason().equals("分佣收益")){
                Order one = remoteOrderService.getOrderById(byId.getOrderId()).getData();
                if (byId.getChildAppUserId()!=null && one!=null){
@@ -296,6 +308,7 @@
                    orderDetailVO.setChangeType(byId.getChangeType());
                    orderDetailVO.setAmount(byId.getAmount());
                    orderDetailVO.setRemark(one.getRemark());
                    orderDetailVO.setRemark("分佣收益");
                    if (one.getCommissionId()!=null){
                        AppUser appUserById = appUserService.getById(one.getAppUserId());
                        orderDetailVO.setUserName(appUserById.getNickname());
@@ -311,6 +324,7 @@
                orderDetailVO.setAmount(byId1.getAmount());
                orderDetailVO.setChangeType(byId.getChangeType());
                orderDetailVO.setPaymentTime(byId1.getUpdateTime());
                orderDetailVO.setRemark(byId1.getReason());
                return R.ok(orderDetailVO);
            }else if (byId.getReason().contains("课程")){
                Order data = remoteOrderService.getOrderById(byId.getOrderId()).getData();
@@ -321,6 +335,8 @@
                    orderDetailVO.setAmount(data.getBalance());
                    orderDetailVO.setChangeType(byId.getChangeType());
                    orderDetailVO.setPaymentTime(data.getPaymentTime());
                    if (data1!=null)orderDetailVO.setRemark("课程购买【"+data1.getCourseTitle()+"】");

                }
                return R.ok(orderDetailVO);

@@ -333,6 +349,7 @@
                    orderDetailVO.setAmount(data.getBalance());
                    orderDetailVO.setChangeType(2);
                    orderDetailVO.setPaymentTime(data.getPaymentTime());
                    if (data1!=null)orderDetailVO.setRemark("疗愈购买【"+data1.getMeditationTitle()+"】");
                }
                return R.ok(orderDetailVO);