feat(customer): 添加客户销售信息结算方式字段

- 在CustomerSalesInfo实体类中新增settlementMethod字段
- 在CustomerSalesInfoBo业务对象中新增settlementMethod字段
- 在CustomerSalesInfoVo视图对象中新增settlementMethod字段
- 重构SupplierInfoServiceImpl中的查询条件逻辑，添加供应商编号和企业名称的条件筛选

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/CustomerSalesInfo.java

@@ -1,13 +1,14 @@
 package org.dromara.customer.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 
 /**
  * 客户销售信息对象 customer_sales_info
@@ -165,4 +166,6 @@ public class CustomerSalesInfo extends TenantEntity {
      */
     private String accountBelong;
 
+    private Long settlementMethod;
+
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/CustomerSalesInfoBo.java

@@ -1,13 +1,13 @@
 package org.dromara.customer.domain.bo;
 
-import org.dromara.customer.domain.CustomerSalesInfo;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.customer.domain.CustomerSalesInfo;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -161,6 +161,8 @@ public class CustomerSalesInfoBo extends BaseEntity {
      */
     private String remark;
 
+    private Long settlementMethod;
+
     private List<Long> customerIds;
 
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/CustomerSalesInfoVo.java

@@ -1,18 +1,16 @@
 package org.dromara.customer.domain.vo;
 
-import java.math.BigDecimal;
-
-import org.dromara.customer.domain.CustomerSalesInfo;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.customer.domain.CustomerSalesInfo;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
+import java.math.BigDecimal;
 
 
 /**
@@ -192,5 +190,7 @@ public class CustomerSalesInfoVo implements Serializable {
 
     private String belongingDepartment;
 
+    private Long settlementMethod;
+
 
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierInfoServiceImpl.java

@@ -641,6 +641,8 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     @Override
     public TableDataInfo<SupplierInfoVo> getSupplierInformation(SupplierInfoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SupplierInfo> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getSupplierNo()), SupplierInfo::getSupplierNo, bo.getSupplierNo());
+        lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), SupplierInfo::getEnterpriseName, bo.getEnterpriseName());
         // 1. 基础分页查询
         if (bo.getSupplyStatus() == null) {
             //正式供应商