From 31528b763a506e41dabc703fe33ae175712cfb6d Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Fri, 3 Jan 2025 14:31:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/.env.development | 2 +- admin-hanhai-vue/.env.production | 2 +- admin-hanhai-vue/public/index.html | 2 +- .../src/components/layouts/UserLayout.vue | 2 +- .../controller/AtPayOrderController.java | 171 +++++++++++++++++ .../modules/atPayOrder/entity/AtPayOrder.java | 77 ++++++++ .../atPayOrder/mapper/AtPayOrderMapper.java | 17 ++ .../atPayOrder/mapper/xml/AtPayOrderMapper.xml | 5 + .../atPayOrder/service/IAtPayOrderService.java | 14 ++ .../service/impl/AtPayOrderServiceImpl.java | 19 ++ .../modules/atPayOrder/vue/AtPayOrderList.vue | 202 +++++++++++++++++++++ .../atPayOrder/vue/modules/AtPayOrderForm.vue | 129 +++++++++++++ .../vue/modules/AtPayOrderModal.Style#Drawer.vue | 84 +++++++++ .../atPayOrder/vue/modules/AtPayOrderModal.vue | 60 ++++++ .../modules/atPayOrder/vue3/AtPayOrder.api.ts | 61 +++++++ .../modules/atPayOrder/vue3/AtPayOrder.data.ts | 82 +++++++++ .../modules/atPayOrder/vue3/AtPayOrderList.vue | 162 +++++++++++++++++ .../atPayOrder/vue3/components/AtPayOrderModal.vue | 58 ++++++ .../src/main/resources/application-dev.yml | 18 +- 19 files changed, 1154 insertions(+), 13 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/controller/AtPayOrderController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/entity/AtPayOrder.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/mapper/AtPayOrderMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/mapper/xml/AtPayOrderMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/service/IAtPayOrderService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/service/impl/AtPayOrderServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/AtPayOrderList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrderList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/components/AtPayOrderModal.vue diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index a8ae589..0d7a38d 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8000/a-notice-api/ +VUE_APP_API_BASE_URL=https://admin.ytonggao.com/a-notice-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 4ae3ecb..2ea128f 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8000/a-notice-api/ +VUE_APP_API_BASE_URL=https://admin.ytonggao.com/a-notice-api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-hanhai-vue/public/index.html b/admin-hanhai-vue/public/index.html index a5958a2..38264b9 100644 --- a/admin-hanhai-vue/public/index.html +++ b/admin-hanhai-vue/public/index.html @@ -6,7 +6,7 @@ 帧视界后台管理系统 - + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderForm.vue new file mode 100644 index 0000000..945235f --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderForm.vue @@ -0,0 +1,129 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..17763aa --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.vue new file mode 100644 index 0000000..4074c6c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue/modules/AtPayOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.api.ts new file mode 100644 index 0000000..4f085fb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/atPayOrder/atPayOrder/list', + save='/atPayOrder/atPayOrder/add', + edit='/atPayOrder/atPayOrder/edit', + deleteOne = '/atPayOrder/atPayOrder/delete', + deleteBatch = '/atPayOrder/atPayOrder/deleteBatch', + importExcel = '/atPayOrder/atPayOrder/importExcel', + exportXls = '/atPayOrder/atPayOrder/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}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.data.ts new file mode 100644 index 0000000..3629508 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrder.data.ts @@ -0,0 +1,82 @@ +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: 'userId_dictText' + }, + { + title: '支付金额', + align:"center", + dataIndex: 'money' + }, + { + title: '支付状态', + align:"center", + dataIndex: 'state_dictText' + }, + { + title: '支付类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '备注', + align:"center", + dataIndex: 'title' + }, + { + title: '关联标识', + align:"center", + dataIndex: 'orderId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户名称', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '支付金额', + field: 'money', + component: 'InputNumber', + }, + { + label: '支付状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"pay_order_state" + }, + }, + { + label: '支付类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"pay_order_type" + }, + }, + { + label: '备注', + field: 'title', + component: 'Input', + }, + { + label: '关联标识', + field: 'orderId', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrderList.vue new file mode 100644 index 0000000..aabba7c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/AtPayOrderList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/components/AtPayOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/components/AtPayOrderModal.vue new file mode 100644 index 0000000..f0c7dd9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atPayOrder/vue3/components/AtPayOrderModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 1e73e1d..83979c0 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -134,9 +134,9 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://47.120.64.83:3306/a-aotice-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://111.229.50.28:3306/notice-prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root - password: n+~@kB_Z + password: BvQM0+=w driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -147,7 +147,7 @@ spring: #redis 配置 redis: database: 0 - host: 47.120.64.83 + host: 111.229.50.28 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -155,7 +155,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 1000ms - password: 'aq.888888' + password: 'hhlm.1688' port: 6379 #mybatis plus 设置 mybatis-plus: @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tMan18fjJPUtr3Aim2W - secretKey: lhALqqgYijc115wY8c1KfTYkbSnq5I - endpoint: oss-cn-shenzhen.aliyuncs.com - bucketName: mangoimageapplet - staticDomain: https://dianpin-img.xzaiyp.top + accessKey: LTAI5t9Hw5DTgahn82upXu4L + secretKey: hGJPlLmwK9RVH3FQHkXWCSPgPiGrHj + endpoint: oss-cn-chengdu.aliyuncs.com + bucketName: zkcm + staticDomain: https://image.ytonggao.com # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES