1、支付模块字段调整

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/controller/AssessmentPayLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 支付记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-30
  * @Version: V1.0
  */
 @Api(tags="支付记录表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/entity/AssessmentPayLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 支付记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-30
  * @Version: V1.0
  */
 @Data
@@ -72,18 +72,6 @@ public class AssessmentPayLog implements Serializable {
 	@Excel(name = "支付时间", width = 15)
     @ApiModelProperty(value = "支付时间")
     private java.util.Date payTime;
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
-    private java.lang.String name;
-	/**手机号*/
-	@Excel(name = "手机号", width = 15)
-    @ApiModelProperty(value = "手机号")
-    private java.lang.String phone;
-	/**公司名称*/
-	@Excel(name = "公司名称", width = 15)
-    @ApiModelProperty(value = "公司名称")
-    private java.lang.String company;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/mapper/AssessmentPayLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 支付记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-30
  * @Version: V1.0
  */
 public interface AssessmentPayLogMapper extends BaseMapper<AssessmentPayLog> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/IAssessmentPayLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 支付记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-30
  * @Version: V1.0
  */
 public interface IAssessmentPayLogService extends IService<AssessmentPayLog> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/service/impl/AssessmentPayLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 支付记录表
  * @Author: jeecg-boot
- * @Date:   2025-09-19
+ * @Date:   2025-09-30
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/AssessmentPayLogList.vue

@@ -4,6 +4,38 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="批次标识">
+              <a-input placeholder="请输入批次标识" v-model="queryParam.batchNo"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="兑换码">
+              <a-input placeholder="请输入兑换码" v-model="queryParam.code"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="支付状态">
+                <j-dict-select-tag placeholder="请选择支付状态" v-model="queryParam.status" dictCode="status_pay"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="关联用户">
+                <j-search-select-tag placeholder="请选择关联用户" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -152,21 +184,6 @@
             align:"center",
             dataIndex: 'payTime'
           },
-          {
-            title:'姓名',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'手机号',
-            align:"center",
-            dataIndex: 'phone'
-          },
-          {
-            title:'公司名称',
-            align:"center",
-            dataIndex: 'company'
-          },
           {
             title:'关联用户',
             align:"center",
@@ -212,9 +229,6 @@
         fieldList.push({type:'BigDecimal',value:'discountAmount',text:'优惠金额',dictCode:''})
         fieldList.push({type:'string',value:'status',text:'支付状态',dictCode:'status_pay'})
         fieldList.push({type:'datetime',value:'payTime',text:'支付时间'})
-        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'手机号',dictCode:''})
-        fieldList.push({type:'Text',value:'company',text:'公司名称',dictCode:''})
         fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue/modules/AssessmentPayLogForm.vue

@@ -33,21 +33,6 @@
               <j-date placeholder="请选择支付时间"  v-model="model.payTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
-              <a-input v-model="model.company" placeholder="请输入公司名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
               <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
@@ -90,10 +75,6 @@
         },
         confirmLoading: false,
         validatorRules: {
-           phone: [
-              { required: false},
-              { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
-           ],
         },
         url: {
           add: "/assessmentPayLog/assessmentPayLog/add",

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/assessmentPayLog/vue3/AssessmentPayLog.data.ts

@@ -34,21 +34,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'payTime'
    },
-   {
-    title: '姓名',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '手机号',
-    align:"center",
-    dataIndex: 'phone'
-   },
-   {
-    title: '公司名称',
-    align:"center",
-    dataIndex: 'company'
-   },
    {
     title: '关联用户',
     align:"center",
@@ -57,6 +42,36 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "批次标识",
+      field: "batchNo",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "兑换码",
+      field: "code",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "支付状态",
+      field: "status",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"status_pay"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "关联用户",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -93,27 +108,6 @@ export const formSchema: FormSchema[] = [
     field: 'payTime',
     component: 'Input',
   },
-  {
-    label: '姓名',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '手机号',
-    field: 'phone',
-    component: 'Input',
-    dynamicRules: ({model,schema}) => {
-          return [
-                 { required: false},
-                 { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
-          ];
-     },
-  },
-  {
-    label: '公司名称',
-    field: 'company',
-    component: 'Input',
-  },
   {
     label: '关联用户',
     field: 'userId',