From e124269bb3e020b2250a5273040d8694bf172cb5 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Wed, 9 Apr 2025 01:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CatmDogd-Mall-Front-test/.env.development | 6 +-
CatmDogd-Mall-Front-test/.env.production | 2 +-
CatmDogd-Mall-Front-test/.env.staging | 2 +-
CatmDogd-Mall-Front-test/package.json | 2 +-
CatmDogd-Mall-Front-test/public/index.html | 4 +-
.../src/layout/components/Sidebar/Logo.vue | 2 +-
CatmDogd-Mall-Front-test/src/views/login.vue | 4 +-
.../src/views/model/AppletOrder/index.vue | 267 ++++++++++++---------
.../src/views/oms/order/index.vue | 1 +
CatmDogd-Mall-Front-test/src/views/register.vue | 2 +-
CatmDogd-Mall-Front-test/vue.config.js | 2 +-
ruoyi-admin/src/main/resources/application.yml | 2 +-
ruoyi-catdog/pom.xml | 5 +
.../applet/contoller/ApiAppletOrderController.java | 58 ++++-
.../ruoyi/applet/service/IMallOrderService.java | 26 ++
.../applet/service/impl/IMallOrderServiceImpl.java | 145 +++++++++++
.../model/controller/AppletOrderController.java | 33 ++-
.../java/com/ruoyi/model/domain/AppletOrder.java | 37 ++-
.../com/ruoyi/model/mapper/AppletOrderMapper.java | 2 +
.../ruoyi/model/service/IAppletOrderService.java | 2 +
.../model/service/impl/AppletOrderServiceImpl.java | 11 +
.../resources/mapper/model/AppletOrderMapper.xml | 63 ++++-
.../main/java/com/cyl/tencent/TaskConsumer.java | 10 +-
.../src/main/resources/mapper/oms/OrderMapper.xml | 1 +
24 files changed, 544 insertions(+), 145 deletions(-)
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/service/IMallOrderService.java
create mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java
diff --git a/CatmDogd-Mall-Front-test/.env.development b/CatmDogd-Mall-Front-test/.env.development
index ffbb831..1223dcb 100644
--- a/CatmDogd-Mall-Front-test/.env.development
+++ b/CatmDogd-Mall-Front-test/.env.development
@@ -1,12 +1,12 @@
# 页面标题
-VUE_APP_TITLE = 猫妈狗爸商城管理平台
+VUE_APP_TITLE = 下单伴宠师综合管理平台
# 开发环境配置
ENV = 'development'
# 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
-VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
-#VUE_APP_BASE_API = 'http://localhost:8081/prod-api'
+# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api/prod-api'
+VUE_APP_BASE_API = 'http://localhost:8001/prod-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/CatmDogd-Mall-Front-test/.env.production b/CatmDogd-Mall-Front-test/.env.production
index 186d2ea..926d173 100644
--- a/CatmDogd-Mall-Front-test/.env.production
+++ b/CatmDogd-Mall-Front-test/.env.production
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 猫妈狗爸商城管理平台测试环境
+VUE_APP_TITLE = 下单伴宠师综合管理平台
# 生产环境配置
ENV = 'production'
diff --git a/CatmDogd-Mall-Front-test/.env.staging b/CatmDogd-Mall-Front-test/.env.staging
index 418a30a..77854ab 100644
--- a/CatmDogd-Mall-Front-test/.env.staging
+++ b/CatmDogd-Mall-Front-test/.env.staging
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 猫妈狗爸商城管理平台测试环境
+VUE_APP_TITLE = 下单伴宠师综合管理平台
NODE_ENV = production
diff --git a/CatmDogd-Mall-Front-test/package.json b/CatmDogd-Mall-Front-test/package.json
index 8f7b212..9471302 100644
--- a/CatmDogd-Mall-Front-test/package.json
+++ b/CatmDogd-Mall-Front-test/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi-ui-merge",
"version": "3.8.3",
- "description": "猫妈狗爸商城管理测试环境",
+ "description": "下单伴宠师综合管理平台",
"author": "若依",
"license": "MIT",
"scripts": {
diff --git a/CatmDogd-Mall-Front-test/public/index.html b/CatmDogd-Mall-Front-test/public/index.html
index c061c4c..4d7f850 100644
--- a/CatmDogd-Mall-Front-test/public/index.html
+++ b/CatmDogd-Mall-Front-test/public/index.html
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/CatmDogd-Mall-Front-test/src/layout/components/Sidebar/Logo.vue b/CatmDogd-Mall-Front-test/src/layout/components/Sidebar/Logo.vue
index 30b5f78..8798bb0 100644
--- a/CatmDogd-Mall-Front-test/src/layout/components/Sidebar/Logo.vue
+++ b/CatmDogd-Mall-Front-test/src/layout/components/Sidebar/Logo.vue
@@ -33,7 +33,7 @@ export default {
},
data() {
return {
- title: '猫妈狗爸商城管理测试环境',
+ title: '下单伴宠师综合管理平台',
logo: logoImg
}
}
diff --git a/CatmDogd-Mall-Front-test/src/views/login.vue b/CatmDogd-Mall-Front-test/src/views/login.vue
index 416a47c..5711ec6 100644
--- a/CatmDogd-Mall-Front-test/src/views/login.vue
+++ b/CatmDogd-Mall-Front-test/src/views/login.vue
@@ -1,7 +1,7 @@
- 猫妈狗爸商城管理平台测试环境
+ 下单伴宠师综合管理平台
diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
index 394fb50..ed5993c 100644
--- a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue
@@ -1,57 +1,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -67,19 +88,19 @@
size="mini"
@click="handleAdd"
v-hasPermi="['model:AppletOrder:add']"
- >新增
-
-
- 修改
+ >新增派单信息
+
+
+
+
+
+
+
+
+
+
+
删除
-
- 导出
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+ {{ parseTime(scope.row.payTime, '')}}
+
+
+
+
+ {{ parseTime(scope.row.createTime, '')}}
+
+
+
- {{ parseTime(scope.row.payTime, '')}}
+
-
-
+
+
+
-
-
+
+
+
+
+
+ 指定接单 【{{ scope.row.userId }}】
+ 系统派单【未指定】
+
+
+
+
+
+
-
+
-
+
@@ -156,39 +200,42 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ :value="dict.value" >
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+