Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

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

@@ -5,9 +5,6 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -328,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()));
@@ -377,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()));
@@ -1798,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()));