From 7a80d26fffab223ef8838eb5c8c0adc44bcdee81 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Wed, 19 Mar 2025 10:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=EF=BC=9A2025-0319?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 6 +- .idea/encodings.xml | 3 + admin-pc/src/components/chart/IndexBar.vue | 4 +- admin-pc/src/components/chart/MiniArea.vue | 2 +- admin-pc/src/views/dashboard/Analysis.vue | 195 ++++++++--- .../popularizeActivity/PopularizeActivityList.vue | 6 + .../modules/PopularizeActivityForm.vue | 7 +- .../modules/PopularizeAuthenticationForm.vue | 16 +- .../views/popularizeOrder/PopularizeOrderList.vue | 20 +- .../popularizeTravel/PopularizeTravelList.vue | 6 + .../modules/PopularizeTravelForm.vue | 5 + .../java/org/jeecg/config/shiro/ShiroConfig.java | 4 +- module-common/pom.xml | 8 + .../jeecg/api/controller/ApiOrderController.java | 4 + .../api/controller/ApiOrderPayController.java | 67 ++++ .../org/jeecg/api/service/ApiIndexService.java | 5 + .../org/jeecg/api/service/WxMiniappPayService.java | 34 ++ .../api/service/impl/ApiIndexServiceImpl.java | 59 +++- .../api/service/impl/AppletLoginServiceImpl.java | 2 +- .../api/service/impl/WxMiniappPayServiceImpl.java | 363 +++++++++++++++++++++ .../java/org/jeecg/api/wxUtils/CreateOrderReq.java | 8 + .../org/jeecg/api/wxUtils/HttpServletUtils.java | 47 +++ .../java/org/jeecg/api/wxUtils/PayOrderInfo.java | 31 ++ .../java/org/jeecg/api/wxUtils/QueryOrderReq.java | 23 ++ .../java/org/jeecg/api/wxUtils/RefundOrderReq.java | 36 ++ .../main/java/org/jeecg/api/wxUtils/Response.java | 164 ++++++++++ .../api/wxUtils/WxPayAutoCertificateConfig.java | 96 ++++++ .../java/org/jeecg/api/wxUtils/WxPayConfig.java | 17 + .../controller/EmployOrderController.java | 171 ++++++++++ .../modules/employOrder/entity/EmployOrder.java | 161 +++++++++ .../employOrder/mapper/EmployOrderMapper.java | 17 + .../employOrder/mapper/xml/EmployOrderMapper.xml | 5 + .../employOrder/service/IEmployOrderService.java | 14 + .../service/impl/EmployOrderServiceImpl.java | 19 ++ .../modules/employOrder/vue/EmployOrderList.vue | 358 ++++++++++++++++++++ .../employOrder/vue/modules/EmployOrderForm.vue | 229 +++++++++++++ .../vue/modules/EmployOrderModal.Style#Drawer.vue | 84 +++++ .../employOrder/vue/modules/EmployOrderModal.vue | 60 ++++ .../modules/employOrder/vue3/EmployOrder.api.ts | 61 ++++ .../modules/employOrder/vue3/EmployOrder.data.ts | 333 +++++++++++++++++++ .../modules/employOrder/vue3/EmployOrderList.vue | 162 +++++++++ .../vue3/components/EmployOrderModal.vue | 58 ++++ .../entity/PopularizeActivity.java | 4 + .../controller/PopularizeOrderController.java | 27 +- .../popularizeOrder/entity/PopularizeOrder.java | 11 + .../popularizeTravel/entity/PopularizeTravel.java | 4 + .../src/main/resources/apiclient_cert.p12 | Bin 0 -> 2782 bytes .../src/main/resources/apiclient_cert.pem | 25 ++ module-common/src/main/resources/apiclient_key.pem | 28 ++ .../src/main/resources/apiclient_key1.pem | 28 ++ module-common/src/main/resources/application.yml | 2 + .../src/main/resources/pay_alipay.properties | 4 + .../src/main/resources/pay_weixin.properties | 7 + .../java/org/jeecg/modules/pay/MpWxPayService.java | 2 + module-pay/src/main/resources/apiclient_cert.p12 | Bin 0 -> 2782 bytes module-pay/src/main/resources/apiclient_cert.pem | 53 ++- module-pay/src/main/resources/apiclient_key.pem | 28 ++ module-pay/src/main/resources/apiclient_key1.pem | 28 ++ module-system/pom.xml | 1 + .../controller/SysAnnouncementController.java | 85 +++++ .../src/main/resources/apiclient_cert.p12 | Bin 0 -> 2782 bytes .../src/main/resources/apiclient_cert.pem | 25 ++ module-system/src/main/resources/apiclient_key.pem | 28 ++ .../src/main/resources/application-dev.yml | 49 +++ .../src/main/resources/pay_weixin.properties | 6 +- 65 files changed, 3320 insertions(+), 95 deletions(-) create mode 100644 module-common/src/main/java/org/jeecg/api/controller/ApiOrderPayController.java create mode 100644 module-common/src/main/java/org/jeecg/api/service/WxMiniappPayService.java create mode 100644 module-common/src/main/java/org/jeecg/api/service/impl/WxMiniappPayServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/CreateOrderReq.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/HttpServletUtils.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/PayOrderInfo.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/QueryOrderReq.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/RefundOrderReq.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/Response.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/WxPayAutoCertificateConfig.java create mode 100644 module-common/src/main/java/org/jeecg/api/wxUtils/WxPayConfig.java create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/controller/EmployOrderController.java create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/entity/EmployOrder.java create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/mapper/EmployOrderMapper.java create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/mapper/xml/EmployOrderMapper.xml create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/service/IEmployOrderService.java create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/service/impl/EmployOrderServiceImpl.java create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue/EmployOrderList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue/modules/EmployOrderForm.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue/modules/EmployOrderModal.Style#Drawer.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue/modules/EmployOrderModal.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue3/EmployOrder.api.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue3/EmployOrder.data.ts create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue3/EmployOrderList.vue create mode 100644 module-common/src/main/java/org/jeecg/modules/employOrder/vue3/components/EmployOrderModal.vue create mode 100644 module-common/src/main/resources/apiclient_cert.p12 create mode 100644 module-common/src/main/resources/apiclient_cert.pem create mode 100644 module-common/src/main/resources/apiclient_key.pem create mode 100644 module-common/src/main/resources/apiclient_key1.pem create mode 100644 module-common/src/main/resources/application.yml create mode 100644 module-common/src/main/resources/pay_alipay.properties create mode 100644 module-common/src/main/resources/pay_weixin.properties create mode 100644 module-pay/src/main/resources/apiclient_cert.p12 create mode 100644 module-pay/src/main/resources/apiclient_key.pem create mode 100644 module-pay/src/main/resources/apiclient_key1.pem create mode 100644 module-system/src/main/resources/apiclient_cert.p12 create mode 100644 module-system/src/main/resources/apiclient_cert.pem create mode 100644 module-system/src/main/resources/apiclient_key.pem diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 6cf7c9e..9570930 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -19,16 +19,16 @@ \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 91fbf10..59e2d01 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,10 +3,13 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/components/chart/IndexBar.vue b/admin-pc/src/components/chart/IndexBar.vue index 2e44d96..7af2626 100644 --- a/admin-pc/src/components/chart/IndexBar.vue +++ b/admin-pc/src/components/chart/IndexBar.vue @@ -2,10 +2,10 @@

{{ title }}

+ :padding="['auto', 'auto', '50', '50']"> diff --git a/admin-pc/src/components/chart/MiniArea.vue b/admin-pc/src/components/chart/MiniArea.vue index 97c8ff7..b824ea4 100644 --- a/admin-pc/src/components/chart/MiniArea.vue +++ b/admin-pc/src/components/chart/MiniArea.vue @@ -3,7 +3,7 @@
- +
diff --git a/admin-pc/src/views/dashboard/Analysis.vue b/admin-pc/src/views/dashboard/Analysis.vue index e3b1476..7eaf406 100644 --- a/admin-pc/src/views/dashboard/Analysis.vue +++ b/admin-pc/src/views/dashboard/Analysis.vue @@ -1,64 +1,97 @@