大米提交

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/rice-admin/
+VUE_APP_API_BASE_URL=https://admin.szqwdgidm.com/rice-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8001/rice-admin/
+VUE_APP_API_BASE_URL=https://admin.szqwdgidm.com/rice-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-pc/src/views/orderList/CommonOrderList.vue

@@ -0,0 +1,309 @@
+<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="订单状态">
+              <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.state" dictCode="order_state"/>
+            </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.title"></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="姓名">
+                <a-input placeholder="请输入姓名" v-model="queryParam.name"></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.phone"></a-input>
+              </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>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="商品标识">
+                <j-search-select-tag placeholder="请选择商品标识" v-model="queryParam.shopId" dict="common_shop,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="商品类型">
+                <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.shopState" dictCode="shop_type"/>
+              </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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('订单信息表')">导出</a-button>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </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)" v-if="record.state =='1' ">发货</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>
+
+    <common-order-modal ref="modalForm" @ok="modalFormOk"></common-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonOrderModal from './modules/CommonOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonOrderModal
+    },
+    data () {
+      return {
+        description: '订单信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'订单状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'规格',
+            align:"center",
+            dataIndex: 'sku'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'详细地址',
+            align:"center",
+            dataIndex: 'addressDetails'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'商品标识',
+            align:"center",
+            dataIndex: 'shopId_dictText'
+          },
+          {
+            title:'商品类型',
+            align:"center",
+            dataIndex: 'shopState_dictText'
+          },
+          {
+            title:'推荐购买会员',
+            align:"center",
+            dataIndex: 'shareId'
+          },
+          {
+            title:'第几次推荐购买',
+            align:"center",
+            dataIndex: 'shareNum'
+          },
+          {
+            title:'快递公司',
+            align:"center",
+            dataIndex: 'kuai'
+          },
+          {
+            title:'物流订单',
+            align:"center",
+            dataIndex: 'wuliu'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonOrder/commonOrder/list",
+          delete: "/commonOrder/commonOrder/delete",
+          deleteBatch: "/commonOrder/commonOrder/deleteBatch",
+          exportXlsUrl: "/commonOrder/commonOrder/exportXls",
+          importExcelUrl: "commonOrder/commonOrder/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'state',text:'订单状态',dictCode:'order_state'})
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
+        fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'})
+        fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''})
+        fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''})
+        fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''})
+        fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-pc/src/views/orderList/modules/CommonOrderForm.vue

@@ -0,0 +1,179 @@
+<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="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" disabled />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">-->
+<!--              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">-->
+<!--              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">-->
+<!--              <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sku">-->
+<!--              <a-input v-model="model.sku" placeholder="请输入规格"  ></a-input>-->
+<!--            </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="请输入姓名" disabled ></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="请输入电话" disabled ></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="请输入地址"  disabled></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails">
+              <a-input v-model="model.addressDetails" placeholder="请输入详细地址"  disabled></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"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">-->
+<!--              <j-search-select-tag v-model="model.shopId" dict="common_shop,title,id"  />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopState">-->
+<!--              <j-dict-select-tag type="list" v-model="model.shopState" dictCode="shop_type" placeholder="请选择商品类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="推荐购买会员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">-->
+<!--              <a-input v-model="model.shareId" placeholder="请输入推荐购买会员"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="第几次推荐购买" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareNum">-->
+<!--              <a-input-number v-model="model.shareNum" placeholder="请输入第几次推荐购买" style="width: 100%" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="快递公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kuai">
+              <a-input v-model="model.kuai" placeholder="请输入快递公司"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="物流订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuliu">
+              <a-input v-model="model.wuliu" placeholder="请输入物流订单"  ></a-input>
+            </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: 'CommonOrderForm',
+    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: "/commonOrder/commonOrder/add",
+          edit: "/commonOrder/commonOrder/edit",
+          queryById: "/commonOrder/commonOrder/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-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-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 CommonOrderForm from './CommonOrderForm'
+
+  export default {
+    name: 'CommonOrderModal',
+    components: {
+      CommonOrderForm
+    },
+    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-pc/src/views/orderList/modules/CommonOrderModal.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="关闭">
+    <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonOrderForm from './CommonOrderForm'
+  export default {
+    name: 'CommonOrderModal',
+    components: {
+      CommonOrderForm
+    },
+    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-pc/src/views/waterList/CommonMoneyLogList.vue

@@ -0,0 +1,252 @@
+<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.title"></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--            <a-form-item label="类型">-->
+<!--              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="pay_type"/>-->
+<!--            </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.state" dictCode="pay_state"/>
+              </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>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="提现状态">
+              <j-dict-select-tag placeholder="请选择提现状态" v-model="queryParam.txState" dictCode="tx_state_sub"/>
+            </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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+      <a-button type="primary" icon="download" @click="handleExportXls('流水日志表')">导出</a-button>
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </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="handleDelete(record.id)">审核通过</a>
+          <a-divider type="vertical" />
+          <a @click="handleDelete(record.id)">驳回申请</a>
+<!--          <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>
+
+    <common-money-log-modal ref="modalForm" @ok="modalFormOk"></common-money-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonMoneyLogModal from './modules/CommonMoneyLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonMoneyLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonMoneyLogModal
+    },
+    data () {
+      return {
+        description: '流水日志表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'流水标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'提现金额',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankName'
+          },
+          {
+            title:'银行卡号',
+            align:"center",
+            dataIndex: 'bankNo'
+          },
+          // {
+          //   title:'提现状态',
+          //   align:"center",
+          //   dataIndex: 'txStateSub'
+          // },
+          {
+            title:'用户标识',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonMoneyLog/commonMoneyLog/list",
+          delete: "/commonMoneyLog/commonMoneyLog/delete",
+          deleteBatch: "/commonMoneyLog/commonMoneyLog/deleteBatch",
+          exportXlsUrl: "/commonMoneyLog/commonMoneyLog/exportXls",
+          importExcelUrl: "commonMoneyLog/commonMoneyLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'title',text:'流水标题',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'isGet',text:'是否提现',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue

@@ -0,0 +1,139 @@
+<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="title">-->
+<!--              <a-input v-model="model.title" placeholder="请输入流水标题"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-model-item label="提现金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
+              <a-input-number v-model="model.money" placeholder="请输入提现金额" style="width: 100%" disabled />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.name" placeholder="请输入姓名" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.bankName" placeholder="请输入开户行" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="银行卡号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.bankNo" placeholder="请输入银行卡号" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">-->
+<!--              <j-dict-select-tag type="list" v-model="model.type" dictCode="pay_type" placeholder="请选择类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">-->
+<!--              <j-dict-select-tag type="list" v-model="model.state" dictCode="pay_state" placeholder="请选择状态" />-->
+<!--            </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"  />
+            </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: 'CommonMoneyLogForm',
+    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: "/commonMoneyLog/commonMoneyLog/add",
+          edit: "/commonMoneyLog/commonMoneyLog/edit",
+          queryById: "/commonMoneyLog/commonMoneyLog/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-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-money-log-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 CommonMoneyLogForm from './CommonMoneyLogForm'
+
+  export default {
+    name: 'CommonMoneyLogModal',
+    components: {
+      CommonMoneyLogForm
+    },
+    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-pc/src/views/waterList/modules/CommonMoneyLogModal.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="关闭">
+    <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-money-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonMoneyLogForm from './CommonMoneyLogForm'
+  export default {
+    name: 'CommonMoneyLogModal',
+    components: {
+      CommonMoneyLogForm
+    },
+    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>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java

@@ -0,0 +1,172 @@
+package org.jeecg.modules.commonMoneyLog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog;
+import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 流水日志表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-27
+ * @Version: V1.0
+ */
+@Api(tags="流水日志表")
+@RestController
+@RequestMapping("/commonMoneyLog/commonMoneyLog")
+@Slf4j
+public class CommonMoneyLogController extends JeecgController<CommonMoneyLog, ICommonMoneyLogService> {
+	@Autowired
+	private ICommonMoneyLogService commonMoneyLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonMoneyLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "流水日志表-分页列表查询")
+	@ApiOperation(value="流水日志表-分页列表查询", notes="流水日志表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonMoneyLog>> queryPageList(CommonMoneyLog commonMoneyLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonMoneyLog> queryWrapper = QueryGenerator.initQueryWrapper(commonMoneyLog, req.getParameterMap());
+		queryWrapper.eq("is_get", "Y");
+		Page<CommonMoneyLog> page = new Page<CommonMoneyLog>(pageNo, pageSize);
+		IPage<CommonMoneyLog> pageList = commonMoneyLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonMoneyLog
+	 * @return
+	 */
+	@AutoLog(value = "流水日志表-添加")
+	@ApiOperation(value="流水日志表-添加", notes="流水日志表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonMoneyLog commonMoneyLog) {
+		commonMoneyLogService.save(commonMoneyLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonMoneyLog
+	 * @return
+	 */
+	@AutoLog(value = "流水日志表-编辑")
+	@ApiOperation(value="流水日志表-编辑", notes="流水日志表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonMoneyLog commonMoneyLog) {
+		commonMoneyLogService.updateById(commonMoneyLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "流水日志表-通过id删除")
+	@ApiOperation(value="流水日志表-通过id删除", notes="流水日志表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		commonMoneyLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "流水日志表-批量删除")
+	@ApiOperation(value="流水日志表-批量删除", notes="流水日志表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.commonMoneyLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "流水日志表-通过id查询")
+	@ApiOperation(value="流水日志表-通过id查询", notes="流水日志表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CommonMoneyLog> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonMoneyLog commonMoneyLog = commonMoneyLogService.getById(id);
+		if(commonMoneyLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonMoneyLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonMoneyLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonMoneyLog commonMoneyLog) {
+        return super.exportXls(request, commonMoneyLog, CommonMoneyLog.class, "流水日志表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CommonMoneyLog.class);
+    }
+
+}

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java

@@ -0,0 +1,96 @@
+package org.jeecg.modules.commonMoneyLog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 流水日志表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_money_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_money_log对象", description="流水日志表")
+public class CommonMoneyLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**流水标题*/
+	@Excel(name = "流水标题", width = 15)
+    @ApiModelProperty(value = "流水标题")
+    private java.lang.String title;
+	/**变动金额*/
+	@Excel(name = "变动金额", width = 15)
+    @ApiModelProperty(value = "变动金额")
+    private java.math.BigDecimal money;
+	/**原钱包金额*/
+	@Excel(name = "原钱包金额", width = 15)
+    @ApiModelProperty(value = "原钱包金额")
+    private java.math.BigDecimal oldMoney;
+	/**类型*/
+	@Excel(name = "类型", width = 15, dicCode = "pay_type")
+	@Dict(dicCode = "pay_type")
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer type;
+	/**状态*/
+	@Excel(name = "状态", width = 15, dicCode = "pay_state")
+	@Dict(dicCode = "pay_state")
+    @ApiModelProperty(value = "状态")
+    private java.lang.Integer state;
+	/**用户标识*/
+	@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "用户标识")
+    private java.lang.String userId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String name;
+	/**开户行*/
+	@Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private java.lang.String bankName;
+	/**开户号*/
+	@Excel(name = "开户号", width = 15)
+    @ApiModelProperty(value = "开户号")
+    private java.lang.String bankNo;
+	/**是否提现*/
+	@Excel(name = "是否提现", width = 15)
+    @ApiModelProperty(value = "是否提现")
+    private java.lang.String isGet;
+}

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonMoneyLog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 流水日志表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-27
+ * @Version: V1.0
+ */
+public interface CommonMoneyLogMapper extends BaseMapper<CommonMoneyLog> {
+
+}

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/xml/CommonMoneyLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.commonMoneyLog.mapper.CommonMoneyLogMapper">
+
+</mapper>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonMoneyLog.service;
+
+import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 流水日志表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-27
+ * @Version: V1.0
+ */
+public interface ICommonMoneyLogService extends IService<CommonMoneyLog> {
+
+}

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonMoneyLog.service.impl;
+
+import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog;
+import org.jeecg.modules.commonMoneyLog.mapper.CommonMoneyLogMapper;
+import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 流水日志表
+ * @Author: jeecg-boot
+ * @Date:   2024-12-27
+ * @Version: V1.0
+ */
+@Service
+public class CommonMoneyLogServiceImpl extends ServiceImpl<CommonMoneyLogMapper, CommonMoneyLog> implements ICommonMoneyLogService {
+
+}

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue

@@ -0,0 +1,258 @@
+<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.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型">
+              <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="pay_type"/>
+            </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.state" dictCode="pay_state"/>
+              </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>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('流水日志表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </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>
+
+    <common-money-log-modal ref="modalForm" @ok="modalFormOk"></common-money-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonMoneyLogModal from './modules/CommonMoneyLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonMoneyLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonMoneyLogModal
+    },
+    data () {
+      return {
+        description: '流水日志表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'流水标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'变动金额',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'原钱包金额',
+            align:"center",
+            dataIndex: 'oldMoney'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'用户标识',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'姓名',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bankName'
+          },
+          {
+            title:'开户号',
+            align:"center",
+            dataIndex: 'bankNo'
+          },
+          {
+            title:'是否提现',
+            align:"center",
+            dataIndex: 'isGet'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonMoneyLog/commonMoneyLog/list",
+          delete: "/commonMoneyLog/commonMoneyLog/delete",
+          deleteBatch: "/commonMoneyLog/commonMoneyLog/deleteBatch",
+          exportXlsUrl: "/commonMoneyLog/commonMoneyLog/exportXls",
+          importExcelUrl: "commonMoneyLog/commonMoneyLog/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:'title',text:'流水标题',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
+        fieldList.push({type:'string',value:'bankName',text:'开户行',dictCode:''})
+        fieldList.push({type:'string',value:'bankNo',text:'开户号',dictCode:''})
+        fieldList.push({type:'string',value:'isGet',text:'是否提现',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue

@@ -0,0 +1,149 @@
+<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="title">
+              <a-input v-model="model.title" placeholder="请输入流水标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="变动金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
+              <a-input-number v-model="model.money" placeholder="请输入变动金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="原钱包金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
+              <a-input-number v-model="model.oldMoney" placeholder="请输入原钱包金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="pay_type" placeholder="请选择类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="pay_state" placeholder="请选择状态" />
+            </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"  />
+            </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="bankName">
+              <a-input v-model="model.bankName" placeholder="请输入开户行"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankNo">
+              <a-input v-model="model.bankNo" placeholder="请输入开户号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否提现" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isGet">
+              <a-input v-model="model.isGet" placeholder="请输入是否提现"  ></a-input>
+            </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: 'CommonMoneyLogForm',
+    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: "/commonMoneyLog/commonMoneyLog/add",
+          edit: "/commonMoneyLog/commonMoneyLog/edit",
+          queryById: "/commonMoneyLog/commonMoneyLog/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>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-money-log-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 CommonMoneyLogForm from './CommonMoneyLogForm'
+
+  export default {
+    name: 'CommonMoneyLogModal',
+    components: {
+      CommonMoneyLogForm
+    },
+    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>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.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="关闭">
+    <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-money-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonMoneyLogForm from './CommonMoneyLogForm'
+  export default {
+    name: 'CommonMoneyLogModal',
+    components: {
+      CommonMoneyLogForm
+    },
+    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>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonMoneyLog/commonMoneyLog/list',
+  save='/commonMoneyLog/commonMoneyLog/add',
+  edit='/commonMoneyLog/commonMoneyLog/edit',
+  deleteOne = '/commonMoneyLog/commonMoneyLog/delete',
+  deleteBatch = '/commonMoneyLog/commonMoneyLog/deleteBatch',
+  importExcel = '/commonMoneyLog/commonMoneyLog/importExcel',
+  exportXls = '/commonMoneyLog/commonMoneyLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts

@@ -0,0 +1,155 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '流水标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '变动金额',
+    align:"center",
+    dataIndex: 'money'
+   },
+   {
+    title: '原钱包金额',
+    align:"center",
+    dataIndex: 'oldMoney'
+   },
+   {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '状态',
+    align:"center",
+    dataIndex: 'state_dictText'
+   },
+   {
+    title: '用户标识',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+   {
+    title: '姓名',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '开户行',
+    align:"center",
+    dataIndex: 'bankName'
+   },
+   {
+    title: '开户号',
+    align:"center",
+    dataIndex: 'bankNo'
+   },
+   {
+    title: '是否提现',
+    align:"center",
+    dataIndex: 'isGet'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "流水标题",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "类型",
+      field: "type",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"pay_type"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "状态",
+      field: "state",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"pay_state"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "用户标识",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '流水标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '变动金额',
+    field: 'money',
+    component: 'InputNumber',
+  },
+  {
+    label: '原钱包金额',
+    field: 'oldMoney',
+    component: 'InputNumber',
+  },
+  {
+    label: '类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"pay_type"
+     },
+  },
+  {
+    label: '状态',
+    field: 'state',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"pay_state"
+     },
+  },
+  {
+    label: '用户标识',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+  {
+    label: '姓名',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '开户行',
+    field: 'bankName',
+    component: 'Input',
+  },
+  {
+    label: '开户号',
+    field: 'bankNo',
+    component: 'Input',
+  },
+  {
+    label: '是否提现',
+    field: 'isGet',
+    component: 'Input',
+  },
+];

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLogList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CommonMoneyLogModal @register="registerModal" @success="handleSuccess"></CommonMoneyLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonMoneyLog-commonMoneyLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CommonMoneyLogModal from './components/CommonMoneyLogModal.vue'
+  import {columns, searchFormSchema} from './commonMoneyLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonMoneyLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '流水日志表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"流水日志表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/components/CommonMoneyLogModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../commonMoneyLog.data';
+    import {saveOrUpdate} from '../commonMoneyLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/controller/RiceNewsController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date:   2024-12-23
  * @Version: V1.0
  */
 @Api(tags="介绍")

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/entity/RiceNews.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date:   2024-12-23
  * @Version: V1.0
  */
 @Data
@@ -68,4 +68,8 @@ public class RiceNews implements Serializable {
 	@Excel(name = "文本介绍", width = 15)
     @ApiModelProperty(value = "文本介绍")
     private java.lang.String titleSub;
+	/**视频*/
+	@Excel(name = "视频", width = 15)
+    @ApiModelProperty(value = "视频")
+    private java.lang.String voSub;
 }

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/mapper/RiceNewsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date:   2024-12-23
  * @Version: V1.0
  */
 public interface RiceNewsMapper extends BaseMapper<RiceNews> {

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/IRiceNewsService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date:   2024-12-23
  * @Version: V1.0
  */
 public interface IRiceNewsService extends IService<RiceNews> {

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/impl/RiceNewsServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 介绍
  * @Author: jeecg-boot
- * @Date:   2024-12-04
+ * @Date:   2024-12-23
  * @Version: V1.0
  */
 @Service

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/RiceNewsList.vue

@@ -143,6 +143,12 @@
             align:"center",
             dataIndex: 'titleSub'
           },
+          {
+            title:'视频',
+            align:"center",
+            dataIndex: 'voSub',
+            scopedSlots: {customRender: 'fileSlot'}
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -182,6 +188,7 @@
         fieldList.push({type:'string',value:'type',text:'类型',dictCode:'rice_news_type'})
         fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''})
         fieldList.push({type:'string',value:'titleSub',text:'文本介绍',dictCode:''})
+        fieldList.push({type:'Text',value:'voSub',text:'视频',dictCode:''})
         this.superFieldList = fieldList
       }
     }

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/modules/RiceNewsForm.vue

@@ -28,6 +28,11 @@
               <a-textarea v-model="model.titleSub" rows="4" placeholder="请输入文本介绍" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="voSub">
+              <j-upload v-model="model.voSub"   ></j-upload>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue3/RiceNews.data.ts

@@ -25,6 +25,12 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'titleSub'
    },
+   {
+    title: '视频',
+    align:"center",
+    dataIndex: 'voSub',
+    slots: { customRender: 'fileSlot' },
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -61,4 +67,11 @@ export const formSchema: FormSchema[] = [
     field: 'titleSub',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
+  {
+    label: '视频',
+    field: 'voSub',
+    component: 'JUpload',
+    componentProps:{
+     },
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-17
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 @Api(tags="流水日志表")
@@ -67,6 +67,7 @@ public class CommonMoneyLogController extends JeecgController<CommonMoneyLog, IC
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<CommonMoneyLog> queryWrapper = QueryGenerator.initQueryWrapper(commonMoneyLog, req.getParameterMap());
+		queryWrapper.eq("is_get", "Y");
 		Page<CommonMoneyLog> page = new Page<CommonMoneyLog>(pageNo, pageSize);
 		IPage<CommonMoneyLog> pageList = commonMoneyLogService.page(page, queryWrapper);
 		return Result.OK(pageList);

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-17
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 @Data
@@ -77,6 +77,10 @@ public class CommonMoneyLog implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户标识")
     private java.lang.String userId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private java.lang.String name;
 	/**开户行*/
 	@Excel(name = "开户行", width = 15)
     @ApiModelProperty(value = "开户行")
@@ -85,4 +89,13 @@ public class CommonMoneyLog implements Serializable {
 	@Excel(name = "开户号", width = 15)
     @ApiModelProperty(value = "开户号")
     private java.lang.String bankNo;
+	/**是否提现*/
+	@Excel(name = "是否提现", width = 15)
+    @ApiModelProperty(value = "是否提现")
+    private java.lang.String isGet;
+	/**提现状态*/
+	@Excel(name = "提现状态", width = 15, dicCode = "tx_state_sub")
+	@Dict(dicCode = "tx_state_sub")
+    @ApiModelProperty(value = "提现状态")
+    private java.lang.Integer txState;
 }

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-17
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 public interface CommonMoneyLogMapper extends BaseMapper<CommonMoneyLog> {

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-17
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 public interface ICommonMoneyLogService extends IService<CommonMoneyLog> {

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-17
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue

@@ -25,6 +25,11 @@
                 <j-search-select-tag placeholder="请选择用户标识" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
               </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.isGet"></a-input>
+              </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">
@@ -154,6 +159,12 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
           {
             title:'流水标题',
             align:"center",
@@ -184,16 +195,6 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
-          {
-            title:'开户行',
-            align:"center",
-            dataIndex: 'bankName'
-          },
-          {
-            title:'开户号',
-            align:"center",
-            dataIndex: 'bankNo'
-          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -228,14 +229,14 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
         fieldList.push({type:'string',value:'title',text:'流水标题',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''})
         fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'})
         fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'})
         fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'string',value:'bankName',text:'开户行',dictCode:''})
-        fieldList.push({type:'string',value:'bankNo',text:'开户号',dictCode:''})
+        fieldList.push({type:'string',value:'isGet',text:'是否提现',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue

@@ -33,16 +33,6 @@
               <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankName">
-              <a-input v-model="model.bankName" placeholder="请输入开户行"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="开户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankNo">
-              <a-input v-model="model.bankNo" placeholder="请输入开户号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts

@@ -5,6 +5,12 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
     title: '流水标题',
     align:"center",
     dataIndex: 'title'
@@ -34,16 +40,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
-   {
-    title: '开户行',
-    align:"center",
-    dataIndex: 'bankName'
-   },
-   {
-    title: '开户号',
-    align:"center",
-    dataIndex: 'bankNo'
-   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -80,6 +76,12 @@ export const searchFormSchema: FormSchema[] = [
       },
       colProps: {span: 6},
  	},
+	{
+      label: "是否提现",
+      field: "isGet",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -122,14 +124,4 @@ export const formSchema: FormSchema[] = [
        dict:"han_hai_member,nick_name,id"
     },
   },
-  {
-    label: '开户行',
-    field: 'bankName',
-    component: 'Input',
-  },
-  {
-    label: '开户号',
-    field: 'bankNo',
-    component: 'Input',
-  },
 ];

module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 @Api(tags="订单信息表")
@@ -96,6 +96,14 @@ public class CommonOrderController extends JeecgController<CommonOrder, ICommonO
 	@ApiOperation(value="订单信息表-编辑", notes="订单信息表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody CommonOrder commonOrder) {
+		//请输入快递公司
+		if(oConvertUtils.isEmpty(commonOrder.getKuai())){
+			return Result.error("请输入快递公司");
+		}
+		if(oConvertUtils.isEmpty(commonOrder.getWuliu())){
+			return Result.error("请输入物流订单");
+		}
+		commonOrder.setState(2); // 已发货
 		commonOrderService.updateById(commonOrder);
 		return Result.OK("编辑成功!");
 	}

module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 @Data
@@ -51,6 +51,11 @@ public class CommonOrder implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**订单状态*/
+	@Excel(name = "订单状态", width = 15, dicCode = "order_state")
+	@Dict(dicCode = "order_state")
+    @ApiModelProperty(value = "订单状态")
+    private java.lang.Integer state;
 	/**标题*/
 	@Excel(name = "标题", width = 15)
     @ApiModelProperty(value = "标题")
@@ -59,10 +64,6 @@ public class CommonOrder implements Serializable {
 	@Excel(name = "图片", width = 15)
     @ApiModelProperty(value = "图片")
     private java.lang.String image;
-	/**支付状态*/
-	@Excel(name = "支付状态", width = 15)
-    @ApiModelProperty(value = "支付状态")
-    private java.lang.Integer state;
 	/**价格*/
 	@Excel(name = "价格", width = 15)
     @ApiModelProperty(value = "价格")
@@ -92,7 +93,8 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "详细地址")
     private java.lang.String addressDetails;
 	/**用户*/
-	@Excel(name = "用户", width = 15)
+	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
 	/**地址标识*/
@@ -100,7 +102,8 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "地址标识")
     private java.lang.String addressId;
 	/**商品标识*/
-	@Excel(name = "商品标识", width = 15)
+	@Excel(name = "商品标识", width = 15, dictTable = "common_shop", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "common_shop", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "商品标识")
     private java.lang.String shopId;
 	/**支付编号*/
@@ -129,6 +132,7 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "物流订单")
     private java.lang.String wuliu;
 
-	@TableField(exist = false)
+
+    @TableField(exist = false)
     private List<CommonOrderSku> commonOrderSkuList;
 }

module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {

module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 public interface ICommonOrderService extends IService<CommonOrder> {

module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-12
+ * @Date:   2024-12-27
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue

@@ -5,10 +5,42 @@
       <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="商品类型">
-              <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.shopState" dictCode="shop_type"/>
+            <a-form-item label="订单状态">
+              <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.state" dictCode="order_state"/>
             </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.title"></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="姓名">
+                <a-input placeholder="请输入姓名" v-model="queryParam.name"></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.phone"></a-input>
+              </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>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="商品标识">
+                <j-search-select-tag placeholder="请选择商品标识" v-model="queryParam.shopId" dict="common_shop,title,id"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="商品类型">
+                <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.shopState" dictCode="shop_type"/>
+              </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>
@@ -138,14 +170,14 @@
             }
           },
           {
-            title:'标题',
+            title:'订单状态',
             align:"center",
-            dataIndex: 'title'
+            dataIndex: 'state_dictText'
           },
           {
-            title:'支付状态',
+            title:'标题',
             align:"center",
-            dataIndex: 'state'
+            dataIndex: 'title'
           },
           {
             title:'价格',
@@ -185,12 +217,12 @@
           {
             title:'用户',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'商品标识',
             align:"center",
-            dataIndex: 'shopId'
+            dataIndex: 'shopId_dictText'
           },
           {
             title:'商品类型',
@@ -251,8 +283,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'int',value:'state',text:'订单状态',dictCode:'order_state'})
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
         fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
@@ -260,8 +292,8 @@
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
         fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
         fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
-        fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'})
         fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'})
         fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''})
         fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''})

module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue

@@ -4,13 +4,13 @@
       <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="title">
-              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
+            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="支付状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" placeholder="请输入支付状态" style="width: 100%" />
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -50,12 +50,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
-              <a-input v-model="model.shopId" placeholder="请输入商品标识"  ></a-input>
+              <j-search-select-tag v-model="model.shopId" dict="common_shop,title,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts

@@ -5,14 +5,14 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '标题',
+    title: '订单状态',
     align:"center",
-    dataIndex: 'title'
+    dataIndex: 'state_dictText'
    },
    {
-    title: '支付状态',
+    title: '标题',
     align:"center",
-    dataIndex: 'state'
+    dataIndex: 'title'
    },
    {
     title: '价格',
@@ -52,12 +52,12 @@ export const columns: BasicColumn[] = [
    {
     title: '用户',
     align:"center",
-    dataIndex: 'userId'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '商品标识',
     align:"center",
-    dataIndex: 'shopId'
+    dataIndex: 'shopId_dictText'
    },
    {
     title: '商品类型',
@@ -88,6 +88,51 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
+      label: "订单状态",
+      field: "state",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"order_state"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "标题",
+      field: "title",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "姓名",
+      field: "name",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "电话",
+      field: "phone",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+	{
+      label: "用户",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "商品标识",
+      field: "shopId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"common_shop,title,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
       label: "商品类型",
       field: "shopState",
       component: 'JDictSelectTag',
@@ -99,16 +144,19 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '订单状态',
+    field: 'state',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"order_state"
+     },
+  },
   {
     label: '标题',
     field: 'title',
     component: 'Input',
   },
-  {
-    label: '支付状态',
-    field: 'state',
-    component: 'InputNumber',
-  },
   {
     label: '价格',
     field: 'price',
@@ -147,12 +195,18 @@ export const formSchema: FormSchema[] = [
   {
     label: '用户',
     field: 'userId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
   },
   {
     label: '商品标识',
     field: 'shopId',
-    component: 'Input',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"common_shop,title,id"
+    },
   },
   {
     label: '商品类型',

module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java

@@ -4,7 +4,10 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -86,4 +89,5 @@ public class CommonOrderSku implements Serializable {
 	@Excel(name = "商品", width = 15)
     @ApiModelProperty(value = "商品")
     private java.lang.String shopId;
+
 }

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

@@ -1,5 +1,5 @@
 server:
-  port: 8001
+  port: 8000
   tomcat:
     max-swallow-size: -1
   error: