2.0统计bug修改

无关风月

2024-07-17 a290d3c875f1ff6549010703ca95b654d022977d

2.0统计bug修改

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java

@@ -325,18 +325,18 @@
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord.getPaymentStatus() == 1){
                            if (settlementRecord!=null &&settlementRecord.getPaymentStatus() == 1){
                                continue;
                            }
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord.getPaymentStatus() == 2){
                            if (settlementRecord!=null &&settlementRecord.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord.getPaymentStatus() == 2){
                    if (settlementRecord!=null && settlementRecord.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
@@ -374,18 +374,18 @@
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord1.getPaymentStatus() == 1){
                            if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 1){
                                continue;
                            }
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord1.getPaymentStatus() == 2){
                            if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord1.getPaymentStatus() == 2){
                    if (settlementRecord1!=null && settlementRecord1.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
@@ -1795,18 +1795,18 @@
                    if (state!=null){
                        if (state == 1){
                            // 查询已结算的
                            if (settlementRecord.getPaymentStatus() == 1){
                            if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 1){
                                continue;
                            }
                        }
                        if (state == 2){
                            // 查询未结算的
                            if (settlementRecord.getPaymentStatus() == 2){
                            if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 2){
                                continue;
                            }
                        }
                    }
                    if (settlementRecord.getPaymentStatus() == 2){
                    if (settlementRecord!=null&&settlementRecord.getPaymentStatus() == 2){
                        // 已结算
                        platformVO.setState(1);
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));