代码提交

无关风月

2024-12-16 fd88d7b527e99bbf7272d28bf0826b05e3c175d8

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java

@@ -113,7 +113,7 @@
                .eq(Order::getPaymentStatus, 2)
                .ne(Order::getRefundStatus, 3).list();
        if (list.isEmpty()){
            return R.ok(0);
            return R.ok(2);
        }else{
            return R.ok(1);
        }
@@ -223,8 +223,9 @@
                    orderCourseVO.setCourseTitle(data1.getMeditationTitle());
                    orderCourseVO.setDescription(data1.getCoverDescription());
                    orderCourseVO.setCoverUrl(data1.getCoverUrl());
                    orderCourseVO.setGeneralPrice(data1.getGeneralPrice());
                    orderCourseVO.setIosPrice(data1.getIosPrice());
                    Order byId = orderService.getById(orderCourseVO.getId());
                    orderCourseVO.setGeneralPrice(byId.getRealPayAmount());
                    orderCourseVO.setIosPrice(byId.getRealPayAmount());
                    orderCourseVO.setCount(data1.getRealLearnedNum()+data1.getVirtualLearnedNum());
                    orderCourseVO.setChargeType(data1.getChargeType());
                    orderCourseVO.setCoverDescription(data1.getCoverDescription());
@@ -243,6 +244,9 @@
                        Long data9 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
                        b+=data9;
                    }
                    Order byId1 = orderService.getById(orderCourseVO.getId());
                    orderCourseVO.setGeneralPrice(byId1.getRealPayAmount());
                    orderCourseVO.setIosPrice(byId1.getRealPayAmount());
                    orderCourseVO.setCount(b+temp);
                    if (data4!=null){
                        orderCourseVO.setCourseTitle(data4.getCourseTitle());
@@ -342,7 +346,106 @@
            @RequestParam(value = "vipType", required = false) Integer vipType)

    {
        LoginUser loginUser = tokenService.getLoginUser();
        if (loginUser==null){
            return R.tokenError("登录失效");
        }
        Long userId = loginUser.getUserid();
        try {
            if (orderId!=null){
                Order order = orderService.getById(orderId);
                if (order.getRealPayAmount().compareTo(new BigDecimal("0")) == 0 ){
                    // 无需付款
                    switch (orderFrom){
                        case 1:
                            Meditation data1 = remoteMeditationService.getMeditationById(targetId).getData();
                            order.setBuyContent("购买疗愈【"+data1.getMeditationTitle()+"】");
                            switch (payType){
                                case 1:
                                    order.setTotalAmount(data1.getGeneralPrice());
                                    order.setRealPayAmount(data1.getGeneralPrice());

                                    break;
                                case 2:
                                    order.setTotalAmount(data1.getIosPrice());
                                    order.setRealPayAmount(data1.getIosPrice());
                                    break;
                            }
                            break;
                        case 2:
                            Course data = remoteCourseService.getCourseById(targetId).getData();

                            order.setBuyContent("购买课程【"+data.getCourseTitle()+"】");
                            switch (payType){
                                case 1:
                                    order.setTotalAmount(data.getGeneralPrice());
                                    order.setRealPayAmount(data.getGeneralPrice());

                                    break;
                                case 2:
                                    order.setTotalAmount(data.getIosPrice());
                                    order.setRealPayAmount(data.getIosPrice());
                                    break;
                            }
                            if (receiverId!=null){
                                remoteAppUserService.addNotice(receiverId + "", data.getId() + "",
                                        userId + "", order.getTotalAmount() + "");
                            }

                            break;
                    }
                    orderService.updateById(order);
                    switch (orderFrom){
                        case 2:
                            if (receiverId!=null){
                                remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getGiveUserId(),order.getId(),1);
                                remoteAppUserService.addNotice(receiverId+"",order.getBusinessId()+"",order.getAppUserId()+"",order.getTotalAmount()+"");
                            }else{
                                // 自己购买
                                remoteAppUserService.addAppUserCourse(order.getBusinessId(),order.getAppUserId(),order.getId(),2);
                            }
                            break;
                    }

                    // 删除原有非余额支付详细记录
                    OrderPaymentRecord two = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, order.getId())
                            .ne(OrderPaymentRecord::getPaymentType, 4).one();
                    if (two!=null){
                        orderPaymentRecordService.removeById(two.getId());
                    }
                    OrderPaymentRecord one = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, order.getId())
                            .eq(OrderPaymentRecord::getPaymentType, 4).one();
                    if (one!=null){
                        one.setOrderId(order.getId());
                        one.setPaymentType(4);
                        one.setPayAmount(new BigDecimal("0"));
                        one.setPaymentStatus(2);
                        orderPaymentRecordService.updateById(one);
                    }else{
                        OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
                        orderPaymentRecord.setOrderId(order.getId());
                        orderPaymentRecord.setPaymentType(4);
                        orderPaymentRecord.setPayAmount(new BigDecimal("0"));
                        orderPaymentRecord.setPaymentStatus(2);
                        orderPaymentRecordService.save(orderPaymentRecord);
                    }
                    OrderPaymentRecord orderPaymentRecord = new OrderPaymentRecord();
                    orderPaymentRecord.setOrderId(order.getId());
                    orderPaymentRecord.setPaymentType(4);
                    orderPaymentRecord.setPayAmount(order.getTotalAmount());
                    orderPaymentRecord.setPaymentStatus(2);
                    orderPaymentRecordService.save(orderPaymentRecord);
                    ClientPlaceOrderVO clientPlaceOrderVO = new ClientPlaceOrderVO();
                    clientPlaceOrderVO.setId(order.getId());
                    clientPlaceOrderVO.setOrderNo(order.getBizOrderNo());
                    order.setRealPayAmount(new BigDecimal("0"));
                    order.setPayType(4);
                    orderService.updateById(order);
                    return R.ok(clientPlaceOrderVO);
            }

            }

            ClientPlaceOrderVO clientPlaceOrderVO = orderService.placeOrder(targetId, orderFrom, receiverId, orderId,
                    balanceFlag, payType, amount, vipType,type);
            System.err.println("支付返回参数"+clientPlaceOrderVO);
@@ -366,7 +469,7 @@
        if (refund!=null && (!refund.equals("success"))){
            return  R.fail(refund);
        }
        byId.setRefundStatus(2);
        byId.setRefundStatus(3);
        byId.setRefundRemark(remark);
        byId.setPaymentStatus(3);
        byId.setRefundTime(LocalDateTime.now());
@@ -581,7 +684,8 @@
                one.setPaymentStatus(2);
                one.setPaymentTime(LocalDateTime.now());
                OrderPaymentRecord one2 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
                        .ne(OrderPaymentRecord::getPaymentType, 4).one();
                        .ne(OrderPaymentRecord::getPaymentType, 4)
                        .eq(OrderPaymentRecord::getPayOrderNo,string2).one();
                if (one2!=null){
                    one2.setPaymentStatus(2);
                    one2.setPayOrderNo(string2);
@@ -593,11 +697,9 @@
                AppUser data = remoteAppUserService.getAppUserById(one.getAppUserId() + "").getData();
                if (one.getGiveUserId()!=null){
                    remoteAppUserService.addNotice(one.getGiveUserId() + "", one.getBusinessId() + "",
                            one.getAppUserId() + "", one.getTotalAmount() + "");
                            one.getAppUserId() + "", realPayAmount + "");
                }

                if (data.getInviteUserId()!=null) {

                    if (one.getOrderFrom() == 1 || one.getOrderFrom() == 2 || one.getOrderFrom() == 3) {
                        // 查询实际支付价格 不包含余额抵扣价格
                        OrderPaymentRecord one1 = orderPaymentRecordService.lambdaQuery().eq(OrderPaymentRecord::getOrderId, one.getId())
@@ -606,8 +708,7 @@
                    CommissionRule data1 = sysUserClient.getCommission().getData();
                    if (data1 != null) {
                        if (data1.getProportion() != null) {

                            BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
                            BigDecimal bigDecimal = one1.getPayAmount().add(one.getChangePrice()!=null?one.getChangePrice():new BigDecimal("0")).multiply(data1.getProportion()).divide(new BigDecimal("100"))
                                    .setScale(2, BigDecimal.ROUND_DOWN);
                            // 上级获取的分佣金额
                            AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
@@ -617,16 +718,18 @@
//                                                    appUserById.getBalance().add(bigDecimal))
//                                            .build(), SecurityConstants.INNER);
                            // 新增分佣流水明细
                            AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
                            appUserWalletRecord.setAppUserId(data.getInviteUserId());
                            appUserWalletRecord.setChangeType(1);
                            appUserWalletRecord.setReason("分佣收益");
                            appUserWalletRecord.setAmount(bigDecimal);
                            appUserWalletRecord.setChildAppUserId(one.getAppUserId());
                            appUserWalletRecord.setOrderId(one.getId());
                            remoteAppUserService.addBalanceRecord(appUserWalletRecord);
                            one.setCommissionAmount(bigDecimal);
                            one.setCommissionId(data.getInviteUserId());
                            if (bigDecimal.compareTo(new BigDecimal("0"))>0){
                                AppUserWalletRecord appUserWalletRecord = new AppUserWalletRecord();
                                appUserWalletRecord.setAppUserId(data.getInviteUserId());
                                appUserWalletRecord.setChangeType(1);
                                appUserWalletRecord.setReason("分佣收益");
                                appUserWalletRecord.setAmount(bigDecimal);
                                appUserWalletRecord.setChildAppUserId(one.getAppUserId());
                                appUserWalletRecord.setOrderId(one.getId());
                                remoteAppUserService.addBalanceRecord(appUserWalletRecord);
                                one.setCommissionAmount(bigDecimal);
                                one.setCommissionId(data.getInviteUserId());
                            }
                            orderService.updateById(one);
                        }
                    }
@@ -644,7 +747,6 @@
                            Meditation data1 = remoteMeditationService.getMeditationById(one.getBusinessId()).getData();
                            appUserWalletRecord.setChangeType(2);
                            reason = "购买疗愈【"+data1.getMeditationTitle()+"】";

                            break;
                        case 2:
                            Course data2 = remoteCourseService.getCourseById(one.getBusinessId()).getData();