招聘信息管理

admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue

@@ -171,7 +171,7 @@
           {
             title:'性别',
             align:"center",
-            dataIndex: 'sex_dictText'
+            dataIndex: 'gender_dictText'
           },
           {
             title:'期望薪资最小值',

admin-hanhai-vue/src/views/zpxxboss1/TbUserRoleList.vue

@@ -0,0 +1,231 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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.phone"></a-input>
+            </a-form-item>
+          </a-col>
+          <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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-user-role-modal ref="modalForm" @ok="modalFormOk"></tb-user-role-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbUserRoleModal from './modules/TbUserRoleModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'TbUserRoleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbUserRoleModal
+    },
+    data () {
+      return {
+        description: 'tb_user_role管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'公司名称',
+            align:"center",
+            dataIndex: 'companyName'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'companyAddress'
+          },
+          {
+            title:'行业',
+            align:"center",
+            dataIndex: 'industryName'
+          },
+          {
+            title:'身份证上传',
+            align:"center",
+            dataIndex: 'idcard',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'角色',
+            align:"center",
+            dataIndex: 'role_dictText'
+          },
+          {
+            title:'营业执照上传',
+            align:"center",
+            dataIndex: 'businessLicense',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'auditStatus_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/userRole/tbUserRole/zpxxboss1list",
+          delete: "/userRole/tbUserRole/delete",
+          deleteBatch: "/userRole/tbUserRole/deleteBatch",
+          exportXlsUrl: "/userRole/tbUserRole/exportXls",
+          importExcelUrl: "userRole/tbUserRole/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
+        fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
+        fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''})
+        fieldList.push({type:'Text',value:'idcard',text:'身份证上传',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
+        fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'})
+        fieldList.push({type:'int',value:'moneymin',text:'期望薪资最小值',dictCode:''})
+        fieldList.push({type:'int',value:'moneymax',text:'期望薪资最大值',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'})
+        fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
+        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/zpxxboss1/modules/TbUserRoleForm.vue

@@ -0,0 +1,146 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
+              <a-input v-model="model.companyName" placeholder="请输入公司名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyAddress">
+              <a-input v-model="model.companyAddress" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="行业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName">
+              <a-input v-model="model.industryName" placeholder="请输入行业"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard">
+              <j-image-upload isMultiple  v-model="model.idcard" ></j-image-upload>
+            </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="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业执照上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="businessLicense">
+              <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TbUserRoleForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/userRole/tbUserRole/add",
+          edit: "/userRole/tbUserRole/edit",
+          queryById: "/userRole/tbUserRole/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/zpxxboss1/modules/TbUserRoleModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-user-role-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/zpxxboss1/modules/TbUserRoleModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-user-role-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

admin-hanhai-vue/src/views/zpxxboss2/TbUserRoleList.vue

@@ -0,0 +1,232 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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.phone"></a-input>
+            </a-form-item>
+          </a-col>
+
+          <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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-user-role-modal ref="modalForm" @ok="modalFormOk"></tb-user-role-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbUserRoleModal from './modules/TbUserRoleModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'TbUserRoleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbUserRoleModal
+    },
+    data () {
+      return {
+        description: 'tb_user_role管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'公司名称',
+            align:"center",
+            dataIndex: 'companyName'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'companyAddress'
+          },
+          {
+            title:'行业',
+            align:"center",
+            dataIndex: 'industryName'
+          },
+          {
+            title:'身份证上传',
+            align:"center",
+            dataIndex: 'idcard',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'角色',
+            align:"center",
+            dataIndex: 'role_dictText'
+          },
+          {
+            title:'营业执照上传',
+            align:"center",
+            dataIndex: 'businessLicense',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'auditStatus_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/userRole/tbUserRole/zpxxboss2list",
+          delete: "/userRole/tbUserRole/delete",
+          deleteBatch: "/userRole/tbUserRole/deleteBatch",
+          exportXlsUrl: "/userRole/tbUserRole/exportXls",
+          importExcelUrl: "userRole/tbUserRole/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
+        fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
+        fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''})
+        fieldList.push({type:'Text',value:'idcard',text:'身份证上传',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
+        fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'})
+        fieldList.push({type:'int',value:'moneymin',text:'期望薪资最小值',dictCode:''})
+        fieldList.push({type:'int',value:'moneymax',text:'期望薪资最大值',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'})
+        fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
+        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/zpxxboss2/modules/TbUserRoleForm.vue

@@ -0,0 +1,146 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
+              <a-input v-model="model.companyName" placeholder="请输入公司名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyAddress">
+              <a-input v-model="model.companyAddress" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="行业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName">
+              <a-input v-model="model.industryName" placeholder="请输入行业"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard">
+              <j-image-upload isMultiple  v-model="model.idcard" ></j-image-upload>
+            </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="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业执照上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="businessLicense">
+              <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TbUserRoleForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/userRole/tbUserRole/add",
+          edit: "/userRole/tbUserRole/edit",
+          queryById: "/userRole/tbUserRole/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/zpxxboss2/modules/TbUserRoleModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-user-role-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/zpxxboss2/modules/TbUserRoleModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-user-role-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

admin-hanhai-vue/src/views/zpxxwork/TbUserRoleList.vue

@@ -0,0 +1,248 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <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.phone"></a-input>
+            </a-form-item>
+          </a-col>
+          <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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-user-role-modal ref="modalForm" @ok="modalFormOk"></tb-user-role-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbUserRoleModal from './modules/TbUserRoleModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'TbUserRoleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbUserRoleModal
+    },
+    data () {
+      return {
+        description: 'tb_user_role管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+
+
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'工种',
+            align:"center",
+            dataIndex: 'industryName'
+          },
+          {
+            title:'个人简介',
+            align:"center",
+            dataIndex: 'detail'
+          },
+          {
+            title:'身份证上传',
+            align:"center",
+            dataIndex: 'idCard',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'年龄',
+            align:"center",
+            dataIndex: 'age'
+          },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'gender_dictText'
+          },
+          {
+            title:'期望薪资最小值',
+            align:"center",
+            dataIndex: 'moneyMin'
+          },
+          {
+            title:'期望薪资最大值',
+            align:"center",
+            dataIndex: 'moneyMax'
+          },
+          {
+            title:'角色',
+            align:"center",
+            dataIndex: 'role_dictText'
+          },
+
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'auditStatus_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/userRole/tbUserRole/zpxxworklist",
+          delete: "/userRole/tbUserRole/delete",
+          deleteBatch: "/userRole/tbUserRole/deleteBatch",
+          exportXlsUrl: "/userRole/tbUserRole/exportXls",
+          importExcelUrl: "userRole/tbUserRole/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
+        fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
+        fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''})
+        fieldList.push({type:'Text',value:'idCard',text:'身份证上传',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
+        fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'})
+        fieldList.push({type:'int',value:'moneyMin',text:'期望薪资最小值',dictCode:''})
+        fieldList.push({type:'int',value:'moneyMax',text:'期望薪资最大值',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'})
+        fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
+        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/zpxxwork/modules/TbUserRoleForm.vue

@@ -0,0 +1,162 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+
+
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工种" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName">
+              <a-input v-model="model.industryName" placeholder="工种"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="个人简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
+              <a-textarea v-model="model.detail" rows="4" placeholder="请输入个人简介" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard">
+              <j-image-upload isMultiple  v-model="model.idCard" ></j-image-upload>
+            </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="age">
+              <a-input-number v-model="model.age" placeholder="请输入年龄" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gender">
+              <j-dict-select-tag type="list" v-model="model.gender" dictCode="sex" placeholder="请选择性别" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="期望薪资最小值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymin">
+              <a-input-number v-model="model.moneyMin" placeholder="请输入期望薪资最小值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="期望薪资最大值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymax">
+              <a-input-number v-model="model.moneyMax" placeholder="请输入期望薪资最大值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" />
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TbUserRoleForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/userRole/tbUserRole/add",
+          edit: "/userRole/tbUserRole/edit",
+          queryById: "/userRole/tbUserRole/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/zpxxwork/modules/TbUserRoleModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-user-role-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/zpxxwork/modules/TbUserRoleModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-user-role-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/bestpay/model/TransferBatchesDetailsRequest.java

@@ -0,0 +1,32 @@
+package org.jeecg.common.bestpay.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * @author java996.icu
+ * @title: TransferBatchesDetailsRequest
+ * @projectName merchant
+ * @description: TODO
+ * @date 2022/10/10 15:45
+ * @Version V1.0
+ */
+@Data
+public class TransferBatchesDetailsRequest {
+
+    /**商家明细单号*/
+    @JSONField(name = "out_detail_no")
+    private String outDetailNo;
+    /**转账金额*/
+    @JSONField(name = "transfer_amount")
+    private Integer transferAmount;
+    /**转账备注*/
+    @JSONField(name = "transfer_remark")
+    private String transferRemark;
+    /**用户在直连商户应用下的用户标示*/
+    private String openid;
+    /**收款用户姓名*/
+    @JSONField(name = "user_name")
+    private String userName;
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/bestpay/model/TransferBatchesRequest.java

@@ -3,6 +3,8 @@ package org.jeecg.common.bestpay.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author java996.icu
  * @title: TransferBatchesRequest
@@ -13,36 +15,27 @@ import lombok.Data;
  */
 @Data
 public class TransferBatchesRequest {
-
+    /**直连商户的appid*/
     private String appid;
-    /**
-     * 商家批次单号
-     * 商户系统内部的商家批次单号，要求此参数只能由数字、大小写字母组成，在商户系统内部唯一
-     */
+    /**商家批次单号*/
     @JSONField(name = "out_batch_no")
     private String outBatchNo;
-    /**
-     * 批次名称
-     */
+    /**批次名称*/
     @JSONField(name = "batch_name")
     private String batchName;
-    /**
-     * 批次备注
-     * 转账说明，UTF8编码，最多允许32个字符
-     */
+    /**批次备注*/
     @JSONField(name = "batch_remark")
     private String batchRemark;
-    /**
-     * 转账总金额
-     * 转账金额单位为“分”。转账总金额必须与批次内所有明细转账金额之和保持一致，否则无法发起转账操作
-     */
+    /**转账总金额*/
     @JSONField(name = "total_amount")
     private Integer totalAmount;
-    /**
-     * 转账总笔数
-     * 一个转账批次单最多发起三千笔转账。转账总笔数必须与批次内所有明细之和保持一致，否则无法发起转账操作
-     */
+    /**转账总笔数*/
     @JSONField(name = "total_num")
     private Integer totalNum;
+    /**发起批量转账的明细列表，最多三千笔*/
+    @JSONField(name = "transfer_detail_list")
+    private List<TransferBatchesDetailsRequest> transferDetailList;
+    /**转账场景id*/
+    private String transferSceneId;
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/bestpay/model/TransferBatchesResp.java

@@ -0,0 +1,27 @@
+package org.jeecg.common.bestpay.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * @author java996.icu
+ * @title: TransferBatchesResp
+ * @projectName merchant
+ * @description: TODO
+ * @date 2022/12/13 14:29
+ * @Version V1.0
+ */
+@Data
+public class TransferBatchesResp {
+
+    /**微信批次单号*/
+    @JSONField(name = "batch_id")
+    private String batchId;
+    /**商家批次单号*/
+    @JSONField(name = "out_batch_no")
+    private String outBatchNo;
+    /**批次创建时间*/
+    @JSONField(name = "create_time")
+    private String createTime;
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/bestpay/pay/WeChatPayConfig2.java

@@ -0,0 +1,166 @@
+package org.jeecg.common.bestpay.pay;
+
+import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
+import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
+import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
+import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials;
+import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
+import com.wechat.pay.contrib.apache.httpclient.cert.CertificatesManager;
+import com.wechat.pay.contrib.apache.httpclient.exception.HttpCodeException;
+import com.wechat.pay.contrib.apache.httpclient.exception.NotFoundException;
+import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.PrivateKey;
+import java.security.cert.*;
+
+/**
+ * @author java996.icu
+ * @title: WeChatPayConfig2
+ * @projectName chemu
+ * @description: TODO
+ * @date 2022/12/7 16:36
+ * @Version V1.0
+ */
+@Component
+@Data
+@Slf4j
+@ConfigurationProperties(prefix = "wxpay")
+public class WeChatPayConfig2 {
+
+    /**
+     * 应用编号
+     */
+    private String appId;
+    /**
+     * 商户号
+     */
+    private String mchId;
+    /**
+     * 服务商商户号
+     */
+    private String slMchId;
+    /**
+     * APIv2密钥
+     */
+    private String apiKey;
+    /**
+     * APIv3密钥
+     */
+    private String apiV3Key;
+    /**
+     * 支付通知回调地址
+     */
+    private String notifyUrl;
+    /**
+     * 退款回调地址
+     */
+    private String refundNotifyUrl;
+
+    /**
+     * API 证书中的 key.pem
+     */
+    private String keyPemPath;
+
+    /**
+     * 商户序列号
+     */
+    private String serialNo;
+
+    /**
+     * 微信支付V3-url前缀
+     */
+    private String baseUrl;
+
+
+    /**
+     * 获取商户的私钥文件
+     * @param keyPemPath
+     * @return
+     */
+    public PrivateKey getPrivateKey(String keyPemPath){
+
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(keyPemPath);
+        if(inputStream==null){
+            throw new RuntimeException("私钥文件不存在");
+        }
+        return PemUtil.loadPrivateKey(inputStream);
+    }
+
+    /**
+     * 获取证书管理器实例
+     * @return
+     */
+    @Bean
+    public Verifier getVerifier() throws GeneralSecurityException, IOException, HttpCodeException, NotFoundException {
+
+        log.info("获取证书管理器实例");
+
+        //获取商户私钥
+        PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+        //私钥签名对象
+        PrivateKeySigner privateKeySigner = new PrivateKeySigner(serialNo, privateKey);
+
+        //身份认证对象
+        WechatPay2Credentials wechatPay2Credentials = new WechatPay2Credentials(mchId, privateKeySigner);
+
+        // 使用定时更新的签名验证器，不需要传入证书
+        CertificatesManager certificatesManager = CertificatesManager.getInstance();
+        certificatesManager.putMerchant(mchId,wechatPay2Credentials,apiV3Key.getBytes(StandardCharsets.UTF_8));
+
+        return certificatesManager.getVerifier(mchId);
+    }
+
+
+    /**
+     * 获取支付http请求对象
+     * @param verifier
+     * @return
+     */
+    @Bean(name = "wxPayClient")
+    public CloseableHttpClient getWxPayClient(Verifier verifier)  {
+
+        //获取商户私钥
+        PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+        WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
+                .withMerchant(mchId, serialNo, privateKey)
+                .withValidator(new WechatPay2Validator(verifier));
+
+        // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
+        return builder.build();
+    }
+
+    /**
+     * 获取HttpClient，无需进行应答签名验证，跳过验签的流程
+     */
+    @Bean(name = "wxPayNoSignClient")
+    public CloseableHttpClient getWxPayNoSignClient(){
+
+        //获取商户私钥
+        PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+        //用于构造HttpClient
+        WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
+                //设置商户信息
+                .withMerchant(mchId, serialNo, privateKey)
+                //无需进行签名验证、通过withValidator((response) -> true)实现
+                .withValidator((response) -> true);
+
+        // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
+        return builder.build();
+    }
+
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/bestpay/utils/HttpRequestUtil.java

@@ -4,6 +4,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
+import org.apache.http.ParseException;
+import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -108,6 +110,7 @@ public class HttpRequestUtil {
             String requestUrl,
             String requestJson,
             String wechatPayserialNo,
+            String wechatPayserialNo2,
             String mchID4M,
             String privatekeypath) {
         CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -124,7 +127,7 @@ public class HttpRequestUtil {
             //-------------------------核心认证 start-----------------------------------------------------------------
             String strToken = VechatPayV3Util.getToken("POST",
                     "/v3/transfer/batches",
-                    requestJson,mchID4M,wechatPayserialNo, privatekeypath);
+                    requestJson,mchID4M,wechatPayserialNo2, privatekeypath);
 
             log.error("微信转账token "+strToken);
             // 添加认证信息
@@ -146,4 +149,44 @@ public class HttpRequestUtil {
         return null;
     }
 
+
+    /**
+     * 发送HTTP_GET请求
+     *
+     * @see 该方法会自动关闭连接,释放资源
+     * @param reqURL
+     *            请求地址(含参数)
+     * @param decodeCharset
+     *            解码字符集,解析响应数据时用之,其为null时默认采用UTF-8解码
+     * @return 远程主机响应正文
+     */
+    public static String sendGetRequest(String reqURL,String auth,String decodeCharset) {
+        long responseLength = 0; // 响应长度
+        String responseContent = null; // 响应内容
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+
+        HttpGet httpGet = new HttpGet(reqURL); // 创建org.apache.http.client.methods.HttpGet
+        httpGet.addHeader("Authorization", auth);
+        httpGet.addHeader("Accept", "application/json");
+        httpGet.addHeader("User-Agent", "https://zh.wikipedia.org/wiki/User_agent");
+        try {
+            HttpResponse response = httpclient.execute(httpGet); // 执行GET请求
+            HttpEntity entity = response.getEntity(); // 获取响应实体
+            if (null != entity) {
+                responseLength = entity.getContentLength();
+                responseContent = EntityUtils.toString(entity, decodeCharset == null ? "UTF-8" : decodeCharset);
+                EntityUtils.consume(entity); // Consume response content
+            }
+        } catch (ClientProtocolException e) {
+            System.out.println("该异常通常是协议错误导致,比如构造HttpGet对象时传入的协议不对(将'http'写成'htp')或者服务器端返回的内容不符合HTTP协议要求等,堆栈信息如下");
+        } catch (ParseException e) {
+            System.out.println(e.getMessage());
+        } catch (IOException e) {
+            System.out.println("该异常通常是网络原因引起的,如HTTP服务器未启动等,堆栈信息如下");
+        } finally {
+            httpclient.getConnectionManager().shutdown(); // 关闭连接,释放资源
+        }
+        return responseContent;
+    }
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/RedisKey.java

@@ -16,5 +16,8 @@ public class RedisKey {
     public static final String MER_WITHDRAWAL_AUDIT = "MER_WITHDRAWAL:AUDIT";
 
 
+    public static final String MER_WITHDRAWAL = "MER_WITHDRAWAL:";
+
+
 
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/controller/TbRechargeInfoLogController.java

@@ -1,14 +1,23 @@
 package org.jeecg.modules.rechargeInfoLog.controller;
 
 import java.math.BigDecimal;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.bestpay.model.TransferBatchesRequest;
+import org.jeecg.common.bestpay.utils.HttpRequestUtil;
+import org.jeecg.common.bestpay.utils.MoneyUtil;
 import org.jeecg.common.constant.RedisKey;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -105,8 +114,23 @@ public class TbRechargeInfoLogController extends JeecgController<TbRechargeInfoL
 		 Result<?> audit = tbRechargeInfoLogService.audit(id, status, checkInfo);
 		 return Result.OKMsg();
 	 }
-	 
-	 
+
+
+
+
+	 /**
+	  * 提现
+	  * @param id
+	  * @return
+	  */
+	 @GetMapping(value = "/withdrawal")
+	 public Result<?> withdrawal2(@RequestParam(name="id",required=true) String id){
+		 Result<?> audit = tbRechargeInfoLogService.handleWithdrawal(id);
+		 return Result.OK();
+	 }
+
+
+
 	 /**
 	 *   添加
 	 *

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/ITbRechargeInfoLogService.java

@@ -15,4 +15,7 @@ public interface ITbRechargeInfoLogService extends IService<TbRechargeInfoLog> {
 
     Result<?> audit(String id, boolean status, String checkInfo);
 
+    Result<?> handleWithdrawal(String id);
+
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/rechargeInfoLog/service/impl/TbRechargeInfoLogServiceImpl.java

@@ -1,6 +1,18 @@
 package org.jeecg.modules.rechargeInfoLog.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.wechat.pay.contrib.apache.httpclient.util.RsaCryptoUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.bestpay.model.TransferBatchesDetailsRequest;
+import org.jeecg.common.bestpay.model.TransferBatchesRequest;
+import org.jeecg.common.bestpay.model.TransferBatchesResp;
+import org.jeecg.common.bestpay.pay.WeChatPayConfig2;
+import org.jeecg.common.bestpay.utils.HttpRequestUtil;
+import org.jeecg.common.bestpay.utils.MoneyUtil;
 import org.jeecg.common.constant.RedisKey;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.RedisUtil;
@@ -9,6 +21,7 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.rechargeInfoLog.entity.TbRechargeInfoLog;
 import org.jeecg.modules.rechargeInfoLog.mapper.TbRechargeInfoLogMapper;
 import org.jeecg.modules.rechargeInfoLog.service.ITbRechargeInfoLogService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,14 +29,18 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: tb_recharge_info_log
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date: 2024-12-12
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class TbRechargeInfoLogServiceImpl extends ServiceImpl<TbRechargeInfoLogMapper, TbRechargeInfoLog> implements ITbRechargeInfoLogService {
 
@@ -31,25 +48,36 @@ public class TbRechargeInfoLogServiceImpl extends ServiceImpl<TbRechargeInfoLogM
     private RedisUtil redisUtil;
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
-
+    @Value("${wxpay.appId}")
+    private String appId;
+    @Value("${wechat.transferBatchUrl}")
+    private String transferBatchUrl;
+    @Value("${wxpay.mchId}")
+    private String mchId;
+    @Value("${wechat.keyPemPath}")
+    private String pemPath;
+    @Value("${wxpay.serialNo}")
+    private String wxsSerialNo;
+    @Resource
+    private WeChatPayConfig2 weChatPayConfig2;
 
     @Transactional
     @Override
     public Result<?> audit(String id, boolean status, String checkInfo) {
         Integer n = (Integer) redisUtil.get(RedisKey.MER_WITHDRAWAL_AUDIT + id);
-        if(n != null){
+        if (n != null) {
             throw new JeecgBootException("请勿重复点击！");
         }
-        redisUtil.set(RedisKey.MER_WITHDRAWAL_AUDIT + id,1,5);
+        redisUtil.set(RedisKey.MER_WITHDRAWAL_AUDIT + id, 1, 5);
         TbRechargeInfoLog rechargeInfoLog = this.getById(id);
-        if(rechargeInfoLog==null) {
+        if (rechargeInfoLog == null) {
             throw new JeecgBootException("未找到数据");
         }
 
         Long count = this.lambdaQuery()
                 .eq(TbRechargeInfoLog::getWithdrawalId, rechargeInfoLog.getId())
                 .count();
-        if(count != null && count > 0){
+        if (count != null && count > 0) {
             throw new JeecgBootException("此提现已处理过不通过，请勿重新点击");
         }
 
@@ -57,7 +85,7 @@ public class TbRechargeInfoLogServiceImpl extends ServiceImpl<TbRechargeInfoLogM
         TbRechargeInfoLog rechargeInfoLog1 = new TbRechargeInfoLog();
         rechargeInfoLog1.setId(rechargeInfoLog.getId());
         rechargeInfoLog1.setState(1);
-        if(!status){
+        if (!status) {
             //审核不通过退回余额
             rechargeInfoLog1.setState(3);
             rechargeInfoLog1.setCheckInfo(checkInfo);
@@ -67,7 +95,7 @@ public class TbRechargeInfoLogServiceImpl extends ServiceImpl<TbRechargeInfoLogM
             cmMemberAccount2.setId(account.getId());
             cmMemberAccount2.setPrice(account.getPrice().add(money));
             boolean b = hanHaiMemberService.updateById(cmMemberAccount2);
-            if(!b){
+            if (!b) {
                 throw new JeecgBootException("操作失败，请稍后重试");
             }
             TbRechargeInfoLog merRechargeInfoLog = new TbRechargeInfoLog();
@@ -82,15 +110,91 @@ public class TbRechargeInfoLogServiceImpl extends ServiceImpl<TbRechargeInfoLogM
             merRechargeInfoLog.setCheckInfo(checkInfo);
             merRechargeInfoLog.setWithdrawalId(rechargeInfoLog.getId());
             boolean save = this.save(merRechargeInfoLog);
-            if(!save){
+            if (!save) {
                 throw new JeecgBootException("操作失败");
             }
         }
         boolean b = this.updateById(rechargeInfoLog1);
-        if(!b){
+        if (!b) {
             throw new JeecgBootException("操作失败，请稍后重试");
         }
         return null;
 
     }
+
+    @Transactional(rollbackFor = {Exception.class})
+    @Override
+    public Result<?> handleWithdrawal(String id) {
+
+        Integer n = (Integer) redisUtil.get(RedisKey.MER_WITHDRAWAL + id);
+        if (n != null) {
+            throw new JeecgBootException("请勿重复点击，后果自负！");
+        }
+        redisUtil.set(RedisKey.MER_WITHDRAWAL + id, 1, 5);
+
+        TbRechargeInfoLog merRechargeInfoLog = this.getById(id);
+        if (merRechargeInfoLog == null) {
+            throw new JeecgBootException("未找到数据");
+        }
+        HanHaiMember merMember = hanHaiMemberService.getById(merRechargeInfoLog.getMemberId());
+        //微信-商家转账到零钱
+        String idStr = "zx" + IdWorker.getIdStr();
+        TransferBatchesRequest transferBatchesRequest = new TransferBatchesRequest();
+
+        transferBatchesRequest.setAppid(appId);
+        transferBatchesRequest.setTotalNum(1);
+        transferBatchesRequest.setOutBatchNo(idStr);
+        transferBatchesRequest.setBatchName("商家提现");
+        transferBatchesRequest.setBatchRemark(merRechargeInfoLog.getInfo());
+        if (StringUtils.isBlank(merRechargeInfoLog.getInfo()) || merRechargeInfoLog.getInfo().length() > 32) {
+            transferBatchesRequest.setBatchRemark("商家提现");
+        }
+        transferBatchesRequest.setTotalAmount(MoneyUtil.Yuan2Fen(merRechargeInfoLog.getMoney().doubleValue()));
+        List<TransferBatchesDetailsRequest> transferBatchesDetailsRequests = new ArrayList<>();
+        TransferBatchesDetailsRequest transferBatchesDetailsRequest = new TransferBatchesDetailsRequest();
+        transferBatchesDetailsRequest.setOutDetailNo(merRechargeInfoLog.getId());
+        transferBatchesDetailsRequest.setTransferAmount(MoneyUtil.Yuan2Fen(merRechargeInfoLog.getMoney().doubleValue()));
+        transferBatchesDetailsRequest.setTransferRemark(merRechargeInfoLog.getInfo());
+        if (StringUtils.isBlank(merRechargeInfoLog.getInfo()) || merRechargeInfoLog.getInfo().length() > 32) {
+            transferBatchesDetailsRequest.setTransferRemark("商家提现");
+        }
+        transferBatchesDetailsRequest.setOpenid(merMember.getAppletOpenid());
+        String serialNo = null;
+        try {
+            X509Certificate certificate = weChatPayConfig2.getVerifier().getValidCertificate();
+            serialNo = certificate.getSerialNumber().toString(16).toUpperCase();
+            String encryptOAEP = RsaCryptoUtil.encryptOAEP(merRechargeInfoLog.getRealName(), certificate);
+            transferBatchesDetailsRequest.setUserName(encryptOAEP);
+        } catch (Exception e) {
+            log.info("真实姓名加密失败");
+            e.printStackTrace();
+            throw new JeecgBootException("真实姓名加密失败");
+        }
+
+        transferBatchesDetailsRequests.add(transferBatchesDetailsRequest);
+        transferBatchesRequest.setTransferDetailList(transferBatchesDetailsRequests);
+//		 transferBatchesRequest.setTransferSceneId("1001");
+        String jsonString = JSONObject.toJSONString(transferBatchesRequest);
+
+
+        String postTransBatRequest = HttpRequestUtil.postTransBatRequest(transferBatchUrl, jsonString, serialNo, wxsSerialNo, mchId, pemPath);
+        log.error("返回结果1：" + postTransBatRequest);
+        TransferBatchesResp transferBatchesResp = JSON.parseObject(postTransBatRequest, TransferBatchesResp.class);
+        log.error("返回结果2：" + transferBatchesResp);
+        if (transferBatchesResp == null || org.apache.commons.lang3.StringUtils.isBlank(transferBatchesResp.getBatchId())) {
+            throw new JeecgBootException("打款失败");
+        }
+
+        TbRechargeInfoLog rechargeInfoLog1 = new TbRechargeInfoLog();
+        rechargeInfoLog1.setId(merRechargeInfoLog.getId());
+        rechargeInfoLog1.setState(2);
+        rechargeInfoLog1.setOutBatchNo(transferBatchesResp.getOutBatchNo());
+        rechargeInfoLog1.setBatchId(transferBatchesResp.getBatchId());
+        boolean b = this.updateById(rechargeInfoLog1);
+        if (!b) {
+            throw new JeecgBootException("操作失败，请稍后重试");
+        }
+        return Result.ok();
+    }
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java

@@ -73,6 +73,49 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 }
 
 
+	 @ApiOperation(value="tb_user_role-分页列表查询", notes="tb_user_role-分页列表查询")
+	 @GetMapping(value = "/zpxxboss1list")
+	 public Result<IPage<TbUserRole>> zpxxboss1list(TbUserRole tbUserRole,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 QueryWrapper<TbUserRole> queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
+		 queryWrapper.in("role",0).eq("audit_status",1).orderByDesc("create_time");
+		 Page<TbUserRole> page = new Page<TbUserRole>(pageNo, pageSize);
+		 IPage<TbUserRole> pageList = tbUserRoleService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+	 @ApiOperation(value="tb_user_role-分页列表查询", notes="tb_user_role-分页列表查询")
+	 @GetMapping(value = "/zpxxboss2list")
+	 public Result<IPage<TbUserRole>> zpxxboss2list(TbUserRole tbUserRole,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 QueryWrapper<TbUserRole> queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
+		 queryWrapper.in("role",1).eq("audit_status",1).orderByDesc("create_time");
+		 Page<TbUserRole> page = new Page<TbUserRole>(pageNo, pageSize);
+		 IPage<TbUserRole> pageList = tbUserRoleService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+	 @ApiOperation(value="tb_user_role-分页列表查询", notes="tb_user_role-分页列表查询")
+	 @GetMapping(value = "/zpxxworklist")
+	 public Result<IPage<TbUserRole>> zpxxworklist(TbUserRole tbUserRole,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 QueryWrapper<TbUserRole> queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
+		 queryWrapper.in("role",2).eq("audit_status",1).orderByDesc("create_time");
+		 Page<TbUserRole> page = new Page<TbUserRole>(pageNo, pageSize);
+		 IPage<TbUserRole> pageList = tbUserRoleService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
+
 	
 	/**
 	 *   添加

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -343,9 +343,10 @@ wechat:
   codeImg: /usr/codeImage
   savePath: WxCodeFile
   keyPemPath: apiclient_key.pem
-  serialNo:
+  serialNo: 6E4F9E70D56CC439B575B811CB4327621C81A839
   apiV3Key: 0fdb77429ffdf206c151af76a663041c
   baseUrl: https://api.mch.weixin.qq.com/v3
+  transferBatchUrl: https://api.mch.weixin.qq.com/v3/transfer/batches
 
 
 
@@ -363,8 +364,9 @@ wxpay:
   # 密钥路径,resources根目录下
   keyPemPath: apiclient_key.pem
   #商户证书序列号
-  serialNo:
+  serialNo: 6E4F9E70D56CC439B575B811CB4327621C81A839
   # 支付通知回调, pjm6m9.natappfree.cc 为内网穿透地址
-  notifyUrl:
+  notifyUrl: http://pjm6m9.natappfree.cc/pay/payNotify
   # 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
-  refundNotifyUrl:
+  refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
+

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -343,10 +343,10 @@ wechat:
   codeImg: /usr/codeImage
   savePath: WxCodeFile
   keyPemPath: apiclient_key.pem
-  serialNo:
+  serialNo: 6E4F9E70D56CC439B575B811CB4327621C81A839
   apiV3Key: 0fdb77429ffdf206c151af76a663041c
   baseUrl: https://api.mch.weixin.qq.com/v3
-`
+  transferBatchUrl: https://api.mch.weixin.qq.com/v3/transfer/batches
 
 
 wxpay:
@@ -363,8 +363,8 @@ wxpay:
   # 密钥路径,resources根目录下
   keyPemPath: apiclient_key.pem
   #商户证书序列号
-  serialNo:
+  serialNo: 6E4F9E70D56CC439B575B811CB4327621C81A839
   # 支付通知回调, pjm6m9.natappfree.cc 为内网穿透地址
-  notifyUrl:
+  notifyUrl: http://pjm6m9.natappfree.cc/pay/payNotify
   # 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
-  refundNotifyUrl:
+  refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify

pom.xml

@@ -59,6 +59,9 @@
 		<!-- Log4j2爆雷漏洞 -->
 		<log4j2.version>2.17.0</log4j2.version>
 		<logback.version>1.2.9</logback.version>
+
+		<com-github-wechatpay-apiv3.version>0.4.7</com-github-wechatpay-apiv3.version>
+
 	</properties>
 
 	<modules>
@@ -138,6 +141,13 @@
 			<version>2.23.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.wechatpay-apiv3</groupId>
+			<artifactId>wechatpay-apache-httpclient</artifactId>
+			<version>${com-github-wechatpay-apiv3.version}</version>
+		</dependency>
+
+
 		<dependency>
 			<groupId>org.glassfish.jersey.connectors</groupId>
 			<artifactId>jersey-apache-connector</artifactId>