clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: clunt:master
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund
..
compare: clunt:old-version
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund

No commits in common. "master" and "old-version" have entirely different histories.
master ... old-versio

313 changed files with 1928 additions and 28868 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,4 +34,3 @@ build/
.vscode/
/logs/
/ghy-admin/src/test/
ghy-shop/ADDRESS_QUERY_EXAMPLE.md

214
doc/房间群业务需求说明文档.md
View File

@ -1,214 +0,0 @@
<!-- @author Yifei.Kuang -->
# 房间 / 群 / 群员业务需求说明文档
## 一、项目背景与目标
- **背景**
在现有「师傅 / 商城 / 分销」体系上，引入「房间（圈子）+ 群 + 分销」的新结构，实现多房间、多群、多身份的精细化运营与监管。
- **目标**
- 建立清晰的层级结构：**平台 → 房间 → 群 → 群员/分销**。
- 统一分销身份规则，保证订单与佣金归属准确。
- 支持群主、房间主、下级分销、运营商等多角色协同。
- 为后续房间收费、群收费、群员收费等模式预留空间。
---
## 二、核心概念定义
### 2.1 平台
- 系统最上层运营主体，负责全局参数（平台扣点、结算规则等）。
### 2.2 房间（圈子）
- **定义**：平台下的独立运营空间，一个平台可创建多个房间。
- **特点**
- 房间名称：限制在 4–6 个字。
- 房间标识图片、品牌注解由房间主配置。
- 顶部功能栏：默认为「师傅库 / 商城 / 会话厅」，文字可改，总长度有限制但功能不变。
- 房间可配置自身的功能权限（是否开放商城、是否允许群选品等）以及扣点、收费策略。
- **关系**
- 「微社圈」是整体产品名，“切换圈子”即切换不同房间。
### 2.3 群（分销群）
- **定义**：隶属于某房间的运营群，每个房间下可以创建多个群。
- **建群要求**
- 填写城市、区域、主营品类、预期群规模等信息。
- 建群申请需由房间主及后台审核（形式类似现有分销申请）。
- **职责**
- 每个群经营自己的商品与客户。
- 群商城中仅群主有选品权限，下级分销不能选品。
### 2.4 群主
- 该群的最高级分销者。
- 新建群后自动成为本群顶级分销（无上级分销）。
- 负责本群的选品、群成员管理、群内规则等。
### 2.5 群员 / 分销人员
- 所有群员可根据既有三级分销规则绑定上级关系。
- **分销身份规则**
- 每个群员在「平台 + 房间 + 群」这一组合下有一个独立分销身份。
- 同一微信号在不同房间、不同群中，对系统而言是多个独立身份。
- **影响**
- 每个身份对应一条独立的分销线。
- 订单结算与分账都按所在群对应的分销线进行。
### 2.6 系统机器人 / 监管号
- 平台可在任意群中驻入一个“系统机器人”账号：
- 拥有类似群主的管理能力及后台监管能力。
- 用于监管群运营是否健康、是否违规。
### 2.7 运营商（按微信号）
- 以微信号为主体的运营视角。
- 同一微信号在多个房间、多个群中有多条分销线，但在运营统计中可统一聚合。
---
## 三、分销身份与订单归属规则
### 3.1 唯一身份线
- 每条分销身份线由四段组合定义：
**平台ID + 房间ID + 群ID + 用户ID**
- 每一条组合都被视为“系统中的一个人、一条分销线”。
### 3.2 多群多房间身份
- 同一微信号在不同房间/群中创建或加入时：
- 系统会为其生成新的分销身份线。
- 不同房间、群的身份互不影响。
### 3.3 分销绑定
- 在某群中被拉入的新成员：
- 按现有三级分销规则建立上下级关系。
- 上下级关系限定在本群对应的分销线中。
### 3.4 订单与分销归属
- 用户从某个群入口进入商城并下单：
- 所有分销与分账都按该群的分销线计算。
- 即使服务商在其他群也有身份，本订单仍只归属于当前群对应的身份线。
---
## 四、房间与群的前台结构
### 4.1 房间首页结构
- 房间头部展示：
- 房间头像/标识图；
- 品牌名称（4–6 字）；
- 简短品牌注解。
- 顶部功能栏：
- 默认入口为：「师傅库 / 商城 / 会话厅」。
- 房间主可修改这三个名称（总长度有限制），但功能含义不变。
- 顶部入口与底部导航对应，为功能快捷入口。
### 4.2 师傅库
- 展示本房间下已入驻的师傅与服务店铺。
- 支持按街道、服务品类筛选。
- 师傅资料在现有认证信息基础上增加头像和定位信息。
- 用户可在师傅详情中：
- 直接发起“发布订单”给该师傅；
- 或将已有未接订单指派给该师傅。
### 4.3 商城
- 房间/群共用一个商城体系：
- 房间级定义基础类目与商品池。
- 群主在此基础上为本群做选品配置。
- 首页默认展示热门服务类目，可左划展示其他商品类目。
- 列表支持按价格、评分、销量筛选。
- 商品销量按整条上架商品做统一统计。
### 4.4 会话厅
- 作为房间的首页使用：
- 展示全部群、自建群、已加入群、单聊会话等。
- 顶部菜单包含：申请房间、申请建群、搜索群、房间名称设置等入口。
- 与群聊页面不同，主要承载群列表与会话入口。
---
## 五、订单与发布相关需求（概要）
### 5.1 师傅端状态汇总
- 师傅端首页顶部使用黄条展示：
- 新订单数量；
- 未约订单数量；
- 待上门/待发货数量。
- 点击不同统计可跳转到对应订单列表。
### 5.2 发单入口
- 页面底部设置蓝色「+」按钮作为发布主单入口。
- 支持：
- 服务类/商品类发单；
- 选择到第 4 级类目，可多选；
- 将常用配置保存为模板。
- 支持代填发布，由专业师傅代填问题内容，客户补充地址、电话后提交。
### 5.3 保险规则（概念级）
- 发单时默认勾选“启用保险核查服务费”。
- 发单方需选择保险费用由谁承担：
- 服务费由发单方支付；
- 服务费在订单中扣除。
- 到付场景下，已产生的保险费用仍需保留，并可在后续订单中抵扣。
### 5.4 报价/加价模式（概念级）
- 在满足一定条件（报价模式或允许商家报价）时，显示“加价/报价”入口。
- 支持大厅主单、未约/未排/监控单、已接单主单进行报价。
- 客户最多可选择 3 家（特例 4 家）报价，确认后进入支付流程。
---
## 六、「我的」与运营统计（概念级）
- “我的”页面延用现有结构：
- 展示分销中心、订单、选品等信息。
- 运营统计以微信号为主体：
- 汇总展示多房间、多群的运营数据；
- 可按房间、群维度下钻查看。
---
## 七、商品与服务上架（概念级）
- 服务上架沿用当前规则。
- 商品上架需区分于服务：
- 针对库存、规格、展示方式做单独设计；
- 与服务上架在前台展示上明显区分。
---
## 八、后台与安全监管（概念级）
- 房间级管理：
- 房间创建与审核；
- 房间启用/禁用；
- 房间收费与扣点配置。
- 群级管理：
- 建群审核；
- 群启用/禁用；
- 群主调整；
- 系统机器人驻入/移除。
- 操作审计：
- 记录房间、群创建和重要参数修改，便于运营追溯。
---
**文档定位**：业务需求说明（偏产品视角）
**用途**：为后续详细设计与开发提供业务背景和规则依据

285
doc/房间群分销功能说明文档（开发视角）.md
View File

@ -1,285 +0,0 @@
<!-- @author Yifei.Kuang -->
# 房间 / 群 / 分销功能说明文档（开发视角）
## 一、整体架构
- 层级结构：
- 平台 → 房间（Room）→ 群（Group）→ 群员 / 分销身份（Distributor）
- 身份核心：
- 每条分销身份由「平台 + 房间 + 群 + 用户」组合唯一确定，用于分销归属和订单结算。
---
## 二、房间模块（Room）
### 2.1 房间功能点
- 创建房间申请：
- 用户提交房间名称、头像、品牌注解等信息。
- 后台审核通过后，生成房间，并指定房间主。
- 房间信息维护：
- 房间主可编辑名称、头像、品牌注解。
- 房间顶部功能栏配置：
- 默认显示「师傅库 / 商城 / 会话厅」三项。
- 房间主可以修改显示文案（总字数受限），功能类型不变。
- 房间权限与扣点设置（后台）：
- 是否开启本房间商城。
- 是否允许本房间下的群进行选品。
- 房间级扣点与收费策略配置。
- 房间切换：
- 同一微信可加入多个房间，通过「切换圈子」在不同房间间切换。
---
## 三、群模块（Group）
### 3.1 建群与审核
- 在某房间内，用户可发起建群申请。
- 填写群基础信息（城市、区域、主营类目、群规模等）。
- 审核流程：
- 房间主初审；
- 后台终审；
- 通过后创建群，申请人自动成为群主。
### 3.2 群基本操作
- 群信息维护：
- 群主可编辑群名、介绍、主营描述等。
- 群状态控制（后台）：
- 支持群的启用/禁用；
- 禁用后，群内发单、接单、分销等操作关闭或受限。
- 群主变更：
- 后台可在必要时调整群主（例如违规处理）。
### 3.3 群监管
- 支持在任意群中驻入“系统机器人/系统监管号”：
- 具备基本群管理与后台数据采集、监控能力。
- 用于运营与风险控制。
---
## 四、群员 / 分销身份模块
### 4.1 分销身份规则
- 每个用户在某「平台 + 房间 + 群」组合下对应一个分销身份。
- 同一微信在不同房间/群中拥有多个独立身份：
- 每个身份有独立的分销链；
- 后台视为多个“人”。
### 4.2 加入群与分销绑定
- 成员加入群时：
- 若在该群下不存在分销身份，则系统为其创建一条新身份线。
- 按既有三级分销规则绑定上级分销。
- 上下级分销关系：
- 限定在当前群对应的分销线中，不跨群共享。
### 4.3 角色与权限（概念层）
- 群主：
- 本群最高级分销；
- 拥有选品、群配置、成员管理等高权限。
- 管理员：
- 由群主任命，可拥有部分管理能力（禁言、审核、公告等）。
- 普通分销/群员：
- 不能在群内进行选品；
- 可以拉人建立下级分销关系。
---
## 五、会话厅与群聊相关功能
### 5.1 订单页面导航（左侧）
- 导航栏包含 4 项：
- 资源库；
- 商品城；
- 会话厅；
- 附近圈动态。
- 群主可以：
- 修改导航名称（总字数有限制）；
- 单独开放/禁用任一入口；
- 与外层房间首页的导航机制保持一致。
- 右下角「会话大厅」按钮：
- 进入群聊页面（中间页）；
- 文案可改，群主/平台可控制是否可用。
### 5.2 资源库（A）
- 展示服务师傅资料与店铺：
- 格式类似现有“师傅圈”，但样式可定制。
- 群主可设置仅群内成员可见，或继承房间级展示。
- 提供发布入口，支持基于群选品的类目发单。
### 5.3 商品城（B）
- 群级商城展示逻辑：
- 与整体商城逻辑一致；
- 差异在于：群商城的选品由群主独立配置。
- 所有人看到的商品、类目等均来源于群主选品结果。
- 首页热门类目默认服务类，可左滑出商品类目列表。
- 列表筛选按价格、评分、销量进行。
- 销量统计按整条商品聚合，不再按规格拆分。
### 5.4 会话厅（C）
- 会话厅为“会话/订单流”页面，不是群聊页面。
- 默认进入订单页时落在该列：
- 支持上拉刷新；
- 承载订单、系统相关信息的流式展示。
### 5.5 附近圈动态（D）
- 展示商家图文动态的“公共圈子”区域：
- 默认名称为“附近圈动态”；
- 群主可以改名，但含义不变（商家圈/动态圈）。
### 5.6 会话大厅图与编辑订单（E）
- 页面中部展示“会话大厅相关图”：
- 使用会话大厅图的一部分放大，作为视觉入口。
- 支持进入“编辑订单/发单页”：
- 编辑后的订单可发至全群；
- 管理员可选择仅发送至单个客户。
---
## 六、群聊在线控制与刷新机制
### 6.1 在线人数限制
- 当群聊在线人数超过上限（群主/后台可配置）：
- 群主与管理员不受上线限制，始终在线。
- 系统自动将部分成员标记为离线：
- 优先踢出近期未发言的成员；
- 该过程对成员前端为“默默离线”，不会强制踢出页面。
### 6.2 重新上线与刷新
- 被标记为离线的成员：
- 在输入框输入内容时，自动重新上线。
- 新进群但未发言的成员：
- 一段时间后，输入框变为“消息刷新”按钮；
- 点击后重新加载消息，并作为新上线行为。
- 在已超上线限制的状态下：
- 新进入成员默认离线；
- 需主动刷新或发言才开始拉取实时消息。
### 6.3 页面跳转与上线状态
- 在群聊中点击任何产品、品类跳转其他页面：
- 无论是否超限，都视为离线（停止实时连接）。
- 从商品/其他页面返回群聊页：
- 自动恢复为在线状态。
- 在商品页面点击“聊天”：
- 跳回群聊，并恢复在线。
---
## 七、会话厅顶部类目与选品关系
### 7.1 顶部类目区
- 顶部显示：
- 「全部」入口；
- 若干热门类目。
- 热门类目：
- 群主从本群的主营/重点品类中选定；
- 可对特别重要的类目打红点标记。
- 展示方式：
- 左右滑动；
- 每行最多 8 个类目，最多展示两行。
### 7.2 选品关系
- 群主 = 分销顶层：
- 群主在本群选品的结果，体现在“全部”和热门类目展示中。
- 群员：
- 无法直接在群内进行选品；
- 仅能浏览、转发商品并参与分销。
---
## 八、群内订单与全域订单
### 8.1 群内订单发起
- 在群聊页面可以通过以下方式生成群内订单：
- 使用专门的“群内订单发单入口”；
- 将当前输入框的文字通过快捷键转换为订单（跳转到发单确认页）。
- 生成的群内订单：
- 在群聊中以订单卡片形式展示；
- 提供“接单”按钮。
### 8.2 与专业版（师傅端）的联动
- 若群内发单时勾选“保险”等高级字段：
- 该订单将按专业版（师傅端）逻辑处理；
- 接单、保险、结算等均走专业端流程。
- 群主可配置：
- 群内订单是否仅允许本群服务人员接单；
- 或是否允许进入大厅，被所有专业师傅接单。
### 8.3 全域订单
- 群主可将部分群内订单开放到“全域订单池”：
- 其他群的服务商也能在“全域订单”中看到这些订单并接单。
- 展示限制：
- 在群页面或全域订单列表中：
- 只有服务商能看到具体金额；
- 普通消费者看不到金额。
### 8.4 订单生命周期（概念）
- 典型状态流：
- 已发单 → 待服务（需要填写上门时间）→ 已提交 → 已付款 → 已完成。
- 客户侧操作：
- 在“已提交”中查看支付方式并确认；
- 确认支付后进入“已付款”。
- 服务侧操作：
- 服务方确认“已收款，结单”，进入“已完成”。
### 8.5 纯发单群模式
- 对于“只发单、不聊天”的群：
- 群聊可以不保持实时连接；
- 用户仅在手动刷新时看到新订单；
- 群形态接近“单纯接单页面”，以降低系统实时成本。
---
## 九、「我的」与运营视角
- “我的”页面沿用现有商城结构：
- 包含分销中心、订单、选品等模块。
- 统计以微信号为主视角：
- 汇总展示该用户在不同房间、群中的运营情况；
- 可按房间、群进行明细下钻。
---
## 十、后台与审计（功能级）
- 房间管理：
- 房间申请审批；
- 房间启用/禁用；
- 房间级扣点/收费配置。
- 群管理：
- 建群申请审核；
- 群启用/禁用；
- 群主调整；
- 系统机器人驻入/移除。
- 审计日志：
- 创建/修改房间、群；
- 修改扣点与重要配置；
- 关键权限调整（如群主、管理员变更）等操作均需记录。
---
**文档定位**：开发可读的功能说明（不含字段/接口细节）
**用途**：指导后续接口设计、表结构设计与前后端实现拆分

299
doc/群成员身份标签与权限管理功能文档.md
View File

@ -1,299 +0,0 @@
# 群成员身份标签与权限管理功能文档
## 文档说明
本文档描述群聊中**群成员身份标签、分类管理、权限控制、消息通知**相关的功能逻辑，不涉及字段/表结构设计，仅面向功能实现。
---
## 一、群成员身份标签系统
### 1.1 身份标签类型
系统支持以下身份标签：
- **创建者**：群创建者（通常也是群主）
- **管理员**：被群主任命的管理员
- **服务商家**：提供服务的商家/师傅
- **商品商家**：提供商品的商家
- **消费者**：普通消费者
- **发单人**：经常发单的用户
- **接单人**：经常接单的用户
- **群成员**：普通群成员
- **VIP客户**：VIP客户
### 1.2 标签分配流程
- **入群时自选标签**
- 用户加入群时，系统提供两个初始选项：
- **非商家**
- **商家**
- 用户选择一个作为初始身份标识。
- **群主/管理员最终确认**
- 群主或管理员可以在群成员资料中：
- 查看用户自选的标签。
- 从系统标签库中选择一个标签，覆盖或确认用户的标签。
- 后续可以随时修改成员的标签。
- **标签对外展示**
- 标签会显示在群成员资料、群成员列表等位置，作为该成员在群内的“对外身份”。
### 1.3 群成员资料栏位
- **群成员资料页包含7个栏位**：
- 每个栏位可以放置一个名称/备注。
- 这些栏位对所有身份/标签的群员都开放使用。
- 用途：方便所有群员查看和识别成员信息。
---
## 二、群成员分类/分组系统
### 2.1 分类概念
- **分类定义**
- 群内成员可以按照“分类”进行组织，每个分类可以理解为“分组”或“分仓”。
- 系统支持创建 **1~7个分类**。
- 每个分类可以自定义命名（例如“1类”、“2类”，或自定义别名如“核心商家组”、“普通客户组”等）。
- **分类与标签的关系**
- 分类与身份标签是**独立的两套体系**：
- 一个成员可以拥有一个身份标签（如“服务商家”）。
- 同时，该成员可以被放入任意一个分类中（如“1类”）。
- 标签不影响分类归属，分类也不影响标签展示。
### 2.2 分类操作
- **成员分类归属**
- 任何成员可以被放入任意一个分类中。
- 例如：可以将某个“服务商家”放入“1类”，也可以将某个“消费者”放入“1类”。
- 成员可以只属于一个分类，也可以不属于任何分类（显示在“未分类”或“全部”中）。
- **按分类查看成员**
- 群主与管理员可以：
- 按分类查看成员列表。
- 按标签查看成员列表。
- 按“分类+标签”组合筛选查看。
- **普通群成员查看**
- 普通群成员在群名单中：
- 可以按“全部”及“标签身份”查看成员信息。
- 不能按分类查看（分类信息对普通成员不展示）。
### 2.3 分类消息发送
- **管理员按分类发消息**
- 管理员可以：
- 选择向某个分类的所有成员发送消息（其他分类看不到）。
- 选择向某个分类中的单个成员发送消息。
- 用途：主要用于群管理员进行精细化运营和定向通知。
---
## 三、管理员任命与权限体系
### 3.1 管理员任命
- **任命流程**
- 群主可以任命任意群成员为管理员。
- 任命时可以：
- 标注该管理员的“岗位名称”（例如“客服主管”、“运营专员”等）。
- 有岗位名称的管理员会在“服务团队消息专列”中显示。
- **订单交付权限（独立于管理员）**
- 订单交付栏的权限与管理员身份独立：
- 群主可以勾选某些成员（不一定是管理员）拥有“订单交付权限”。
- 拥有交付权限的人可以在订单交付栏中发布交付信息。
### 3.2 管理员权限列表
群主在任命管理员时，可以勾选该管理员拥有的权限项。管理员在哪个分类中不影响其权限范围。
#### 权限1：按类发群信息
- 管理员可以向指定分类的所有成员发送群消息（其他分类看不到）。
#### 权限2：禁言与消息可见性控制
- **禁言功能（实际为“审核可见”）**
- 管理员可以按分类或单个成员设置“禁言”。
- 被禁言的成员：
- 仍然可以发送消息，但消息默认**仅管理员可见 + 自己可见**。
- 管理员可以在后台审核这些消息，勾选后才会展示到群聊页面。
- 严格来说这不是传统“禁言”，而是“审核可见”机制。
- **消息可见性设置**
- 管理员可以：
- 按分类设置：该类群员发的消息仅该类成员可见，或仅管理员可见。
- 按单个成员设置：该成员发的消息仅管理员可见（在群内形成独立通道，对其他人无感）。
- **特殊规则**
- 被禁言的成员仍然可以发送商品链接到群（商品链接不受禁言限制）。
- 管理员查看消息的规则：
- 如果管理员属于某个分类，只能看到该类群员发的信息。
- 如果管理员在“全部”分类中，可以看到所有分类群员发的信息。
- **管理员@解禁**
- 管理员可以@被禁言的成员，临时解禁3小时。
#### 权限3：禁止接单
- 管理员可以按分类或单个成员设置“禁止点击接单键”。
- 被禁止的成员无法接取群消息中的订单。
#### 权限4：禁止发单
- 管理员可以按分类或单个成员设置“禁止点击发单键”。
- 被禁止的成员无法使用发单功能（包括类目发单）。
#### 权限5：禁止互加好友
- 管理员可以按分类或单个成员设置“禁止互加好友”。
- 被禁止的成员：
- 别人无法添加他为好友。
- 他也无法添加别人为好友。
- **特殊规则**
- 即使被禁止加好友，双方仍然可以：
- 在服务团队聊天中直接对话（通过服务团队入口）。
#### 权限6：屏蔽群内信息
- 管理员可以按分类或单个成员设置“屏蔽群内信息”。
- 被屏蔽的成员：
- 看不到群内在发的消息。
- **但订单仍然可见可接**（屏蔽消息，不屏蔽订单展示）。
#### 权限7：禁止发圈信息
- 管理员可以按分类或单个成员设置“禁止发圈信息”。
- 被禁止的成员无法在商家圈/动态圈中发布内容。
#### 权限8：审核成员入群
- 管理员可以审核新成员的入群申请。
#### 权限9：删除成员与撤回消息
- 管理员可以：
- 删除群成员（将成员移出群）。
- 撤回群成员的消息：
- 可以撤回任意成员的一条消息。
- 可以彻底删除消息（删除后不可见，不可恢复）。
#### 权限10：分类分标签发公告
- 管理员可以：
- 按分类发送公告。
- 按标签发送公告。
- 按“分类+标签”组合发送公告。
---
## 四、群主专属权限
### 4.1 群名设置
- 群主可以修改群名称。
### 4.2 群转让
- 群主可以将群主身份转让给其他成员。
### 4.3 开通入群申请
- 群主可以开启/关闭“入群申请”功能。
- 开启后，新成员需要申请才能加入群。
### 4.4 待接单显示规则（待定）
- 群主可以设置“待接单是否仅显示本群的订单”（此功能待定，可能不实现）。
---
## 五、群消息通知机制
### 5.1 消息通知基础规则
#### 未打开登录页面的通知策略
- 用户未打开登录页面（APP未打开）时：
- 系统每 **5分钟** 聚合一次新消息，发送一条通知。
- 通知内容：显示所有群的新消息汇总（例如“您有X条新消息”）。
- 用户打开APP后，不再发送聚合通知。
#### 群外消息计数
- 在群列表页面（群外）：
- 每个群名旁边显示该群的消息数量角标。
- APP端统一使用角标显示。
### 5.2 群消息免打扰设置
#### 免打扰选项
每个群成员可以为自己设置该群的“免打扰”策略，选项包括：
- **仅1小时1条**：1小时内只通知一次。
- **仅1天1条**：1天内只通知一次。
- **仅3天1条**：3天内只通知一次。
- **仅10天1条**：10天内只通知一次。
#### 免打扰与通知队列的关系
- 系统维护多个通知队列：
- **5分钟通知队列**：默认队列，每5分钟通知一次。
- **1小时通知队列**：设置了“1小时1条”的用户进入此队列。
- **1天通知队列**：设置了“1天1条”的用户进入此队列。
- **3天通知队列**：设置了“3天1条”的用户进入此队列。
- **10天通知队列**：设置了“10天1条”的用户进入此队列。
- 用户设置免打扰后：
- 从“5分钟队列”中剔除，进入对应的免打扰队列。
- 例如：设置“1小时1条”后，每1小时聚合通知一次（而不是每5分钟）。
#### 通知时间窗口
- **5分钟队列与1小时队列**：
- 晚上7点后不通知。
- 早上8点后才开始通知。
- **1天队列、3天队列、10天队列**：
- 通知时间点可以设定在12点，或错开时间点（例如1天队列12点，3天队列14点，10天队列16点），以减少大量通知同时推送。
#### 用户类型与免打扰选择
- **经营者（商家/师傅）**：
- 更多选择“5分钟通知”或“1小时通知”（需要及时响应）。
- **客户（消费者）**：
- 更多选择“3天通知”或“10天通知”（降低打扰频率）。
### 5.3 @通知机制
#### @通知规则
- **无论用户是否设置免打扰**，被@时：
- 使用**手机上方消息栏**直接通知（不进入队列等待）。
- 通知带有声音提醒（用户可以自定义声音）。
- 不等待5分钟/1小时等时间窗口，立即推送。
#### @通知展示位置
- @通知显示在手机顶部通知栏（系统级通知）。
---
## 六、消息通知总结
### 6.1 通知队列体系
系统维护以下通知队列：
1. **5分钟通知队列**（默认）
- 时间窗口：早上8点 ~ 晚上7点。
- 每5分钟聚合通知一次。
2. **1小时通知队列**
- 时间窗口：早上8点 ~ 晚上7点。
- 每1小时聚合通知一次。
3. **1天通知队列**
- 在指定时间点（例如12点）通知一次。
4. **3天通知队列**
- 在指定时间点（例如14点）通知一次。
5. **10天通知队列**
- 在指定时间点（例如16点）通知一次。
### 6.2 特殊通知（不受队列限制）
- **@通知**：
- 立即推送，使用手机顶部通知栏。
- 带声音提醒。
- 不受免打扰设置影响。
### 6.3 通知聚合规则
- **未打开APP时**：
- 所有群的新消息统一聚合为一条通知（例如“您有X条新消息”）。
- 按用户所属队列的时间窗口进行通知。
- **打开APP后**：
- 不再发送聚合通知。
- 用户可以在APP内查看各群的具体消息。
---
## 七、功能总结
### 7.1 身份标签与分类
- 9种身份标签，入群时自选，群主/管理员可最终确认和修改。
- 支持1~7个分类，分类与标签独立，成员可被放入任意分类。
### 7.2 管理员权限
- 10个权限点，群主可灵活配置每个管理员的权限。
- 订单交付权限独立于管理员身份。
### 7.3 消息通知
- 5个通知队列（5分钟/1小时/1天/3天/10天），用户可自由选择。
- @通知立即推送，不受免打扰影响。
- 时间窗口控制，避免夜间打扰。
---
## 八、待定事项
- 待接单是否仅显示本群的订单（功能待定）。
---
**文档版本**：v1.0
**最后更新**：2024年

36
ghy-admin/pom.xml
View File

@ -17,38 +17,6 @@
<dependencies>
<dependency>
<groupId>com.tencentcloudapi.cls</groupId>
<artifactId>tencentcloud-cls-logback-appender</artifactId>
<version>1.0.3</version>
</dependency>
<!-- 阿里云api-SDK -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>dytnsapi20200217</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>tea-openapi</artifactId>
<version>0.3.6</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>tea-console</artifactId>
<version>0.0.1</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>tea-util</artifactId>
<version>0.2.23</version>
</dependency>
<!-- SpringBoot集成thymeleaf模板 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@ -143,10 +111,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.ghy</groupId>
<artifactId>ghy-shop</artifactId>
</dependency>
</dependencies>

26
ghy-admin/src/main/java/com/ghy/GhyApplication.java
View File

@ -4,18 +4,13 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
/**
* 启动程序
*
* @author clunt
*/
@EnableScheduling
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class GhyApplication
{
@ -39,25 +34,4 @@ public class GhyApplication
public RestTemplate restTemplate(){
return new RestTemplate();
}
private CorsConfiguration corsConfig() {
CorsConfiguration corsConfiguration = new CorsConfiguration();
// 请求常用的三种配置，*代表允许所有，当时你也可以自定义属性（比如header只能带什么，只能是post方式等等）
// corsConfiguration.addAllowedOrigin("*");
corsConfiguration.addAllowedHeader("*");
corsConfiguration.addAllowedMethod("*");
corsConfiguration.setAllowCredentials(true);
corsConfiguration.addAllowedOriginPattern("*");
corsConfiguration.setMaxAge(3600L);
return corsConfiguration;
}
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", corsConfig());
return new CorsFilter(source);
}
}

179
ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java
View File

@ -7,25 +7,20 @@ import com.ghy.common.adapay.model.Event;
import com.ghy.common.adapay.model.PayCallback;
import com.ghy.common.adapay.model.PaymentDTO;
import com.ghy.common.enums.PayStatus;
import com.ghy.order.domain.OrderAddSubtract;
import com.ghy.order.domain.OrderMaster;
import com.ghy.order.mapper.OrderMasterMapper;
import com.ghy.order.service.IOrderAddSubtractService;
import com.ghy.order.service.OrderMasterService;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.FinancialDetail;
import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.domain.PaymentRelation;
import com.ghy.payment.mapper.PaymentRelationMapper;
import com.ghy.payment.service.CallBackService;
import com.ghy.payment.service.FinancialChangeRecordService;
import com.ghy.payment.service.FinancialDetailService;
import com.ghy.payment.service.FinancialMasterService;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@ -35,160 +30,114 @@ import java.util.concurrent.CompletableFuture;
*
* @author HH 2022/5/31
*/
@Slf4j
@Service("payCallbackService")
public class PayCallbackService implements CallBackService {
@Resource
OrderMasterService orderMasterService;
private static final Logger logger = LoggerFactory.getLogger(PayCallbackService.class);
@Resource
FinancialMasterService financialMasterService;
@Resource
PaymentRelationMapper paymentRelationMapper;
@Resource
FinancialDetailService financialDetailService;
@Resource
IOrderAddSubtractService orderAddSubtractService;
@Resource
FinancialChangeRecordService financialChangeRecordService;
@Override
@Transactional(rollbackFor = Exception.class)
public void onCallback(Event event) {
log.info("支付回调: {}", event);
logger.info("支付回调: {}", event);
String data = event.getData();
PayCallback payment = JSON.parseObject(data, PayCallback.class);
PaymentDTO dto = financialMasterService.selectPaymentById(payment.getId());
// 支付ID
final String paymentId = dto.getId();
// 是否支付成功
final boolean succeeded = AdapayStatusEnum.succeeded.code.equals(payment.getStatus());
// 异步更新交易记录 避免被其它业务异常回滚
// 校验是否是本系统发出去的支付请求
if (dto != null) {
CompletableFuture.runAsync(() -> {
// 异步更新交易记录 避免被回滚
PaymentDTO param = new PaymentDTO();
param.setId(payment.getId());
param.setStatus(payment.getStatus());
if (succeeded) {
// 如果支付成功 更新支付渠道、支付时间、手续费
param.setPayChannel(payment.getPayChannel());
param.setFeeAmt(payment.getFeeAmt());
param.setStatus(payment.getStatus());
param.setPayTime(LocalDateTime.now());
if ("delay".equals(dto.getPayMode())) {
// 如果支付成功 且是延迟分账模式 更新可用金额=交易金额
param.setAvailableAmt(dto.getPayAmt());
}
}
financialMasterService.updatePayment(param);
});
if (AdapayStatusEnum.succeeded.code.equals(payment.getStatus())) {
if (payment.getOrderNo().split("_").length > 2) {
// 支付回调中的加价记录ID
String fcrIdStr = payment.getOrderNo().split("_")[1];
String[] fcrIds = fcrIdStr.split(",");
if (succeeded) {
// 支付成功 查询支付关联的订单
List<PaymentRelation> paymentRelations = paymentRelationMapper.selectByPaymentId(paymentId);
if (CollectionUtils.isEmpty(paymentRelations)) {
log.error("未关联订单的支付回调: {}", data);
return;
}
BigDecimal totalChangeMoney = BigDecimal.ZERO;
Long financialMasterId = null;
for (String fcrId : fcrIds) {
FinancialChangeRecord financialChangeRecord = new FinancialChangeRecord();
financialChangeRecord.setId(Long.valueOf(fcrId));
financialChangeRecord.setPayStatus(1);
// 加价的支付paymentId回填到remark
financialChangeRecord.setRemark(payment.getId());
financialChangeRecord.setRemark(payment.getId());
financialChangeRecord.setPaymentId(payment.getId());
financialChangeRecordService.update(financialChangeRecord);
for (PaymentRelation relation : paymentRelations) {
Long relationId = relation.getRelationId();
if (PaymentRelation.FINANCIAL_MASTER.equals(relation.getRelationIdType())) {
FinancialMaster financialMaster = financialMasterService.selectById(relationId);
// 更新主订单的支付信息
orderMasterService.updatePayStatus(financialMaster.getOrderMasterId(), PayStatus.PAID.getCode());
// 更新主财务单的支付信息
financialMasterService.updatePay(relationId, paymentId, PayStatus.PAID.getCode());
log.info("主财务单[{}]支付成功", relationId);
// 检查是否为商品订单且有关联的服务订单，需要同步更新服务订单财务主单支付状态
try {
OrderMaster orderMaster = orderMasterService.selectById(financialMaster.getOrderMasterId());
if (orderMaster != null && orderMaster.getOrderType() == 1 && orderMaster.getHasServiceOrder() == 1) {
// 查询关联的服务订单
OrderMaster serviceOrder = orderMasterService.selectByGoodsOrderMasterId(orderMaster.getId());
if (serviceOrder != null) {
// 查询服务订单对应的财务主单
FinancialMaster serviceFinancialMaster = financialMasterService.selectByOrderMasterId(serviceOrder.getId());
if (serviceFinancialMaster != null && !PayStatus.PAID.getCode().equals(serviceFinancialMaster.getPayStatus())) {
// 更新服务订单财务主单支付状态
financialMasterService.updatePay(serviceFinancialMaster.getId(), paymentId, PayStatus.PAID.getCode());
// 更新服务订单支付状态
orderMasterService.updatePayStatus(serviceOrder.getId(), PayStatus.PAID.getCode());
log.info("商品订单[{}]关联的服务订单[{}]财务主单[{}]支付状态已同步更新为已支付",
orderMaster.getId(), serviceOrder.getId(), serviceFinancialMaster.getId());
}
}
}
} catch (Exception e) {
log.error("同步更新商品订单关联服务订单支付状态时发生异常，商品订单ID: {}, 异常信息: {}",
financialMaster.getOrderMasterId(), e.getMessage(), e);
}
} else if (PaymentRelation.FINANCIAL_CHANGE.equals(relation.getRelationIdType())) {
// 更新加价单的支付信息
financialChangeRecordService.updatePay(relationId, paymentId, PayStatus.PAID.getCode());
FinancialChangeRecord fc = financialChangeRecordService.selectFinancialChangeRecordById(relationId);
// 修改子订单的payMoney
FinancialDetail fd = financialDetailService.selectByOrderDetailId(fc.getOrderDetailId());
FinancialDetail fd2Update = new FinancialDetail();
fd2Update.setId(fd.getId());
fd2Update.setPayMoney(fd.getPayMoney());
fd2Update.setPayStatus(PayStatus.PAID.getCode());
financialDetailService.updateFinancialDetail(fd2Update);
FinancialChangeRecord fc = financialChangeRecordService.selectFinancialChangeRecordById(financialChangeRecord.getId());
FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(fc.getOrderDetailId());
FinancialDetail financialDetail2Update = new FinancialDetail();
financialDetail2Update.setId(financialDetail.getId());
financialDetail2Update.setPayMoney(financialDetail.getPayMoney().add(fc.getChangeMoney()));
financialDetail2Update.setPayStatus(PayStatus.PAID.getCode());
financialDetailService.updateFinancialDetail(financialDetail2Update);
totalChangeMoney = totalChangeMoney.add(fc.getChangeMoney());
if (financialMasterId == null) {
financialMasterId = financialDetail.getFinancialMasterId();
}
}
// 修改主单的payMoney
FinancialMaster financialMaster = financialMasterService.selectById(fd.getFinancialMasterId());
FinancialMaster financialMaster = financialMasterService.selectById(financialMasterId);
FinancialMaster financialMaster2Update = new FinancialMaster();
financialMaster2Update.setId(financialMaster.getId());
financialMaster2Update.setPayMoney(financialMaster.getPayMoney());
financialMaster2Update.setPayMoney(financialMaster.getPayMoney().add(totalChangeMoney));
financialMaster2Update.setPayStatus(PayStatus.PAID.getCode());
financialMasterService.updateFinancialMaster(financialMaster2Update);
// 更新主订单的支付信息
orderMasterService.updatePayStatus(financialMaster.getOrderMasterId(), PayStatus.PAID.getCode());
log.info("FinancialChange[{}]支付成功", relationId);
// TODO 拆分对应的分账流水
}else {
// 主单的付款
String masterOrderNo = payment.getOrderNo().split("_")[0];
} else if (PaymentRelation.ORDER_ADD.equals(relation.getRelationIdType())) {
// 更新订单追加单的支付信息
orderAddSubtractService.updatePay(relationId, paymentId, PayStatus.PAID.getCode());
OrderAddSubtract orderAdd = orderAddSubtractService.selectById(relationId);
// 修改子订单的payMoney
FinancialDetail fd = financialDetailService.selectByOrderDetailId(orderAdd.getOrderDetailId());
FinancialDetail fd2Update = new FinancialDetail();
fd2Update.setId(fd.getId());
fd2Update.setPayMoney(fd.getPayMoney());
fd2Update.setPayStatus(PayStatus.PAID.getCode());
financialDetailService.updateFinancialDetail(fd2Update);
// 修改主单的payMoney
FinancialMaster financialMaster = financialMasterService.selectById(fd.getFinancialMasterId());
// 找到主单记录
FinancialMaster param = new FinancialMaster();
param.setOrderMasterCode(masterOrderNo);
List<FinancialMaster> financialMasters = financialMasterService.selectFinancialMasterList(param);
FinancialMaster source = financialMasters.get(0);
// 更新主单paymentId 以及主单状态
FinancialMaster financialMaster2Update = new FinancialMaster();
financialMaster2Update.setId(financialMaster.getId());
financialMaster2Update.setPayMoney(financialMaster.getPayMoney());
financialMaster2Update.setId(source.getId());
financialMaster2Update.setPayStatus(PayStatus.PAID.getCode());
financialMaster2Update.setPaymentId(payment.getId());
financialMasterService.updateFinancialMaster(financialMaster2Update);
log.info("订单追加[{}]支付成功", relationId);
} else if (PaymentRelation.CONSULT_ADD.equals(relation.getRelationIdType())) {
// 更新加价单的支付信息
financialChangeRecordService.updatePay(relationId, paymentId, PayStatus.PAID.getCode());
}
// 更新主财务单状态
financialMasterService.paySucceeded(payment.getId(), payment.getPayChannel());
} else {
log.error("未知的订单类型: relationIdType={}, relationId={}", relation.getRelationIdType(), relationId);
}
logger.warn("支付失败 : {}", data);
}
} else {
logger.warn("系统中不存在这条交易记录: {}", event);
}
}
@Override
public void onResponse(JSONObject response) {
log.info("发起支付 Response: {}", response.toJSONString());
logger.info("发起支付 Response: {}", response.toJSONString());
// 保存一条支付记录
PaymentDTO payment = response.toJavaObject(PaymentDTO.class);
String status = payment.getStatus();
payment.setStatus(AdapayStatusEnum.pending.code);
financialMasterService.insertPayment(payment);
if (!AdapayStatusEnum.succeeded.code.equals(status)) {
log.warn("发起支付失败 : {}", response.toJSONString());
logger.warn("发起支付失败 : {}", response.toJSONString());
}
}

66
ghy-admin/src/main/java/com/ghy/callback/PaymentConfirmCallbackService.java
View File

@ -1,66 +0,0 @@
package com.ghy.callback;
import com.alibaba.fastjson.JSONObject;
import com.ghy.common.adapay.model.AdapayStatusEnum;
import com.ghy.common.adapay.model.Event;
import com.ghy.common.adapay.model.PaymentDTO;
import com.ghy.common.utils.MoneyUtil;
import com.ghy.payment.domain.PaymentConfirm;
import com.ghy.payment.mapper.PaymentConfirmMapper;
import com.ghy.payment.mapper.PaymentMapper;
import com.ghy.payment.service.CallBackService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
@Service("paymentConfirmCallbackService")
public class PaymentConfirmCallbackService implements CallBackService {
@Resource
private PaymentMapper paymentMapper;
@Resource
private PaymentConfirmMapper paymentConfirmMapper;
@Override
public void onCallback(Event event) {
// 支付确认没有callback
}
@Override
public void onResponse(JSONObject response) {
if (AdapayStatusEnum.succeeded.code.equals(response.getString("status")) ||
AdapayStatusEnum.pending.code.equals(response.getString("status"))) {
// 支付确认 操作成功
PaymentConfirm paymentConfirm = response.toJavaObject(PaymentConfirm.class);
// 保存支付确认记录
paymentConfirmMapper.insert(paymentConfirm);
// 更新支付单信息
updatePayment(paymentConfirm);
}
}
private synchronized void updatePayment(PaymentConfirm paymentConfirm) {
String paymentId = paymentConfirm.getPaymentId();
PaymentDTO payment = paymentMapper.selectById(paymentId);
// 支付金额
BigDecimal payAmt = new BigDecimal(payment.getPayAmt());
// 已确认金额
BigDecimal confirmedAmt = new BigDecimal(paymentConfirm.getConfirmedAmt());
// 已退款金额
BigDecimal refundedAmt = new BigDecimal(paymentConfirm.getRefundedAmt());
// 已撤销金额
BigDecimal reservedAmt = new BigDecimal(paymentConfirm.getReservedAmt());
// 可支配金额 = 支付金额 - 已确认金额 - 已退款金额 - 已撤销金额
BigDecimal availableAmt = payAmt.subtract(confirmedAmt).subtract(refundedAmt).subtract(reservedAmt);
// 更新支付单信息
PaymentDTO payment2up = new PaymentDTO();
payment2up.setId(paymentId);
payment2up.setConfirmedAmt(paymentConfirm.getConfirmedAmt());
payment2up.setRefundedAmt(paymentConfirm.getRefundedAmt());
payment2up.setReservedAmt(paymentConfirm.getReservedAmt());
payment2up.setAvailableAmt(MoneyUtil.toS(availableAmt));
paymentMapper.updatePayment(payment2up);
}
}

44
ghy-admin/src/main/java/com/ghy/web/controller/MesgTestController.java
View File

@ -1,44 +0,0 @@
package com.ghy.web.controller;
import com.ghy.common.dto.DataEntityDTO;
import com.ghy.common.enums.WxMsgEnum;
import com.ghy.common.utils.WechatMsgUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
* @Author 但星霖
* @Date 2023-09-28 10：42：56
* 说明：
*/
@RestController
@RequestMapping("/mesg/test")
public class MesgTestController {
@GetMapping("/{openId}")
public void edit(@PathVariable("openId") String openId){
try {
// 消息组装。
Map<String, Object> paramsNew = new HashMap<>();
// 订单编号
paramsNew.put("character_string1", new DataEntityDTO("12312"));
// 名称
paramsNew.put("thing2", new DataEntityDTO("订单被拒通知"));
// 预约时间
paramsNew.put("data8", new DataEntityDTO(com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date())));
// 师傅姓名
paramsNew.put("name3", new DataEntityDTO("测试"));
// 服务区域
paramsNew.put("thing4", new DataEntityDTO("成都市"));
// 消息推送
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), openId, WxMsgEnum.TEXT, paramsNew);
} catch (Exception e) {
e.printStackTrace();
}
}
}

576
ghy-admin/src/main/java/com/ghy/web/controller/ShopController.java
View File

@ -1,576 +0,0 @@
package com.ghy.web.controller;
import com.ghy.common.core.controller.BaseController;
import com.ghy.shop.domain.Shop;
import com.ghy.shop.domain.ShopDistanceQuery;
import com.ghy.shop.service.ShopService;
import com.ghy.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import org.springframework.web.client.RestTemplate;
import com.ghy.common.utils.LocationUtils;
import java.util.stream.Collectors;
import java.util.Comparator;
/**
* 店铺管理接口
*/
@RestController
@RequestMapping("/shop")
public class ShopController extends BaseController {
@Autowired
private ShopService shopService;
@Autowired
private RestTemplate restTemplate;
@PostMapping("/add")
public AjaxResult addShop(@RequestBody Shop shop) {
// 如果没有经纬度，尝试通过地址解析获取
if ((shop.getLatitude() == null || shop.getLongitude() == null) &&
shop.getAddress() != null && !shop.getAddress().trim().isEmpty()) {
try {
Map<String, Double> coordinates = getCoordinatesByAddress(shop);
if (coordinates != null) {
shop.setLatitude(coordinates.get("latitude"));
shop.setLongitude(coordinates.get("longitude"));
logger.info("为店铺[{}]自动获取到坐标: 经度={}, 纬度={}",
shop.getShopName(), shop.getLongitude(), shop.getLatitude());
}
} catch (Exception e) {
logger.warn("获取地址经纬度失败: {}", e.getMessage());
}
}
int result = shopService.addShop(shop);
if (result > 0) {
Map<String, Object> response = new HashMap<>();
response.put("shopId", shop.getShopId());
response.put("shopName", shop.getShopName());
response.put("latitude", shop.getLatitude());
response.put("longitude", shop.getLongitude());
response.put("address", shop.getAddress());
return AjaxResult.success("店铺创建成功", response);
} else {
return AjaxResult.error("店铺创建失败");
}
}
@GetMapping("/list")
public AjaxResult listShops() {
List<Shop> list = shopService.listShops();
return AjaxResult.success(list);
}
@GetMapping("/{id}")
public AjaxResult getShop(@PathVariable Long id) {
Shop shop = shopService.getShop(id);
return shop != null ? AjaxResult.success(shop) : AjaxResult.error("未找到店铺");
}
@PostMapping("/update")
public AjaxResult updateShop(@RequestBody Shop shop) {
// 如果没有经纬度但有地址，尝试通过地址解析获取经纬度
if ((shop.getLatitude() == null || shop.getLongitude() == null) &&
shop.getAddress() != null && !shop.getAddress().trim().isEmpty()) {
try {
Map<String, Double> coordinates = getCoordinatesByAddress(shop);
if (coordinates != null) {
shop.setLatitude(coordinates.get("latitude"));
shop.setLongitude(coordinates.get("longitude"));
}
} catch (Exception e) {
logger.warn("更新店铺时获取地址经纬度失败: {}", e.getMessage());
}
}
return toAjax(shopService.updateShop(shop));
}
@PostMapping("/delete/{id}")
public AjaxResult deleteShop(@PathVariable Long id) {
return toAjax(shopService.deleteShop(id));
}
@GetMapping("/{id}/location")
public AjaxResult getShopLocation(@PathVariable Long id) {
Shop shop = shopService.getShop(id);
if (shop == null) {
return AjaxResult.error("未找到店铺");
}
Map<String, Object> location = new HashMap<>();
location.put("address", shop.getAddress());
location.put("latitude", shop.getLatitude());
location.put("longitude", shop.getLongitude());
location.put("provinceName", shop.getProvinceName());
location.put("cityName", shop.getCityName());
location.put("countryName", shop.getCountryName());
location.put("streetName", shop.getStreetName());
return AjaxResult.success(location);
}
// @GetMapping("/getCurrentLocation")
// public AjaxResult getCurrentLocation() {
// try {
// // 直接调用百度地图API获取当前位置信息
// String url = "/tool/baidu/getLocation";
// return restTemplate.getForObject(url, AjaxResult.class);
// } catch (Exception e) {
// return AjaxResult.error("获取当前位置失败：" + e.getMessage());
// }
// }
@GetMapping("/worker/{workerId}")
public AjaxResult getShopsByWorkerId(@PathVariable Long workerId) {
List<Shop> shops = shopService.getShopsByWorkerId(workerId);
return AjaxResult.success(shops);
}
// /**
// * 通过地址获取经纬度坐标
// */
// @PostMapping("/getCoordinates")
// public AjaxResult getCoordinatesByAddress(@RequestBody Shop shop) {
// try {
// Map<String, Double> coordinates = getCoordinatesByAddress(shop);
// if (coordinates != null) {
// return AjaxResult.success("获取坐标成功", coordinates);
// } else {
// return AjaxResult.error("无法获取该地址的坐标信息");
// }
// } catch (Exception e) {
// logger.error("获取坐标失败: {}", e.getMessage(), e);
// return AjaxResult.error("获取坐标失败: " + e.getMessage());
// }
// }
/**
* 通过经纬度逆解析获取地址信息并保存到店铺
*/
@PostMapping("/saveShopByLocation")
public AjaxResult saveShopByLocation(@RequestBody Map<String, Object> params) {
try {
String location = params.get("location").toString(); // 格式: "经度,纬度"
// 调用百度地图逆解析API
String url = "/tool/baidu/getLocation";
Map<String, String> requestBody = new HashMap<>();
requestBody.put("location", location);
// 这里应该调用百度接口获取地址信息
// AjaxResult locationResult = restTemplate.postForObject(url, requestBody, AjaxResult.class);
// 解析经纬度
String[] coordinates = location.split(",");
if (coordinates.length != 2) {
return AjaxResult.error("location格式错误，应为：经度,纬度");
}
Double longitude = Double.parseDouble(coordinates[0]);
Double latitude = Double.parseDouble(coordinates[1]);
// 创建店铺对象
Shop shop = new Shop();
shop.setLongitude(longitude);
shop.setLatitude(latitude);
// 设置其他信息
if (params.containsKey("shopName")) {
shop.setShopName(params.get("shopName").toString());
}
if (params.containsKey("workerId")) {
shop.setWorkerId(Long.valueOf(params.get("workerId").toString()));
}
if (params.containsKey("phone")) {
shop.setPhone(params.get("phone").toString());
}
// 保存店铺
int result = shopService.addShop(shop);
if (result > 0) {
Map<String, Object> response = new HashMap<>();
response.put("shopId", shop.getShopId());
response.put("longitude", longitude);
response.put("latitude", latitude);
response.put("location", location);
return AjaxResult.success("店铺创建成功", response);
} else {
return AjaxResult.error("店铺创建失败");
}
} catch (Exception e) {
logger.error("通过位置创建店铺失败: {}", e.getMessage(), e);
return AjaxResult.error("创建失败: " + e.getMessage());
}
}
/**
* 内部方法：通过地址解析获取经纬度
*/
private Map<String, Double> getCoordinatesByAddress(Shop shop) {
try {
// 构建完整地址
StringBuilder fullAddress = new StringBuilder();
if (shop.getProvinceName() != null) fullAddress.append(shop.getProvinceName());
if (shop.getCityName() != null) fullAddress.append(shop.getCityName());
if (shop.getCountryName() != null) fullAddress.append(shop.getCountryName());
if (shop.getStreetName() != null) fullAddress.append(shop.getStreetName());
if (shop.getAddress() != null) fullAddress.append(shop.getAddress());
String address = fullAddress.toString();
if (address.isEmpty()) {
return null;
}
logger.info("开始解析地址获取坐标: {}", address);
// TODO: 这里应该调用真实的地图API
// 示例：百度地图正向地理编码API
// String url = "https://api.map.baidu.com/geocoding/v3/?address=" +
// java.net.URLEncoder.encode(address, "UTF-8") +
// "&output=json&ak=YOUR_BAIDU_API_KEY";
//
// String result = restTemplate.getForObject(url, String.class);
// JSONObject jsonResult = JSONObject.parseObject(result);
//
// if ("0".equals(jsonResult.getString("status"))) {
// JSONObject location = jsonResult.getJSONObject("result").getJSONObject("location");
// Double lng = location.getDouble("lng");
// Double lat = location.getDouble("lat");
//
// Map<String, Double> coordinates = new HashMap<>();
// coordinates.put("longitude", lng);
// coordinates.put("latitude", lat);
// return coordinates;
// }
// 临时返回示例坐标（实际使用时请替换为真实的API调用）
Map<String, Double> coordinates = new HashMap<>();
coordinates.put("latitude", 39.915 + Math.random() * 0.1); // 示例纬度
coordinates.put("longitude", 116.404 + Math.random() * 0.1); // 示例经度
logger.info("地址解析成功: {} -> 经度={}, 纬度={}",
address, coordinates.get("longitude"), coordinates.get("latitude"));
return coordinates;
} catch (Exception e) {
logger.error("地址解析失败: {}", e.getMessage(), e);
return null;
}
}
/**
* 手动设置店铺经纬度
*/
@PostMapping("/setCoordinates")
public AjaxResult setCoordinates(@RequestBody Map<String, Object> params) {
try {
Long shopId = Long.valueOf(params.get("shopId").toString());
Double latitude = Double.valueOf(params.get("latitude").toString());
Double longitude = Double.valueOf(params.get("longitude").toString());
Shop shop = new Shop();
shop.setShopId(shopId);
shop.setLatitude(latitude);
shop.setLongitude(longitude);
int result = shopService.updateShop(shop);
if (result > 0) {
Map<String, Object> response = new HashMap<>();
response.put("shopId", shopId);
response.put("latitude", latitude);
response.put("longitude", longitude);
return AjaxResult.success("坐标设置成功", response);
} else {
return AjaxResult.error("坐标设置失败");
}
} catch (Exception e) {
logger.error("设置坐标失败: {}", e.getMessage(), e);
return AjaxResult.error("设置坐标失败: " + e.getMessage());
}
}
/**
* 批量查询店铺（包含经纬度信息）
*/
@PostMapping("/listWithLocation")
public AjaxResult listShopsWithLocation(@RequestBody(required = false) Map<String, Object> params) {
try {
List<Shop> shops = shopService.listShops();
// 可以根据参数进行筛选
if (params != null) {
// 按城市筛选
if (params.containsKey("cityId")) {
Long cityId = Long.valueOf(params.get("cityId").toString());
shops = shops.stream()
.filter(shop -> shop.getCityId() != null && shop.getCityId().equals(cityId))
.collect(java.util.stream.Collectors.toList());
}
// 按师傅筛选
if (params.containsKey("workerId")) {
Long workerId = Long.valueOf(params.get("workerId").toString());
shops = shops.stream()
.filter(shop -> shop.getWorkerId() != null && shop.getWorkerId().equals(workerId))
.collect(java.util.stream.Collectors.toList());
}
// 只返回有坐标的店铺
if (params.containsKey("hasLocation") && Boolean.valueOf(params.get("hasLocation").toString())) {
shops = shops.stream()
.filter(shop -> shop.getLatitude() != null && shop.getLongitude() != null)
.collect(java.util.stream.Collectors.toList());
}
}
return AjaxResult.success(shops);
} catch (Exception e) {
logger.error("查询店铺列表失败: {}", e.getMessage(), e);
return AjaxResult.error("查询失败: " + e.getMessage());
}
}
/**
* 查询附近的店铺
*/
@PostMapping("/nearby")
public AjaxResult getNearbyShops(@RequestBody Map<String, Object> params) {
try {
Double latitude = Double.valueOf(params.get("latitude").toString());
Double longitude = Double.valueOf(params.get("longitude").toString());
Double radiusKm = params.containsKey("radiusKm") ?
Double.valueOf(params.get("radiusKm").toString()) : 5.0; // 默认5公里
// 验证坐标有效性
if (!LocationUtils.isValidCoordinate(latitude, longitude)) {
return AjaxResult.error("无效的坐标参数");
}
// 获取所有店铺
List<Shop> allShops = shopService.listShops();
// 筛选出有坐标的店铺并计算距离
List<Map<String, Object>> nearbyShops = allShops.stream()
.filter(shop -> LocationUtils.isValidCoordinate(shop.getLatitude(), shop.getLongitude()))
.map(shop -> {
double distance = LocationUtils.getDistanceInKilometers(
latitude, longitude, shop.getLatitude(), shop.getLongitude());
Map<String, Object> shopWithDistance = new HashMap<>();
shopWithDistance.put("shop", shop);
shopWithDistance.put("distance", distance);
shopWithDistance.put("distanceText", LocationUtils.formatDistance(distance * 1000));
// 计算方向
double bearing = LocationUtils.getBearing(latitude, longitude,
shop.getLatitude(), shop.getLongitude());
shopWithDistance.put("direction", LocationUtils.getDirectionDescription(bearing));
shopWithDistance.put("bearing", bearing);
return shopWithDistance;
})
.filter(shopMap -> (Double) shopMap.get("distance") <= radiusKm)
.sorted(Comparator.comparingDouble(shopMap -> (Double) shopMap.get("distance")))
.collect(Collectors.toList());
Map<String, Object> result = new HashMap<>();
result.put("centerLatitude", latitude);
result.put("centerLongitude", longitude);
result.put("radiusKm", radiusKm);
result.put("totalCount", nearbyShops.size());
result.put("shops", nearbyShops);
return AjaxResult.success("查询成功", result);
} catch (Exception e) {
logger.error("查询附近店铺失败: {}", e.getMessage(), e);
return AjaxResult.error("查询失败: " + e.getMessage());
}
}
/**
* 计算两个店铺之间的距离
*/
@PostMapping("/distance")
public AjaxResult getShopsDistance(@RequestBody Map<String, Object> params) {
try {
Long shopId1 = Long.valueOf(params.get("shopId1").toString());
Long shopId2 = Long.valueOf(params.get("shopId2").toString());
Shop shop1 = shopService.getShop(shopId1);
Shop shop2 = shopService.getShop(shopId2);
if (shop1 == null || shop2 == null) {
return AjaxResult.error("店铺不存在");
}
if (!LocationUtils.isValidCoordinate(shop1.getLatitude(), shop1.getLongitude()) ||
!LocationUtils.isValidCoordinate(shop2.getLatitude(), shop2.getLongitude())) {
return AjaxResult.error("店铺坐标信息不完整");
}
double distanceKm = LocationUtils.getDistanceInKilometers(
shop1.getLatitude(), shop1.getLongitude(),
shop2.getLatitude(), shop2.getLongitude());
double bearing = LocationUtils.getBearing(
shop1.getLatitude(), shop1.getLongitude(),
shop2.getLatitude(), shop2.getLongitude());
Map<String, Object> result = new HashMap<>();
result.put("shop1", shop1);
result.put("shop2", shop2);
result.put("distanceKm", distanceKm);
result.put("distanceText", LocationUtils.formatDistance(distanceKm * 1000));
result.put("direction", LocationUtils.getDirectionDescription(bearing));
result.put("bearing", bearing);
return AjaxResult.success("计算成功", result);
} catch (Exception e) {
logger.error("计算店铺距离失败: {}", e.getMessage(), e);
return AjaxResult.error("计算失败: " + e.getMessage());
}
}
/**
* 通过店铺ID查询详细信息并计算距离
* 最终效果：
* 1. 传入的详细地址 → 转换为经纬度
* 2. 店铺有经纬度 → 直接使用
* 3. 店铺没有经纬度 → 通过详细地址生成经纬度
* 4. 最终通过经纬度计算距离 → 放在店铺的距离字段上
*
* @param query 距离查询请求实体
* @return 包含距离信息的完整店铺详情
*/
@PostMapping("/getShopDetailWithDistance")
public AjaxResult getShopDetailWithDistance(@RequestBody ShopDistanceQuery query) {
try {
// 验证参数
if (query.getShopId() == null) {
return AjaxResult.error("店铺ID不能为空");
}
// 验证是否有足够的信息来计算距离或获取位置
if (!query.hasEnoughInfo()) {
return AjaxResult.error("请提供经纬度或地址信息");
}
// 如果提供了经纬度，验证其有效性
if (query.hasCoordinateInfo() && !LocationUtils.isValidCoordinate(query.getLatitude(), query.getLongitude())) {
return AjaxResult.error("无效的坐标参数");
}
// 验证地址参数（如果提供了地址信息，则验证其完整性）
if (query.hasAddressInfo()) {
String fullAddress = query.getFullAddress();
if (fullAddress.trim().length() < 5) {
return AjaxResult.error("地址信息不完整，请提供更详细的地址");
}
logger.info("使用传入的地址信息: {}", fullAddress);
}
// 调用服务层方法获取店铺详情和距离
Shop shop = shopService.getShopWithDistance(query);
if (shop == null) {
return AjaxResult.error("未找到店铺");
}
// 检查距离是否有效
if (shop.getDistance() == null || shop.getDistance().equals("无法计算距离")) {
if (query.hasCoordinateInfo()) {
return AjaxResult.error("无法计算店铺距离，请检查店铺地址信息或提供更详细的地址参数");
} else {
// 如果没有经纬度，只获取位置信息
logger.info("仅获取店铺位置信息，无法计算距离");
}
}
// 构建返回结果
Map<String, Object> result = new HashMap<>();
result.put("shopId", shop.getShopId());
result.put("shopName", shop.getShopName());
result.put("imageUrl", shop.getImageUrl());
result.put("workerId", shop.getWorkerId());
result.put("provinceId", shop.getProvinceId());
result.put("provinceName", shop.getProvinceName());
result.put("cityId", shop.getCityId());
result.put("cityName", shop.getCityName());
result.put("countryId", shop.getCountryId());
result.put("countryName", shop.getCountryName());
result.put("streetId", shop.getStreetId());
result.put("streetName", shop.getStreetName());
result.put("address", shop.getAddress());
result.put("phone", shop.getPhone());
result.put("latitude", shop.getLatitude());
result.put("longitude", shop.getLongitude());
result.put("distance", shop.getDistance());
return AjaxResult.success("查询成功", result);
} catch (Exception e) {
logger.error("查询店铺详情失败: {}", e.getMessage(), e);
return AjaxResult.error("查询失败: " + e.getMessage());
}
}
// /**
// * 获取店铺覆盖范围内的其他店铺
// */
// @PostMapping("/coverage")
// public AjaxResult getShopsCoverage(@RequestBody Map<String, Object> params) {
// try {
// Long shopId = Long.valueOf(params.get("shopId").toString());
// Double radiusKm = params.containsKey("radiusKm") ?
// Double.valueOf(params.get("radiusKm").toString()) : 10.0; // 默认10公里
//
// Shop centerShop = shopService.getShop(shopId);
// if (centerShop == null) {
// return AjaxResult.error("店铺不存在");
// }
//
// if (!LocationUtils.isValidCoordinate(centerShop.getLatitude(), centerShop.getLongitude())) {
// return AjaxResult.error("中心店铺坐标信息不完整");
// }
//
// // 获取附近的店铺
// Map<String, Object> nearbyParams = new HashMap<>();
// nearbyParams.put("latitude", centerShop.getLatitude());
// nearbyParams.put("longitude", centerShop.getLongitude());
// radiusKm);
//
// AjaxResult nearbyResult = getNearbyShops(nearbyParams);
// if (nearbyResult.isSuccess()) {
// Map<String, Object> data = (Map<String, Object>) nearbyResult.get("data");
// List<Map<String, Object>> shops = (List<Map<String, Object>>) data.get("shops");
//
// // 排除自己
// shops = shops.stream()
// .filter(shopMap -> {
// Shop shop = (Shop) shopMap.get("shop");
// return !shop.getShopId().equals(shopId);
// })
// .collect(Collectors.toList());
//
// data.put("centerShop", centerShop);
// data.put("shops", shops);
// data.put("totalCount", shops.size());
//
// return AjaxResult.success("查询成功", data);
// } else {
// return nearbyResult;
// }
//
// } catch (Exception e) {
// logger.error("查询店铺覆盖范围失败: {}", e.getMessage(), e);
// return AjaxResult.error("查询失败: " + e.getMessage());
// }
// }
}

60
ghy-admin/src/main/java/com/ghy/web/controller/config/SysGlobalConfigController.java
View File

@ -1,60 +0,0 @@
package com.ghy.web.controller.config;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.system.service.ISysGlobalConfigService;
import com.ghy.web.pojo.vo.SysGlobalConfigRequestVO;
import com.ghy.web.pojo.vo.SysGlobalConfigResponseVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
/**
* @Author: 但星霖
* @Date: 2023-11-09 14:42
* @Version: 1.0
* @Description: web-系统配置控制层
*/
@Controller
@RequestMapping("/config/globalConfig")
@Tag(name = "web-系统配置控制层")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class SysGlobalConfigController {
private String prefix = "config/globalConfig";
@RequiresPermissions("sys:order:audio:config")
@GetMapping()
public String place() {
return prefix + "/edit";
}
private final ISysGlobalConfigService service;
@ResponseBody
@Operation(summary = "系统配置查询接口(根据类型查询)", method = "GET")
@Parameters({
@Parameter(name = "typeId", description = "配置类型Code", required = true, in = ParameterIn.PATH)
})
@GetMapping(path = "/search/type/{typeId}", produces = MediaType.APPLICATION_JSON_VALUE)
public AjaxResult searchByType(@PathVariable("typeId") Integer typeId) {
return AjaxResult.success(SysGlobalConfigResponseVO.toVo(service.loadByConfigType(typeId)));
}
@ResponseBody
@RequiresPermissions("sys:order:audio:config:update")
@Operation(summary = "系统配置修改", method = "PUT")
@PutMapping(path = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
public AjaxResult update(@RequestBody SysGlobalConfigRequestVO sysConfigRequestVO) {
return AjaxResult.success(service.update(SysGlobalConfigRequestVO.toModel(sysConfigRequestVO)));
}
}

34
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerAddressController.java
View File

@ -1,6 +1,5 @@
package com.ghy.web.controller.customer;
import cn.hutool.core.util.ObjectUtil;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.ExceptionUtil;
@ -13,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
@Controller
@RequestMapping("/customer/address")
@ -103,20 +100,6 @@ public class CustomerAddressController extends BaseController {
@ResponseBody
AjaxResult insertCustomerAddress(@RequestBody CustomerAddress customerAddress){
try {
// 判断下当前是否是默认地址
if(ObjectUtil.equals(customerAddress.getIsDefault(), 1)){
CustomerAddress param = new CustomerAddress();
param.setNeedNameFlag(false);
param.setCustomerId(customerAddress.getCustomerId());
param.setIsDefault(1);
List<CustomerAddress> sourceDefaultAddress = customerAddressService.getCustomerAddressList(param);
for (CustomerAddress defaultAddress : sourceDefaultAddress) {
CustomerAddress defaultParam = new CustomerAddress();
defaultParam.setCustomerAddressId(defaultAddress.getCustomerAddressId());
defaultParam.setIsDefault(0);
customerAddressService.updateCustomerAddress(defaultParam);
}
}
customerAddressService.insertCustomerAddress(customerAddress);
return AjaxResult.success("操作成功");
}catch (Exception e){
@ -131,24 +114,7 @@ public class CustomerAddressController extends BaseController {
@PostMapping("/update")
@ResponseBody
AjaxResult updateCustomerAddress(@RequestBody CustomerAddress customerAddress){
logger.info("地址库的订单修改方法{}",customerAddress);
try {
// 判断下当前是否是默认地址
if(ObjectUtil.equals(customerAddress.getIsDefault(), 1)){
CustomerAddress param = new CustomerAddress();
param.setNeedNameFlag(false);
param.setCustomerId(customerAddress.getCustomerId());
param.setIsDefault(1);
List<CustomerAddress> sourceDefaultAddress = customerAddressService.getCustomerAddressList(param);
for (CustomerAddress defaultAddress : sourceDefaultAddress) {
if(!Objects.equals(defaultAddress.getCustomerAddressId(), customerAddress.getCustomerAddressId())){
CustomerAddress defaultParam = new CustomerAddress();
defaultParam.setCustomerAddressId(defaultAddress.getCustomerAddressId());
defaultParam.setIsDefault(0);
customerAddressService.updateCustomerAddress(defaultParam);
}
}
}
customerAddressService.updateCustomerAddress(customerAddress);
return AjaxResult.success("操作成功");
}catch (Exception e){

41
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerController.java
View File

@ -4,16 +4,13 @@ import com.ghy.common.adapay.model.AnalyseItemEnum;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.core.page.TableDataInfo;
import com.ghy.common.enums.FinancialDetailType;
import com.ghy.common.enums.PlaceStatus;
import com.ghy.common.enums.UserStatus;
import com.ghy.common.utils.ExceptionUtil;
import com.ghy.customer.domain.Customer;
import com.ghy.customer.service.CustomerService;
import com.ghy.goods.domain.InsuranceManager;
import com.ghy.order.domain.OrderMaster;
import com.ghy.order.service.OrderMasterService;
import com.ghy.payment.domain.FinancialDetail;
import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.service.FinancialMasterService;
import com.ghy.web.pojo.vo.AnalyseItem;
@ -22,7 +19,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
@ -76,19 +72,17 @@ public class CustomerController extends BaseController {
startPage();
List<Customer> list = customerService.getCustomerList(customer);
for (Customer curCustomer: list) {
Long teamNum = 0L;
List<Long> customerIds = new ArrayList<Long>(){{
add(curCustomer.getCustomerId());
}};
List<Long> nextLevelCustomerIds = new ArrayList<>();
if (customer.getIsDistributor()) {
// 分销商需要查询所有下一级分销用户作为统计条件
Customer customerQry = new Customer();
customerQry.setCustomerPlace(curCustomer.getCustomerId());
customerQry.setStatus(Integer.valueOf(UserStatus.OK.getCode()));
List<Customer> nextLevelCustomers = customerService.getCustomerList(customerQry);
teamNum = teamNum + nextLevelCustomers.stream().filter(x->PlaceStatus.CAN_PLACE.getCode().equals(x.getPlaceStatus())).count();
nextLevelCustomerIds = nextLevelCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList());
List<Long> nextLevelCustomerIds = nextLevelCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList());
customerIds.addAll(nextLevelCustomerIds);
}
// 本月第一天
@ -109,7 +103,6 @@ public class CustomerController extends BaseController {
.setValue(customerService.countCustomer(customerParams));
analyseItems.add(aItem1);
// 本月绑定客户数
customerParams.setPlaceStatus(null);
customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay());
AnalyseItem aItem2 = new AnalyseItem()
.setType(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getType())
@ -118,27 +111,22 @@ public class CustomerController extends BaseController {
.setValue(customerService.countCustomer(customerParams));
analyseItems.add(aItem2);
// 团队
customerParams.setUpdateTimeStart(null);
customerParams.setPlaceStatus(PlaceStatus.CAN_PLACE.getCode());
AnalyseItem aItem11 = new AnalyseItem()
.setType(AnalyseItemEnum.TEAM_MEMBER_NUM.getType())
.setTitle(AnalyseItemEnum.TEAM_MEMBER_NUM.getTitle())
.setUnit(AnalyseItemEnum.TEAM_MEMBER_NUM.getUnit())
.setValue(customerService.countCustomer(customerParams));
.setValue(aItem1.getValue());
analyseItems.add(aItem11);
// 本月绑定客户数
customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay());
customerParams.setPlaceStatus(PlaceStatus.CAN_PLACE.getCode());
AnalyseItem aItem12 = new AnalyseItem()
.setType(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getType())
.setTitle(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getTitle())
.setUnit(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getUnit())
.setValue(customerService.countCustomer(customerParams));
.setValue(aItem2.getValue());
analyseItems.add(aItem12);
// 本月订单数及本月订单额
OrderMaster orderParams1 = new OrderMaster();
customerIds.addAll(nextLevelCustomerIds);
orderParams1.setCustomerIds(customerIds);
orderParams1.setCreateTimeStart(firstDayCurMonth.atStartOfDay());
List<OrderMaster> ordersCurMonth1 = orderMasterService.selectOrderMasterList(orderParams1);
@ -220,7 +208,7 @@ public class CustomerController extends BaseController {
OrderMaster orderParams4 = new OrderMaster();
orderParams4.setCustomerIds(customerIds);
orderParams4.setCreateTimeStart(firstDayCurWeek.atStartOfDay());
List<OrderMaster> ordersCurWeek = orderMasterService.selectOrderMasterList(orderParams4);
List<OrderMaster> ordersCurWeek = orderMasterService.selectOrderMasterList(orderParams3);
List<Long> orderIdsCurWeek = ordersCurWeek.stream().map(OrderMaster::getId).collect(Collectors.toList());
BigDecimal totalMoneyCurWeek = new BigDecimal(0);
if (CollectionUtils.isNotEmpty(orderIdsCurWeek)) {
@ -254,25 +242,6 @@ public class CustomerController extends BaseController {
return getDataTable(response);
}
@GetMapping("/changePlace/{customerId}")
public String changePlace(@PathVariable("customerId") Long customerId, ModelMap mmap)
{
mmap.put("customerId", customerId);
mmap.put("customerPlaces", customerService.getPlaceCustomerList());
return prefix + "/changePlace";
}
@PostMapping("/changePlace")
@ResponseBody
@Transactional(rollbackFor = Exception.class)
public AjaxResult changePlace(Customer customer) {
Customer place = customerService.selectByCustomerId(customer.getCustomerPlace());
customer.setParentCustomerPlace(place.getCustomerPlace());
customerService.updateCustomer(customer);
return AjaxResult.success();
}
@RequiresPermissions("customer:customer:resetPwd")
@GetMapping("/resetPwd/{customerId}")
public String resetPwd(@PathVariable("customerId") Long customerId, ModelMap mmap)

42
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerSelectionController.java
View File

@ -1,8 +1,6 @@
package com.ghy.web.controller.customer;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.ghy.common.exception.base.BaseException;
import com.ghy.customer.domain.Customer;
@ -64,22 +62,6 @@ public class CustomerSelectionController extends BaseController
return getDataTable(list);
}
/**
* 查询消费者选品列表
*/
@PostMapping("/listNoPage")
@ResponseBody
public AjaxResult listNoPage(@RequestBody CustomerSelection customerSelection)
{
// 判断是否有上级，有上级则取上级的 -- 没有则就是自身
Customer customer = customerService.selectByCustomerId(customerSelection.getCustomerId());
if(customer.getPlaceStatus() != 2 && customer.getCustomerPlace() != null){
customerSelection.setCustomerId(customer.getCustomerPlace());
}
List<CustomerSelection> list = customerSelectionService.selectCustomerSelectionList(customerSelection);
return AjaxResult.success(list.stream().map(CustomerSelection::getDeptCategoryId).collect(Collectors.toList()));
}
/**
* App查询消费者选品列表
*/
@ -147,28 +129,18 @@ public class CustomerSelectionController extends BaseController
}else {
workId = workList.get(0).getWorkerId();
}
// 删除历史的
CustomerSelection hisParam = new CustomerSelection();
hisParam.setCustomerId(customerSelection.getCustomerId());
hisParam.setSelectionType(customerSelection.getSelectionType());
List<CustomerSelection> hisList = customerSelectionService.selectCustomerSelectionList(hisParam);
if(!CollectionUtils.isEmpty(hisList)){
List<String> hisIds = hisList.stream()
.filter(customerSelection1 -> Objects.equals(customerSelection1.getType(), customerSelection.getType())).map(CustomerSelection::getId).collect(Collectors.toList());
StringBuilder ids = new StringBuilder();
hisIds.forEach(model->{
ids.append(model.trim()).append(",");
});
if(!StringUtil.isEmpty(ids)&&ids.length()>0){
String idString = ids.substring(0, ids.length()-1);
customerSelectionService.deleteCustomerSelectionByIds(idString);
}
}
// 判断是否有历史数据 - 有则删除
customerSelection.getDeptCategoryIds().forEach(selection->{
customerSelection.setWorkId(workId);
customerSelection.setDeptCategoryId(selection);
CustomerSelection param = new CustomerSelection();
param.setDeptCategoryId(selection);
param.setSelectionType(customerSelection.getSelectionType());
param.setCustomerId(customerSelection.getCustomerId());
List<CustomerSelection> customerSelections = customerSelectionService.selectCustomerSelectionList(param);
if(CollectionUtils.isEmpty(customerSelections)){
customerSelectionService.insertCustomerSelection(customerSelection);
}
});
return AjaxResult.success("新增成功");
}catch (Exception e){

62
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsCategoryController.java
View File

@ -1,6 +1,5 @@
package com.ghy.web.controller.goods;
import cn.hutool.core.collection.CollectionUtil;
import com.ghy.common.annotation.Log;
import com.ghy.common.constant.UserConstants;
import com.ghy.common.core.controller.BaseController;
@ -8,24 +7,16 @@ import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.core.domain.Ztree;
import com.ghy.common.enums.BusinessType;
import com.ghy.common.utils.ShiroUtils;
import com.ghy.common.utils.StringUtils;
import com.ghy.goods.domain.CategoryInsuranceRelation;
import com.ghy.goods.domain.GoodsCategory;
import com.ghy.goods.domain.InsuranceManager;
import com.ghy.goods.service.GoodsCategoryService;
import com.ghy.goods.service.ICategoryInsuranceRelationService;
import com.ghy.goods.service.IInsuranceManagerService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author HH 2022/3/19
@ -39,12 +30,6 @@ public class GoodsCategoryController extends BaseController {
@Resource
private GoodsCategoryService goodsCategoryService;
@Resource
private IInsuranceManagerService insuranceManagerService;
@Resource
private ICategoryInsuranceRelationService categoryInsuranceRelationService;
@RequiresPermissions("goods:category:view")
@GetMapping()
public String goodsCategory() {
@ -58,7 +43,6 @@ public class GoodsCategoryController extends BaseController {
@GetMapping("/add/{parentCategoryId}")
public String add(@PathVariable("parentCategoryId") Long parentCategoryId, ModelMap mmap) {
mmap.put("goodsCategory", goodsCategoryService.selectById(parentCategoryId));
mmap.put("insurances", insuranceManagerService.selectInsuranceManagerList(new InsuranceManager()));
return PREFIX + "/add";
}
@ -66,8 +50,7 @@ public class GoodsCategoryController extends BaseController {
* 新增商品类别页面
*/
@GetMapping("/add")
public String add(ModelMap mmap) {
mmap.put("insurances", insuranceManagerService.selectInsuranceManagerList(new InsuranceManager()));
public String add() {
return PREFIX + "/add";
}
@ -77,21 +60,7 @@ public class GoodsCategoryController extends BaseController {
@RequiresPermissions("goods:category:edit")
@GetMapping("/edit/{goodsId}")
public String edit(@PathVariable("goodsId") Long goodsId, ModelMap mmap) {
GoodsCategory goodsCategory = goodsCategoryService.selectById(goodsId);
mmap.put("goodsCategory", goodsCategory);
List<InsuranceManager> list = insuranceManagerService.selectInsuranceManagerList(new InsuranceManager());
CategoryInsuranceRelation param = new CategoryInsuranceRelation();
param.setGoodsCategoryId(goodsCategory.getGoodsCategoryId());
List<CategoryInsuranceRelation> relations = categoryInsuranceRelationService.selectCategoryInsuranceRelationList(param);
if(CollectionUtil.isNotEmpty(relations)){
Map<Long, List<CategoryInsuranceRelation>> map = relations.stream().collect(Collectors.groupingBy(CategoryInsuranceRelation::getInsuranceId));
list.forEach(model->{
if(map.containsKey(model.getId())){
model.setFlag(true);
}
});
}
mmap.put("insurances", list);
mmap.put("goodsCategory", goodsCategoryService.selectById(goodsId));
return PREFIX + "/edit";
}
@ -134,10 +103,12 @@ public class GoodsCategoryController extends BaseController {
@Log(title = "商品类别管理", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
@Transactional
public AjaxResult editSave(@Validated GoodsCategory category) {
// 更新保险设置
categoryInsuranceRelationService.updateCategoryInsuranceRelation(category.getInsuranceIds(), category.getGoodsCategoryId());
// if (goodsCategoryService.checkGoodsCategoryNameUnique(category)) {
// return error("新增商品类别'" + category.getGoodsCategoryName() + "'失败，商品类别名称已存在");
// } else if (goodsCategoryService.checkGoodsCategoryCodeUnique(category)) {
// return error("新增商品类别'" + category.getGoodsCategoryCode() + "'失败，商品类别编码已存在");
// }
category.setUpdateBy(getLoginName());
return toAjax(goodsCategoryService.updateGoodsCategory(category));
}
@ -181,25 +152,6 @@ public class GoodsCategoryController extends BaseController {
return goodsCategoryService.selectCategoryTree(new GoodsCategory());
}
/**
* 选择服务类目树
*/
@GetMapping("/selectServiceCategoryTree")
public String selectServiceCategoryTree(ModelMap mmap) {
return PREFIX + "/serviceTree";
}
/**
* 获取服务类目树数据
*/
@GetMapping("/serviceTreeData")
@ResponseBody
public List<Ztree> serviceTreeData() {
GoodsCategory category = new GoodsCategory();
category.setType(1); // 1表示服务类
return goodsCategoryService.selectCategoryTree(category);
}
/**
* 商品类别表
*/

565
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
View File

@ -10,13 +10,8 @@ import com.ghy.common.utils.ShiroUtils;
import com.ghy.common.utils.StringUtils;
import com.ghy.common.utils.bean.BeanUtils;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.utils.LocationUtils;
import com.ghy.common.utils.http.HttpUtils;
import com.alibaba.fastjson.JSONObject;
import com.ghy.goods.domain.*;
import com.ghy.goods.service.*;
import com.ghy.shop.domain.Shop;
import com.ghy.shop.service.ShopService;
import com.ghy.system.domain.SysArea;
import com.ghy.system.service.ISysAreaService;
import io.swagger.annotations.ApiModel;
@ -31,7 +26,6 @@ import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import com.ghy.common.utils.BaiduMapUtils;
@Controller
@RequestMapping("/goods/goods")
@ -53,14 +47,6 @@ public class GoodsController extends BaseController {
private GoodsStandardService goodsStandardService;
@Resource
private ISysAreaService sysAreaService;
@Resource
private IInsuranceManagerService insuranceManagerService;
@Resource
private IDeptCategoryInsuranceRelationService deptCategoryInsuranceRelationService;
@Resource
private ShopService shopService;
@Resource
private BaiduMapUtils baiduMapUtils;
@RequiresPermissions("goods:goods:view")
@GetMapping()
@ -174,15 +160,6 @@ public class GoodsController extends BaseController {
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody Goods goods) {
Integer type=goods.getType();
if (type==null){
goods.setType(1);
}
// 获取用户当前位置
Double userLatitude = goods.getLatitude();
Double userLongitude = goods.getLongitude();
// 判断类目id是否为第三级，不是的话需要找到所有符合条件的第三级类目id作为新的条件
if (goods.getDeptGoodsCategoryId() != null) {
logger.info("入参：" + goods.getDeptGoodsCategoryId());
@ -221,40 +198,9 @@ public class GoodsController extends BaseController {
}
}
// 通过商品规格名称模糊查询
if (StringUtils.isNotEmpty(goods.getGoodsStandard())) {
logger.info("通过商品规格查询：{}", goods.getGoodsStandard());
List<GoodsStandard> matchedStandards = goodsStandardService.selectByStandardNameLike(goods.getGoodsStandard());
if (CollectionUtils.isNotEmpty(matchedStandards)) {
// 获取所有符合规格条件的商品ID
List<Long> goodsIds = matchedStandards.stream()
.map(GoodsStandard::getGoodsId)
.distinct()
.collect(Collectors.toList());
logger.info("通过规格查询到的商品ID列表：{}", goodsIds);
// 设置商品ID筛选条件，与现有的类目筛选条件组合使用
if (goods.getGoodsIds() == null) {
goods.setGoodsIds(goodsIds);
} else {
// 如果已有商品ID筛选条件，取交集
goods.getGoodsIds().retainAll(goodsIds);
}
} else {
logger.info("未找到符合规格条件的商品，设置空结果");
// 如果没找到符合条件的规格，设置一个不存在的商品ID
goods.setGoodsIds(Arrays.asList(-1L));
}
}
startPage();
List<Goods> list = goodsService.selectGoodsList(goods);
logger.info("传入的类目id汇总{},传入的goods信息为{},获取到的所有商品{}",goods.getDeptGoodsCategoryIds(),goods,list);
// 用于缓存店铺信息，避免重复查询
Map<Long, Shop> shopCache = new HashMap<>();
list.forEach(one -> {
// 补全商品服务区域
List<GoodsArea> goodsAreas = goodsAreaService.selectByGoodsId(one.getGoodsId());
@ -272,89 +218,10 @@ public class GoodsController extends BaseController {
one.setParGoodsCategoryId(parGoodsCategory.getGoodsCategoryId());
one.setParGoodsCategoryName(parGoodsCategory.getGoodsCategoryName());
}
logger.debug("验证坐标是否合理: {}", LocationUtils.isValidCoordinate(userLatitude, userLongitude));
// 计算距离逻辑
if (LocationUtils.isValidCoordinate(userLatitude, userLongitude) && one.getShopId() != null) {
try {
// 从缓存获取店铺信息，避免重复查询
Shop shop = shopCache.computeIfAbsent(one.getShopId(),
shopId -> shopService.getShop(shopId));
if (shop != null && LocationUtils.isValidCoordinate(shop.getLatitude(), shop.getLongitude())) {
// 计算距离（米）
double distanceInMeters = LocationUtils.getDistanceInMeters(
userLatitude, userLongitude,
shop.getLatitude(), shop.getLongitude()
);
// 格式化距离并设置到商品对象
one.setDistance(LocationUtils.formatDistance(distanceInMeters));
logger.debug("商品[{}]距离用户: {}", one.getGoodsName(), one.getDistance());
} else {
// 店铺坐标不完整
one.setDistance(null);
}
} catch (Exception e) {
logger.warn("计算商品[{}]距离失败: {}", one.getGoodsName(), e.getMessage());
// 计算异常时设为null
one.setDistance(null);
}
} else {
// 用户未提供位置或商品无店铺信息
one.setDistance(null);
}
});
// 如果用户提供了位置信息，按距离排序（距离为null的排在最后）
if (LocationUtils.isValidCoordinate(userLatitude, userLongitude)) {
list.sort((goods1, goods2) -> {
String distance1 = goods1.getDistance();
String distance2 = goods2.getDistance();
// 距离为null的排在最后
if (distance1 == null && distance2 == null) return 0;
if (distance1 == null) return 1;
if (distance2 == null) return -1;
// 解析距离数值进行比较
try {
double dist1 = parseDistanceToMeters(distance1);
double dist2 = parseDistanceToMeters(distance2);
return Double.compare(dist1, dist2);
} catch (Exception e) {
// 解析失败时保持原顺序
return 0;
}
});
logger.info("已按距离排序，用户位置: 纬度={}, 经度={}", userLatitude, userLongitude);
}
return getDataTable(list);
}
/**
* 解析距离字符串为米数（用于排序）
*/
private double parseDistanceToMeters(String distanceText) {
if (distanceText == null || distanceText.trim().isEmpty()) {
return Double.MAX_VALUE;
}
try {
if (distanceText.endsWith("米")) {
return Double.parseDouble(distanceText.replace("米", ""));
} else if (distanceText.endsWith("公里")) {
return Double.parseDouble(distanceText.replace("公里", "")) * 1000;
}
} catch (NumberFormatException e) {
logger.warn("无法解析距离字符串: {}", distanceText);
}
return Double.MAX_VALUE;
}
@PostMapping("/hot/list")
@ResponseBody
public TableDataInfo hotList(@RequestBody Goods goods) {
@ -404,225 +271,11 @@ public class GoodsController extends BaseController {
}
}
/**
* 获取商品详情
*
* @param requestBody 请求参数
* @return 商品详情信息
*/
@PostMapping("/getDetail")
@ResponseBody
public AjaxResult getDetail(@RequestBody JSONObject requestBody) {
public AjaxResult getDetail(@RequestBody Goods goods) {
try {
// 从请求体中提取参数
Long goodsId = requestBody.getLong("goodsId");
Double userLatitude = requestBody.getDouble("latitude");
Double userLongitude = requestBody.getDouble("longitude");
String provinceName = requestBody.getString("provinceName");
String cityName = requestBody.getString("cityName");
String countryName = requestBody.getString("countryName");
String streetName = requestBody.getString("streetName");
String address = requestBody.getString("address");
if (goodsId == null) {
return AjaxResult.error("商品ID不能为空");
}
Goods result = goodsService.selectById(goodsId);
if (result == null) {
return AjaxResult.error("商品不存在");
}
// 如果用户没有提供经纬度，但有详细地址，则通过地址获取经纬度
if ((userLatitude == null || userLongitude == null) &&
(provinceName != null || cityName != null ||
countryName != null || streetName != null ||
address != null)) {
try {
// 使用BaiduMapUtils工具类获取经纬度
Map<String, Double> coordinates = baiduMapUtils.getCoordinatesByAddress(
provinceName, cityName, countryName, streetName, address
);
if (coordinates != null) {
userLongitude = coordinates.get("longitude");
userLatitude = coordinates.get("latitude");
logger.info("通过地址获取到用户经纬度: 经度={}, 纬度={}", userLongitude, userLatitude);
} else {
logger.warn("通过地址获取用户经纬度失败");
}
} catch (Exception e) {
logger.error("调用百度地图API异常: {}", e.getMessage(), e);
}
}
// 获取商品店铺信息
Shop goodsShop = null;
if (result.getShopId() != null) {
try {
goodsShop = shopService.getShop(result.getShopId());
} catch (Exception e) {
logger.warn("获取商品店铺信息失败: {}", e.getMessage());
}
}
// 获取服务店铺信息
Shop serviceShop = null;
if (result.getDeptGoodsCategoryId() != null) {
try {
// 1. 通过商品的类目ID获取类目信息
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(result.getDeptGoodsCategoryId());
Long serviceCategoryId = null;
if (deptGoodsCategory != null) {
// 先检查当前类目是否有服务类目ID
if (deptGoodsCategory.getServiceCategoryId() != null) {
serviceCategoryId = deptGoodsCategory.getServiceCategoryId();
logger.debug("当前类目[{}]的服务类目ID: {}", deptGoodsCategory.getGoodsCategoryName(), serviceCategoryId);
} else {
// 如果当前类目没有服务类目ID，查找上一级类目
logger.debug("当前类目[{}]未配置服务类目ID，查找上一级类目", deptGoodsCategory.getGoodsCategoryName());
if (deptGoodsCategory.getParentCategoryId() != null) {
DeptGoodsCategory parentCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(deptGoodsCategory.getParentCategoryId());
if (parentCategory != null && parentCategory.getServiceCategoryId() != null) {
serviceCategoryId = parentCategory.getServiceCategoryId();
logger.debug("上一级类目[{}]的服务类目ID: {}", parentCategory.getGoodsCategoryName(), serviceCategoryId);
} else {
logger.debug("上一级类目[{}]也未配置服务类目ID", parentCategory != null ? parentCategory.getGoodsCategoryName() : "null");
}
} else {
logger.debug("当前类目没有父级类目");
}
}
}
if (serviceCategoryId != null) {
// 2. 通过服务类目ID查询所有使用该服务类目的商品
Goods queryGoods = new Goods();
queryGoods.setDeptGoodsCategoryId(serviceCategoryId);
queryGoods.setStatus(0); // 只查询上架的商品
List<Goods> goodsList = goodsService.selectGoodsList(queryGoods);
if (goodsList.size()==0){
DeptGoodsCategory deptGoodsCategory1=deptGoodsCategoryService.selectOneByGoodsCategoryId(serviceCategoryId);
serviceCategoryId=deptGoodsCategory1.getDeptGoodsCategoryId();
// 直接使用新方法获取商品列表
goodsList = goodsStandardService.selectGoodsByDeptGoodsCategoryId(serviceCategoryId);
// 过滤只保留上架的商品
goodsList = goodsList.stream()
.filter(goods -> goods.getStatus() != null && goods.getStatus() == 0)
.collect(Collectors.toList());
}
logger.info("获取到的服务类目id{} 取到的商品列表：{}", serviceCategoryId,goodsList);
// 3. 提取所有店铺ID（去重）
Set<Long> shopIds = goodsList.stream()
.filter(g -> g.getShopId() != null)
.map(Goods::getShopId)
.collect(Collectors.toSet());
logger.info("取到的店铺列表：{}", shopIds);
if (!shopIds.isEmpty()) {
// 找到最近的店铺
Shop nearestShop = null;
double minDistance = Double.MAX_VALUE;
for (Long shopId : shopIds) {
Shop shop = shopService.getShop(shopId);
if (shop != null && LocationUtils.isValidCoordinate(shop.getLatitude(), shop.getLongitude())) {
if (LocationUtils.isValidCoordinate(userLatitude, userLongitude)) {
try {
double distanceInMeters = LocationUtils.getDistanceInMeters(
userLatitude, userLongitude,
shop.getLatitude(), shop.getLongitude()
);
if (distanceInMeters < minDistance) {
minDistance = distanceInMeters;
nearestShop = shop;
}
} catch (Exception e) {
logger.warn("计算店铺[{}]距离失败: {}", shop.getShopName(), e.getMessage());
}
} else {
// 如果用户没有提供位置，选择第一个有效店铺
if (nearestShop == null) {
nearestShop = shop;
}
}
}
}
serviceShop = nearestShop;
} else {
logger.debug("服务类目[{}]下没有找到商品", serviceCategoryId);
}
} else {
logger.debug("未找到有效的服务类目ID");
}
} catch (Exception e) {
logger.warn("获取服务店铺信息失败: {}", e.getMessage());
}
}
// 设置商品店铺和服务店铺信息
if(result.getType()==1){
serviceShop=goodsShop;
result.setServiceShop(serviceShop);
}else {
result.setShop(goodsShop);
}
// 计算距离逻辑
if (LocationUtils.isValidCoordinate(userLatitude, userLongitude)) {
// 计算服务店铺距离
if (serviceShop != null) {
try {
if (LocationUtils.isValidCoordinate(serviceShop.getLatitude(), serviceShop.getLongitude())) {
// 计算距离（米）
double distanceInMeters = LocationUtils.getDistanceInMeters(
userLatitude, userLongitude,
serviceShop.getLatitude(), serviceShop.getLongitude()
);
// 格式化距离并设置到服务店铺对象
serviceShop.setDistance(LocationUtils.formatDistance(distanceInMeters));
logger.debug("商品[{}]服务店铺距离用户: {}", result.getGoodsName(), serviceShop.getDistance());
} else {
// 店铺坐标不完整
serviceShop.setDistance(null);
}
} catch (Exception e) {
logger.warn("计算商品[{}]服务店铺距离失败: {}", result.getGoodsName(), e.getMessage());
// 计算异常时设为null
serviceShop.setDistance(null);
}
}
// 计算商品店铺距离
if (goodsShop != null) {
try {
if (LocationUtils.isValidCoordinate(goodsShop.getLatitude(), goodsShop.getLongitude())) {
// 计算距离（米）
double distanceInMeters = LocationUtils.getDistanceInMeters(
userLatitude, userLongitude,
goodsShop.getLatitude(), goodsShop.getLongitude()
);
// 格式化距离并设置到商品店铺对象
goodsShop.setDistance(LocationUtils.formatDistance(distanceInMeters));
logger.debug("商品[{}]商品店铺距离用户: {}", result.getGoodsName(), goodsShop.getDistance());
} else {
// 店铺坐标不完整
goodsShop.setDistance(null);
}
} catch (Exception e) {
logger.warn("计算商品[{}]商品店铺距离失败: {}", result.getGoodsName(), e.getMessage());
// 计算异常时设为null
goodsShop.setDistance(null);
}
}
}
result.setServiceShop(serviceShop);
Goods result = goodsService.selectById(goods.getGoodsId());
// 补全商品类目及父级类目信息
GoodsCategory goodsCategory = goodsCategoryService.selectById(result.getDeptGoodsCategoryId());
@ -669,24 +322,7 @@ public class GoodsController extends BaseController {
goodsStandard.setFinalPrice(finalPrice);
});
result.setGoodsStandardList(goodsStandards);
// 所有保险信息
List<InsuranceManager> insuranceManagers = insuranceManagerService.selectInsuranceManagerList(new InsuranceManager());
// 查询本类目保险信息
DeptCategoryInsuranceRelation param = new DeptCategoryInsuranceRelation();
param.setType("01");
param.setDeptCategoryId(goodsStandards.get(0).getDeptGoodsCategoryId());
List<DeptCategoryInsuranceRelation> deptCategoryInsuranceRelations = deptCategoryInsuranceRelationService.selectDeptCategoryInsuranceRelationList(param);
if(CollectionUtils.isNotEmpty(deptCategoryInsuranceRelations)){
Map<Long, List<DeptCategoryInsuranceRelation>> insuranceMap = deptCategoryInsuranceRelations.stream().collect(Collectors.groupingBy(DeptCategoryInsuranceRelation::getInsuranceId));
// 目标保险
List<InsuranceManager> goal = new ArrayList<>();
insuranceManagers.forEach(model->{
if(insuranceMap.containsKey(model.getId())){
goal.add(model);
}
});
result.setInsuranceManagers(goal);
}
return AjaxResult.success(result);
} catch (Exception e) {
e.printStackTrace();
@ -695,186 +331,6 @@ public class GoodsController extends BaseController {
}
}
/**
* 根据商品ID和用户位置获取服务店铺列表
* @return 服务店铺列表，按距离排序
*/
@PostMapping("/getShopsByGoodsId")
@ResponseBody
public AjaxResult getShopsByGoodsId(@RequestBody JSONObject requestBody) {
try {
Long goodsId = requestBody.getLong("goodsId");
Double latitude = requestBody.getDouble("latitude");
Double longitude = requestBody.getDouble("longitude");
String provinceName = requestBody.getString("provinceName");
String cityName = requestBody.getString("cityName");
String countryName = requestBody.getString("countryName");
String streetName = requestBody.getString("streetName");
String address = requestBody.getString("address");
if (goodsId == null) {
return AjaxResult.error("商品ID不能为空");
}
// 如果用户没有提供经纬度，但有详细地址，则通过地址获取经纬度
if ((latitude == null || longitude == null) &&
(provinceName != null || cityName != null || countryName != null ||
streetName != null || address != null)) {
try {
// 使用BaiduMapUtils工具类获取经纬度
Map<String, Double> coordinates = baiduMapUtils.getCoordinatesByAddress(
provinceName, cityName, countryName, streetName, address
);
if (coordinates != null) {
longitude = coordinates.get("longitude");
latitude = coordinates.get("latitude");
logger.info("通过地址获取到用户经纬度: 经度={}, 纬度={}", longitude, latitude);
} else {
logger.warn("通过地址获取用户经纬度失败");
}
} catch (Exception e) {
logger.error("调用百度地图API异常: {}", e.getMessage(), e);
}
}
// 获取商品信息
Goods goods = goodsService.selectById(goodsId);
if (goods == null) {
return AjaxResult.error("商品不存在");
}
List<Shop> serviceShops = new ArrayList<>();
// 通过商品的服务类目获取服务店铺
if (goods.getDeptGoodsCategoryId() != null) {
try {
// 1. 通过商品的类目ID获取类目信息
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId());
Long serviceCategoryId = null;
if (deptGoodsCategory != null) {
// 先检查当前类目是否有服务类目ID
if (deptGoodsCategory.getServiceCategoryId() != null) {
serviceCategoryId = deptGoodsCategory.getServiceCategoryId();
logger.debug("当前类目[{}]的服务类目ID: {}", deptGoodsCategory.getGoodsCategoryName(), serviceCategoryId);
} else {
// 如果当前类目没有服务类目ID，查找上一级类目
logger.debug("当前类目[{}]未配置服务类目ID，查找上一级类目", deptGoodsCategory.getGoodsCategoryName());
if (deptGoodsCategory.getParentCategoryId() != null) {
DeptGoodsCategory parentCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(deptGoodsCategory.getParentCategoryId());
if (parentCategory != null && parentCategory.getServiceCategoryId() != null) {
serviceCategoryId = parentCategory.getServiceCategoryId();
logger.debug("上一级类目[{}]的服务类目ID: {}", parentCategory.getGoodsCategoryName(), serviceCategoryId);
} else {
logger.debug("上一级类目[{}]也未配置服务类目ID", parentCategory != null ? parentCategory.getGoodsCategoryName() : "null");
}
} else {
logger.debug("当前类目没有父级类目");
}
}
}
List<Goods> goodsList = new ArrayList<>();
if (serviceCategoryId != null) {
// 2. 通过服务类目ID查询所有使用该服务类目的商品
Goods queryGoods = new Goods();
queryGoods.setDeptGoodsCategoryId(serviceCategoryId);
queryGoods.setStatus(0); // 只查询上架的商品
goodsList = goodsService.selectGoodsList(queryGoods);
if (goodsList.size() == 0) {
DeptGoodsCategory deptGoodsCategory1 = deptGoodsCategoryService.selectOneByGoodsCategoryId(serviceCategoryId);
serviceCategoryId = deptGoodsCategory1.getDeptGoodsCategoryId();
// 直接使用新方法获取商品列表
goodsList = goodsStandardService.selectGoodsByDeptGoodsCategoryId(serviceCategoryId);
// 过滤只保留上架的商品
goodsList = goodsList.stream()
.filter(g -> g.getStatus() != null && g.getStatus() == 0)
.collect(Collectors.toList());
}
logger.info("获取到的服务类目id{} 取到的商品列表：{}", serviceCategoryId, goodsList);
}
if (!goodsList.isEmpty()) {
logger.debug("通过商品ID[{}]找到{}个相关服务商品", goodsId, goodsList.size());
// 提取所有店铺ID（去重）
Set<Long> shopIds = goodsList.stream()
.filter(g -> g.getShopId() != null)
.map(Goods::getShopId)
.collect(Collectors.toSet());
if (!shopIds.isEmpty()) {
// 获取所有店铺信息并计算距离
for (Long shopId : shopIds) {
Shop shop = shopService.getShop(shopId);
if (shop != null) {
// 计算距离
if (LocationUtils.isValidCoordinate(latitude, longitude) &&
LocationUtils.isValidCoordinate(shop.getLatitude(), shop.getLongitude())) {
try {
double distanceInMeters = LocationUtils.getDistanceInMeters(
latitude, longitude,
shop.getLatitude(), shop.getLongitude()
);
shop.setDistance(LocationUtils.formatDistance(distanceInMeters));
} catch (Exception e) {
logger.warn("计算店铺[{}]距离失败: {}", shop.getShopName(), e.getMessage());
shop.setDistance(null);
}
} else {
shop.setDistance(null);
}
serviceShops.add(shop);
}
}
// 按距离排序（有距离的排在前面，然后按距离升序）
serviceShops.sort((s1, s2) -> {
if (s1.getDistance() == null && s2.getDistance() == null) {
return 0;
}
if (s1.getDistance() == null) {
return 1;
}
if (s2.getDistance() == null) {
return -1;
}
// 提取距离数值进行比较
try {
double d1 = Double.parseDouble(s1.getDistance().replaceAll("[^0-9.]", ""));
double d2 = Double.parseDouble(s2.getDistance().replaceAll("[^0-9.]", ""));
return Double.compare(d1, d2);
} catch (Exception e) {
return 0;
}
});
}
} else {
logger.debug("未找到商品ID[{}]的相关服务商品", goodsId);
}
} catch (Exception e) {
logger.warn("获取服务店铺信息失败: {}", e.getMessage());
}
}
JSONObject result = new JSONObject();
result.put("goodsId", goodsId);
result.put("goodsName", goods.getGoodsName());
result.put("userLatitude", latitude);
result.put("userLongitude", longitude);
result.put("serviceShops", serviceShops);
result.put("totalCount", serviceShops.size());
return AjaxResult.success(result);
} catch (Exception e) {
logger.error("获取服务店铺列表失败: {}", e.getMessage(), e);
return AjaxResult.error("获取服务店铺列表失败: " + ExceptionUtil.getExceptionMessage(e));
}
}
@Log(title = "商品管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("goods:goods:export")
@PostMapping("/export")
@ -945,13 +401,6 @@ public class GoodsController extends BaseController {
@ResponseBody
public AjaxResult editSave(@Validated Goods goods) {
goods.setUpdateBy(getLoginName());
// 处理Long类型字段的空值情况
// 当前端传入0或空字符串时，将shopId设置为null以便清空
if (goods.getShopId() != null && goods.getShopId().equals(0L)) {
goods.setShopId(null);
}
return toAjax(goodsService.updateGoods(goods));
}
@ -959,12 +408,6 @@ public class GoodsController extends BaseController {
@ResponseBody
public AjaxResult appEditSave(@RequestBody @Validated Goods goods) {
// 处理Long类型字段的空值情况
// 当前端传入0或空字符串时，将shopId设置为null以便清空
if (goods.getShopId() != null && goods.getShopId().equals(0L)) {
goods.setShopId(null);
}
goodsService.edit(goods);
return AjaxResult.success();
}
@ -1024,6 +467,4 @@ public class GoodsController extends BaseController {
return AjaxResult.error(ExceptionUtil.getExceptionMessage(e));
}
}
}

74
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsDeptCategoryController.java
View File

@ -1,7 +1,5 @@
package com.ghy.web.controller.goods;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.ghy.common.annotation.Log;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
@ -12,8 +10,10 @@ import com.ghy.common.enums.ImgType;
import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.ShiroUtils;
import com.ghy.common.utils.StringUtils;
import com.ghy.goods.domain.*;
import com.ghy.goods.service.*;
import com.ghy.goods.domain.DeptGoodsCategory;
import com.ghy.goods.domain.GoodsImgs;
import com.ghy.goods.service.DeptGoodsCategoryService;
import com.ghy.goods.service.GoodsImgsService;
import com.ghy.web.pojo.vo.AppCategoryRequest;
import com.ghy.web.pojo.vo.HotCategoryResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -30,7 +30,6 @@ import java.util.List;
import java.util.stream.Collectors;
@Controller
@CrossOrigin(origins = "*")
@RequestMapping("goods/deptcategory")
public class GoodsDeptCategoryController extends BaseController {
@ -39,18 +38,6 @@ public class GoodsDeptCategoryController extends BaseController {
@Resource
DeptGoodsCategoryService deptGoodsCategoryService;
@Resource
private GoodsCategoryService goodsCategoryService;
@Resource
ICategoryInsuranceRelationService categoryInsuranceRelationService;
@Resource
IDeptCategoryInsuranceRelationService deptCategoryInsuranceRelationService;
@Resource
IInsuranceManagerService insuranceManagerService;
@Autowired
private GoodsImgsService goodsImgsService;
@ -158,57 +145,6 @@ public class GoodsDeptCategoryController extends BaseController {
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap) {
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(id);
CategoryInsuranceRelation relation = new CategoryInsuranceRelation();
relation.setGoodsCategoryId(deptGoodsCategory.getGoodsCategoryId());
List<CategoryInsuranceRelation> relations = categoryInsuranceRelationService.selectCategoryInsuranceRelationList(relation);
// 当第四级没有的时候，往上找三级
if(CollectionUtil.isEmpty(relations)){
GoodsCategory model = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId());
CategoryInsuranceRelation parentRelation = new CategoryInsuranceRelation();
parentRelation.setGoodsCategoryId(model.getParentCategoryId());
relations = categoryInsuranceRelationService.selectCategoryInsuranceRelationList(parentRelation);
// 当第三级没有的时候，往上找二级
if(CollectionUtil.isEmpty(relations)){
GoodsCategory parentModel = goodsCategoryService.selectById(model.getParentCategoryId());
CategoryInsuranceRelation topRelation = new CategoryInsuranceRelation();
topRelation.setGoodsCategoryId(parentModel.getParentCategoryId());
relations = categoryInsuranceRelationService.selectCategoryInsuranceRelationList(topRelation);
}
}
// pc保险设置
List<InsuranceManager> pcInsuranceList = new ArrayList<>();
// 商城保险设置
List<InsuranceManager> shopInsuranceList = new ArrayList<>();
if(CollectionUtil.isNotEmpty(relations)){
List<InsuranceManager> list = insuranceManagerService.selectByIds(relations.stream().map(CategoryInsuranceRelation::getInsuranceId).collect(Collectors.toList()));
list.forEach(model->{
model.setInsuranceName(model.getCompanyName() + "||" + model.getInsuranceName() + "||" + model.getInsuranceAmount() + "元");
// 查看pc勾选状态
DeptCategoryInsuranceRelation pcParam = new DeptCategoryInsuranceRelation();
pcParam.setType("02");
pcParam.setInsuranceId(model.getId());
pcParam.setDeptCategoryId(deptGoodsCategory.getDeptGoodsCategoryId());
InsuranceManager pcModel = new InsuranceManager();
BeanUtil.copyProperties(model, pcModel);
if(CollectionUtil.isNotEmpty(deptCategoryInsuranceRelationService.selectDeptCategoryInsuranceRelationList(pcParam))){
pcModel.setFlag(true);
}
pcInsuranceList.add(pcModel);
DeptCategoryInsuranceRelation shopParam = new DeptCategoryInsuranceRelation();
shopParam.setType("01");
shopParam.setInsuranceId(model.getId());
shopParam.setDeptCategoryId(deptGoodsCategory.getDeptGoodsCategoryId());
InsuranceManager shopModel = new InsuranceManager();
BeanUtil.copyProperties(model, shopModel);
if(CollectionUtil.isNotEmpty(deptCategoryInsuranceRelationService.selectDeptCategoryInsuranceRelationList(shopParam))){
shopModel.setFlag(true);
}
shopInsuranceList.add(shopModel);
});
}
mmap.put("pcInsurances", pcInsuranceList);
mmap.put("shopInsurances", shopInsuranceList);
mmap.put("deptGoodsCategory", deptGoodsCategory);
return PREFIX + "/edit";
}
@ -217,8 +153,6 @@ public class GoodsDeptCategoryController extends BaseController {
@PostMapping("/edit")
@ResponseBody
public AjaxResult edit(DeptGoodsCategory category) {
// 更新保险设置
deptCategoryInsuranceRelationService.updateDeptCategoryInsuranceRelation(category.getPcInsuranceIds(), category.getShopInsuranceIds(), category.getDeptGoodsCategoryId());
category.setUpdateBy(getLoginName());
deptGoodsCategoryService.edit(category);
return AjaxResult.success();

11
ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java
View File

@ -3,7 +3,6 @@ package com.ghy.web.controller.goods;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.core.page.TableDataInfo;
import com.ghy.goods.domain.Goods;
import com.ghy.goods.domain.GoodsStandard;
import com.ghy.goods.service.GoodsStandardService;
import com.ghy.order.domain.OrderTemplate;
@ -65,14 +64,4 @@ public class GoodsStandardController extends BaseController {
return toAjax(goodsStandardService.save(goodsStandardList));
}
/**
* 根据部门商品分类ID获取商品列表
*/
@ResponseBody
@GetMapping("/goods/by-dept-category/{deptGoodsCategoryId}")
public AjaxResult getGoodsByDeptCategoryId(@PathVariable("deptGoodsCategoryId") Long deptGoodsCategoryId) {
List<Goods> goodsList = goodsStandardService.selectGoodsByDeptGoodsCategoryId(deptGoodsCategoryId);
return AjaxResult.success(goodsList);
}
}

135
ghy-admin/src/main/java/com/ghy/web/controller/goods/InsuranceManagerController.java
View File

@ -1,135 +0,0 @@
package com.ghy.web.controller.goods;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.ghy.common.annotation.Log;
import com.ghy.common.enums.BusinessType;
import com.ghy.goods.domain.InsuranceManager;
import com.ghy.goods.service.IInsuranceManagerService;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.core.page.TableDataInfo;
/**
* 保险管理Controller
*
* @author clunt
* @date 2024-09-25
*/
@Controller
@RequestMapping("/goods/manager")
public class InsuranceManagerController extends BaseController
{
private String prefix = "goods/manager";
@Autowired
private IInsuranceManagerService insuranceManagerService;
@RequiresPermissions("goods:manager:view")
@GetMapping()
public String manager()
{
return prefix + "/manager";
}
/**
* 查询保险管理列表
*/
@RequiresPermissions("goods:manager:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(InsuranceManager insuranceManager)
{
startPage();
List<InsuranceManager> list = insuranceManagerService.selectInsuranceManagerList(insuranceManager);
return getDataTable(list);
}
/**
* App查询保险管理列表
*/
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody InsuranceManager insuranceManager)
{
startPage();
List<InsuranceManager> list = insuranceManagerService.selectInsuranceManagerList(insuranceManager);
return getDataTable(list);
}
/**
* 导出保险管理列表
*/
@RequiresPermissions("goods:manager:export")
@Log(title = "保险管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(InsuranceManager insuranceManager)
{
List<InsuranceManager> list = insuranceManagerService.selectInsuranceManagerList(insuranceManager);
ExcelUtil<InsuranceManager> util = new ExcelUtil<InsuranceManager>(InsuranceManager.class);
return util.exportExcel(list, "保险管理数据");
}
/**
* 新增保险管理
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存保险管理
*/
@RequiresPermissions("goods:manager:add")
@Log(title = "保险管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(InsuranceManager insuranceManager)
{
return toAjax(insuranceManagerService.insertInsuranceManager(insuranceManager));
}
/**
* 修改保险管理
*/
@RequiresPermissions("goods:manager:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
InsuranceManager insuranceManager = insuranceManagerService.selectInsuranceManagerById(id);
mmap.put("insuranceManager", insuranceManager);
return prefix + "/edit";
}
/**
* 修改保存保险管理
*/
@RequiresPermissions("goods:manager:edit")
@Log(title = "保险管理", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(InsuranceManager insuranceManager)
{
return toAjax(insuranceManagerService.updateInsuranceManager(insuranceManager));
}
/**
* 删除保险管理
*/
@RequiresPermissions("goods:manager:remove")
@Log(title = "保险管理", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(insuranceManagerService.deleteInsuranceManagerByIds(ids));
}
}

88
ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceDisputeRequest.java
View File

@ -1,88 +0,0 @@
package com.ghy.web.controller.order;
import java.math.BigDecimal;
/**
* 售后纠纷处理请求
*
* @author system
* @date 2024-12-19
*/
public class AfterServiceDisputeRequest {
/**
* 售后记录ID
*/
private String recordId;
/**
* 主单ID
*/
private Long orderMasterId;
/**
* 子单ID
*/
private Long orderDetailId;
/**
* 退款金额
*/
private BigDecimal refundAmount;
/**
* 售后纠纷平台处理原因
*/
private String platformHandleReason;
public String getRecordId() {
return recordId;
}
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public Long getOrderMasterId() {
return orderMasterId;
}
public void setOrderMasterId(Long orderMasterId) {
this.orderMasterId = orderMasterId;
}
public Long getOrderDetailId() {
return orderDetailId;
}
public void setOrderDetailId(Long orderDetailId) {
this.orderDetailId = orderDetailId;
}
public BigDecimal getRefundAmount() {
return refundAmount;
}
public void setRefundAmount(BigDecimal refundAmount) {
this.refundAmount = refundAmount;
}
public String getPlatformHandleReason() {
return platformHandleReason;
}
public void setPlatformHandleReason(String platformHandleReason) {
this.platformHandleReason = platformHandleReason;
}
@Override
public String toString() {
return "AfterServiceDisputeRequest{" +
"recordId='" + recordId + '\'' +
", orderMasterId=" + orderMasterId +
", orderDetailId=" + orderDetailId +
", refundAmount=" + refundAmount +
", platformHandleReason='" + platformHandleReason + '\'' +
'}';
}
}

45
ghy-admin/src/main/java/com/ghy/web/controller/order/AfterServiceRecordController.java
View File

@ -141,21 +141,6 @@ public class AfterServiceRecordController extends BaseController {
}
}
/**
* 修改商品售后记录
*/
@PostMapping("/editGoods")
@ResponseBody
public AjaxResult editGoodsSave(@RequestBody AfterServiceRecord afterServiceRecord) {
logger.info("修改商品售后记录:{}", afterServiceRecord);
try {
return afterServiceRecordService.updateGoodsAfterServiceRecord(afterServiceRecord);
} catch (Exception exception) {
logger.error(ExceptionUtils.getStackTrace(exception));
return AjaxResult.error(exception.getMessage());
}
}
/**
* 删除售后记录
*/
@ -166,34 +151,4 @@ public class AfterServiceRecordController extends BaseController {
public AjaxResult remove(String ids) {
return toAjax(afterServiceRecordService.deleteAfterServiceRecordByIds(ids));
}
/**
* 师傅重发/补发操作
* 师傅端点击重发补发按钮，保存重发/补发方案
*/
@PostMapping("/workerResendPlan")
@ResponseBody
public AjaxResult workerResendPlan(@RequestBody AfterServiceRecord afterServiceRecord) {
return afterServiceRecordService.workerResendPlan(afterServiceRecord);
}
/**
* 退货操作
* 客户或师傅端进行退货操作，保存退货信息
*/
@PostMapping("/returnGoods")
@ResponseBody
public AjaxResult returnGoods(@RequestBody AfterServiceRecord afterServiceRecord) {
return afterServiceRecordService.returnGoods(afterServiceRecord);
}
/**
* 师傅确认收货
* 师傅确认收到货物后，根据同意处理方式决定是否执行退款
*/
@PostMapping("/workerConfirmReceive")
@ResponseBody
public AjaxResult workerConfirmReceive(@RequestBody AfterServiceRecord afterServiceRecord) {
return afterServiceRecordService.workerConfirmReceive(afterServiceRecord);
}
}

143
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderAddRecordController.java
View File

@ -1,143 +0,0 @@
package com.ghy.web.controller.order;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.ghy.common.annotation.Log;
import com.ghy.common.enums.BusinessType;
import com.ghy.order.domain.OrderAddRecord;
import com.ghy.order.service.IOrderAddRecordService;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.core.page.TableDataInfo;
/**
* 发单加价记录Controller
*
* @author clunt
* @date 2023-11-03
*/
@Controller
@RequestMapping("/add/record")
public class OrderAddRecordController extends BaseController
{
private String prefix = "add/record";
@Autowired
private IOrderAddRecordService orderAddRecordService;
@RequiresPermissions("worker:record:view")
@GetMapping()
public String record()
{
return prefix + "/record";
}
/**
* 查询发单加价记录列表
*/
@RequiresPermissions("worker:record:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderAddRecord orderAddRecord)
{
startPage();
List<OrderAddRecord> list = orderAddRecordService.selectOrderAddRecordList(orderAddRecord);
return getDataTable(list);
}
/**
* App查询发单加价记录列表
*/
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody OrderAddRecord orderAddRecord)
{
startPage();
List<OrderAddRecord> list = orderAddRecordService.selectOrderAddRecordList(orderAddRecord);
return getDataTable(list);
}
@PostMapping("/app/add")
@ResponseBody
public AjaxResult appAddSave(@RequestBody OrderAddRecord orderAddRecord)
{
return toAjax(orderAddRecordService.insertOrderAddRecord(orderAddRecord));
}
/**
* 导出发单加价记录列表
*/
@RequiresPermissions("worker:record:export")
@Log(title = "发单加价记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OrderAddRecord orderAddRecord)
{
List<OrderAddRecord> list = orderAddRecordService.selectOrderAddRecordList(orderAddRecord);
ExcelUtil<OrderAddRecord> util = new ExcelUtil<OrderAddRecord>(OrderAddRecord.class);
return util.exportExcel(list, "发单加价记录数据");
}
/**
* 新增发单加价记录
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存发单加价记录
*/
@RequiresPermissions("worker:record:add")
@Log(title = "发单加价记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OrderAddRecord orderAddRecord)
{
return toAjax(orderAddRecordService.insertOrderAddRecord(orderAddRecord));
}
/**
* 修改发单加价记录
*/
@RequiresPermissions("worker:record:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
OrderAddRecord orderAddRecord = orderAddRecordService.selectOrderAddRecordById(id);
mmap.put("orderAddRecord", orderAddRecord);
return prefix + "/edit";
}
/**
* 修改保存发单加价记录
*/
@RequiresPermissions("worker:record:edit")
@Log(title = "发单加价记录", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OrderAddRecord orderAddRecord)
{
return toAjax(orderAddRecordService.updateOrderAddRecord(orderAddRecord));
}
/**
* 删除发单加价记录
*/
@RequiresPermissions("worker:record:remove")
@Log(title = "发单加价记录", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(orderAddRecordService.deleteOrderAddRecordByIds(ids));
}
}

157
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderAttachmentRecordController.java
View File

@ -1,157 +0,0 @@
package com.ghy.web.controller.order;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.ghy.common.annotation.Log;
import com.ghy.common.enums.BusinessType;
import com.ghy.order.domain.OrderAttachmentRecord;
import com.ghy.order.service.IOrderAttachmentRecordService;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.core.page.TableDataInfo;
/**
* 附件费Controller
*
* @author clunt
* @date 2024-01-02
*/
@Controller
@RequestMapping("/order/attach")
public class OrderAttachmentRecordController extends BaseController
{
private String prefix = "order/attach";
@Autowired
private IOrderAttachmentRecordService orderAttachmentRecordService;
@RequiresPermissions("attach:record:view")
@GetMapping()
public String record()
{
return prefix + "/record";
}
/**
* 查询附件费列表
*/
@RequiresPermissions("attach:record:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderAttachmentRecord orderAttachmentRecord)
{
startPage();
List<OrderAttachmentRecord> list = orderAttachmentRecordService.selectOrderAttachmentRecordList(orderAttachmentRecord);
return getDataTable(list);
}
/**
* App查询附件费列表
*/
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody OrderAttachmentRecord orderAttachmentRecord)
{
startPage();
List<OrderAttachmentRecord> list = orderAttachmentRecordService.selectOrderAttachmentRecordList(orderAttachmentRecord);
return getDataTable(list);
}
/**
* 导出附件费列表
*/
@RequiresPermissions("attach:record:export")
@Log(title = "附件费", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OrderAttachmentRecord orderAttachmentRecord)
{
List<OrderAttachmentRecord> list = orderAttachmentRecordService.selectOrderAttachmentRecordList(orderAttachmentRecord);
ExcelUtil<OrderAttachmentRecord> util = new ExcelUtil<OrderAttachmentRecord>(OrderAttachmentRecord.class);
return util.exportExcel(list, "附件费数据");
}
/**
* 新增附件费
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存附件费
*/
@RequiresPermissions("attach:record:add")
@Log(title = "附件费", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OrderAttachmentRecord orderAttachmentRecord)
{
return toAjax(orderAttachmentRecordService.insertOrderAttachmentRecord(orderAttachmentRecord));
}
@PostMapping("/appAdd")
@ResponseBody
public AjaxResult appAdd(OrderAttachmentRecord orderAttachmentRecord)
{
return toAjax(orderAttachmentRecordService.insertOrderAttachmentRecord(orderAttachmentRecord));
}
/**
* 修改附件费
*/
@RequiresPermissions("attach:record:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
OrderAttachmentRecord orderAttachmentRecord = orderAttachmentRecordService.selectOrderAttachmentRecordById(id);
mmap.put("orderAttachmentRecord", orderAttachmentRecord);
return prefix + "/edit";
}
/**
* 修改保存附件费
*/
@RequiresPermissions("attach:record:edit")
@Log(title = "附件费", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OrderAttachmentRecord orderAttachmentRecord)
{
return toAjax(orderAttachmentRecordService.updateOrderAttachmentRecord(orderAttachmentRecord));
}
/**
* 删除附件费
*/
@RequiresPermissions("attach:record:remove")
@Log(title = "附件费", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(orderAttachmentRecordService.deleteOrderAttachmentRecordByIds(ids));
}
/**
* 删除附件费 根据子单id
*/
@PostMapping( "/deleteByDetailId")
@ResponseBody
public AjaxResult deleteByDetailId(@RequestParam Long orderDetailId)
{
return toAjax(orderAttachmentRecordService.deleteOrderAttachmentRecordByOrderDetailId(orderDetailId));
}
}

7
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java
View File

@ -30,12 +30,11 @@ public class OrderCallRecordController extends BaseController
@Autowired
private IOrderCallRecordService orderCallRecordService;
// @RequiresPermissions("worker:record:view")
@RequiresPermissions("worker:record:view")
@GetMapping()
public String record(Long orderId, ModelMap mmap)
public String record()
{
mmap.put("orderId", orderId);
return prefix;
return prefix + "/record";
}
/**

1954
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

File diff suppressed because it is too large Load Diff

1047
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

File diff suppressed because it is too large Load Diff

159
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailInsuranceUserController.java
View File

@ -1,159 +0,0 @@
package com.ghy.web.controller.order;
import java.util.List;
import com.ghy.web.pojo.vo.CertNoTwoElementReq;
import com.ghy.web.service.AliCloudService;
import com.ghy.web.service.InsuranceService;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.ghy.common.annotation.Log;
import com.ghy.common.enums.BusinessType;
import com.ghy.order.domain.OrderDetailInsuranceUser;
import com.ghy.order.service.IOrderDetailInsuranceUserService;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.core.page.TableDataInfo;
/**
* 订单保险人员Controller
*
* @author clunt
* @date 2024-10-21
*/
@Slf4j
@Controller
@RequestMapping("/insurance/user")
public class OrderDetailInsuranceUserController extends BaseController
{
private String prefix = "insurance/user";
@Autowired
private IOrderDetailInsuranceUserService orderDetailInsuranceUserService;
@Autowired
private AliCloudService aliCloudService;
@Autowired
private InsuranceService insuranceService;
@RequiresPermissions("worker:user:view")
@GetMapping()
public String user()
{
return prefix + "/user";
}
/**
* 查询订单保险人员列表
*/
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderDetailInsuranceUser orderDetailInsuranceUser)
{
startPage();
List<OrderDetailInsuranceUser> list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
return getDataTable(list);
}
/**
* App查询订单保险人员列表
*/
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody OrderDetailInsuranceUser orderDetailInsuranceUser)
{
startPage();
List<OrderDetailInsuranceUser> list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
return getDataTable(list);
}
/**
* 导出订单保险人员列表
*/
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OrderDetailInsuranceUser orderDetailInsuranceUser)
{
List<OrderDetailInsuranceUser> list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
ExcelUtil<OrderDetailInsuranceUser> util = new ExcelUtil<OrderDetailInsuranceUser>(OrderDetailInsuranceUser.class);
return util.exportExcel(list, "订单保险人员数据");
}
/**
* 新增订单保险人员
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存订单保险人员
*/
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(@RequestBody OrderDetailInsuranceUser orderDetailInsuranceUser)
{
// 先校验身份证信息是否ok
CertNoTwoElementReq req = new CertNoTwoElementReq();
req.setCertName(orderDetailInsuranceUser.getName());
req.setCertNo(orderDetailInsuranceUser.getIdCardNum());
try {
aliCloudService.certNoTwoElementVerification(req);
} catch (Exception e) {
log.error("身份证二要素校验失败:{}", e.getMessage(), e);
return AjaxResult.error("请核对姓名与身份证号！");
}
// 将保险人员增员到原保险订单上去
try {
insuranceService.editInsurance(orderDetailInsuranceUser);
orderDetailInsuranceUserService.insertOrderDetailInsuranceUser(orderDetailInsuranceUser);
return AjaxResult.success("增员完毕，保险已生效。");
}catch (Exception e){
log.error("保险增员失败:{}", e.getMessage(), e);
return AjaxResult.error("保险正生成中，可能需几秒或几分钟，请稍等即可！若超半小时可联系发单方或平台。");
}
}
/**
* 修改订单保险人员
*/
@RequiresPermissions("worker:user:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
OrderDetailInsuranceUser orderDetailInsuranceUser = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserById(id);
mmap.put("orderDetailInsuranceUser", orderDetailInsuranceUser);
return prefix + "/edit";
}
/**
* 修改保存订单保险人员
*/
@RequiresPermissions("worker:user:edit")
@Log(title = "订单保险人员", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OrderDetailInsuranceUser orderDetailInsuranceUser)
{
return toAjax(orderDetailInsuranceUserService.updateOrderDetailInsuranceUser(orderDetailInsuranceUser));
}
/**
* 删除订单保险人员
*/
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(orderDetailInsuranceUserService.deleteOrderDetailInsuranceUserByIds(ids));
}
}

16
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java
View File

@ -35,7 +35,7 @@ public class OrderGoodsController extends BaseController {
@Resource
private OrderMasterService orderMasterService;
// @RequiresPermissions("order:goods:view")
@RequiresPermissions("order:goods:view")
@GetMapping()
public String orderGoods(Long orderId, ModelMap mmap) {
OrderMaster orderMaster = orderMasterService.selectById(orderId);
@ -44,14 +44,6 @@ public class OrderGoodsController extends BaseController {
return prefix;
}
@GetMapping(value = "/master")
public String orderMasterGoods(Long orderId, ModelMap mmap) {
OrderMaster orderMaster = orderMasterService.selectById(orderId);
mmap.put("orderId", orderId);
mmap.put("orderMaster", orderMaster);
return "order/masterGoods";
}
// @RequiresPermissions("order:goods:list")
@PostMapping("/list")
@ResponseBody
@ -62,7 +54,7 @@ public class OrderGoodsController extends BaseController {
}
@Log(title = "主订单管理", businessType = BusinessType.EXPORT)
// @RequiresPermissions("order:goods:export")
@RequiresPermissions("order:goods:export")
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OrderGoods orderGoods) {
@ -71,7 +63,7 @@ public class OrderGoodsController extends BaseController {
return util.exportExcel(list, "主订单数据");
}
// @RequiresPermissions("order:goods:remove")
@RequiresPermissions("order:goods:remove")
@Log(title = "主订单管理", businessType = BusinessType.DELETE)
@PostMapping("/remove")
@ResponseBody
@ -87,7 +79,7 @@ public class OrderGoodsController extends BaseController {
/**
* 修改主订单
*/
// @RequiresPermissions("order:goods:edit")
@RequiresPermissions("order:goods:edit")
@GetMapping("/edit/{orderGoodsId}")
public String edit(@PathVariable("orderGoodsId") Long orderGoodsId, ModelMap mmap) {
mmap.put("orderGoods", orderGoodsService.selectById(orderGoodsId));

2678
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

File diff suppressed because it is too large Load Diff

152
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderOperationRecordController.java
View File

@ -1,152 +0,0 @@
package com.ghy.web.controller.order;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.ghy.common.annotation.Log;
import com.ghy.common.enums.BusinessType;
import com.ghy.order.domain.OrderOperationRecord;
import com.ghy.order.service.IOrderOperationRecordService;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.core.page.TableDataInfo;
/**
* 订单操作记录Controller
*
* @author clunt
* @date 2024-02-17
*/
@Api
@Controller
@RequestMapping("/order/operate")
public class OrderOperationRecordController extends BaseController
{
private String prefix = "order/operate";
@Autowired
private IOrderOperationRecordService orderOperationRecordService;
@RequiresPermissions("order:operate:view")
@GetMapping()
public String record()
{
return prefix + "/operate";
}
/**
* 查询订单操作记录列表
*/
@RequiresPermissions("order:operate:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderOperationRecord orderOperationRecord)
{
startPage();
List<OrderOperationRecord> list = orderOperationRecordService.selectOrderOperationRecordList(orderOperationRecord);
return getDataTable(list);
}
/**
* App查询订单操作记录列表
*/
@ApiOperation("订单操作记录列表")
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody OrderOperationRecord orderOperationRecord)
{
startPage();
List<OrderOperationRecord> list = orderOperationRecordService.selectOrderOperationRecordList(orderOperationRecord);
return getDataTable(list);
}
/**
* 新增保存订单操作记录
*/
@ApiOperation("新增订单操作记录")
@PostMapping("/app/add")
@ResponseBody
public AjaxResult appAdd(@RequestBody OrderOperationRecord orderOperationRecord)
{
return toAjax(orderOperationRecordService.insertOrderOperationRecord(orderOperationRecord));
}
/**
* 导出订单操作记录列表
*/
@RequiresPermissions("order:operate:export")
@Log(title = "订单操作记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OrderOperationRecord orderOperationRecord)
{
List<OrderOperationRecord> list = orderOperationRecordService.selectOrderOperationRecordList(orderOperationRecord);
ExcelUtil<OrderOperationRecord> util = new ExcelUtil<OrderOperationRecord>(OrderOperationRecord.class);
return util.exportExcel(list, "订单操作记录数据");
}
/**
* 新增订单操作记录
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存订单操作记录
*/
@RequiresPermissions("order:operate:add")
@Log(title = "订单操作记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OrderOperationRecord orderOperationRecord)
{
return toAjax(orderOperationRecordService.insertOrderOperationRecord(orderOperationRecord));
}
/**
* 修改订单操作记录
*/
@RequiresPermissions("order:operate:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
OrderOperationRecord orderOperationRecord = orderOperationRecordService.selectOrderOperationRecordById(id);
mmap.put("orderOperationRecord", orderOperationRecord);
return prefix + "/edit";
}
/**
* 修改保存订单操作记录
*/
@RequiresPermissions("order:operate:edit")
@Log(title = "订单操作记录", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OrderOperationRecord orderOperationRecord)
{
return toAjax(orderOperationRecordService.updateOrderOperationRecord(orderOperationRecord));
}
/**
* 删除订单操作记录
*/
@RequiresPermissions("order:operate:remove")
@Log(title = "订单操作记录", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(orderOperationRecordService.deleteOrderOperationRecordByIds(ids));
}
}

202
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderWarnRecordController.java
View File

@ -1,202 +0,0 @@
package com.ghy.web.controller.order;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ghy.common.enums.WxMsgEnum;
import com.ghy.common.utils.WechatMsgUtils;
import com.ghy.customer.domain.Customer;
import com.ghy.customer.service.CustomerService;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderMaster;
import com.ghy.order.service.OrderDetailService;
import com.ghy.order.service.OrderMasterService;
import com.ghy.worker.domain.Worker;
import com.ghy.worker.service.WorkerService;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.ghy.common.annotation.Log;
import com.ghy.common.enums.BusinessType;
import com.ghy.order.domain.OrderWarnRecord;
import com.ghy.order.service.IOrderWarnRecordService;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.common.core.page.TableDataInfo;
import javax.annotation.Resource;
/**
* 订单急报记录Controller
*
* @author clunt
* @date 2024-02-18
*/
@Controller
@RequestMapping("/warn/record")
public class OrderWarnRecordController extends BaseController
{
private String prefix = "warn/record";
@Autowired
private IOrderWarnRecordService orderWarnRecordService;
@Resource
private OrderMasterService orderMasterService;
@Resource
private OrderDetailService orderDetailService;
@Resource
private WorkerService workerService;
@Resource
private CustomerService customerService;
@RequiresPermissions("warn:record:view")
@GetMapping()
public String record()
{
return prefix + "/record";
}
/**
* 查询订单急报记录列表
*/
@RequiresPermissions("warn:record:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(OrderWarnRecord orderWarnRecord)
{
startPage();
List<OrderWarnRecord> list = orderWarnRecordService.selectOrderWarnRecordList(orderWarnRecord);
return getDataTable(list);
}
/**
* App查询订单急报记录列表
*/
@ApiOperation("急报操作记录列表")
@PostMapping("/app/list")
@ResponseBody
public TableDataInfo appList(@RequestBody OrderWarnRecord orderWarnRecord)
{
startPage();
List<OrderWarnRecord> list = orderWarnRecordService.selectOrderWarnRecordList(orderWarnRecord);
return getDataTable(list);
}
@ApiOperation("新增急报记录(约单/催单)")
@PostMapping("/app/add")
@ResponseBody
public AjaxResult appAdd(@RequestBody OrderWarnRecord orderWarnRecord)
{
Worker worker;
Customer customer;
if("01".equals(orderWarnRecord.getOrderType())){
OrderMaster orderMaster = orderMasterService.selectById(orderWarnRecord.getOrderId());
worker = workerService.selectById(orderMaster.getWorkerId());
customer = customerService.selectByCustomerId(orderMaster.getCustomerId());
}else {
OrderDetail orderDetail = orderDetailService.selectById(orderWarnRecord.getOrderId());
worker = workerService.selectById(orderDetail.getWorkerId());
customer = customerService.selectByCustomerId(orderDetail.getCustomerId());
}
// 发送急报
// 推送公众号通知数据。
try {
// 消息组装。
Map<String, Object> params = new HashMap<>();
// 订单编号
params.put("thing3", customer.getName());
// 名称
params.put("thing2", orderWarnRecord.getContent());
// 反馈时间
params.put("time6", com.ghy.common.utils.DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", new Date()));
// 消息推送
WechatMsgUtils.sendWeChatMsg(WechatMsgUtils.getToken(), worker.getWxOpenId(), WxMsgEnum.WARN_ORDER, params);
} catch (Exception e) {
// 暂时不做任何操作。
logger.error(e.getMessage(), e);
}
return toAjax(orderWarnRecordService.insertOrderWarnRecord(orderWarnRecord));
}
/**
* 导出订单急报记录列表
*/
@RequiresPermissions("warn:record:export")
@Log(title = "订单急报记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(OrderWarnRecord orderWarnRecord)
{
List<OrderWarnRecord> list = orderWarnRecordService.selectOrderWarnRecordList(orderWarnRecord);
ExcelUtil<OrderWarnRecord> util = new ExcelUtil<OrderWarnRecord>(OrderWarnRecord.class);
return util.exportExcel(list, "订单急报记录数据");
}
/**
* 新增订单急报记录
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存订单急报记录
*/
@RequiresPermissions("warn:record:add")
@Log(title = "订单急报记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(OrderWarnRecord orderWarnRecord)
{
return toAjax(orderWarnRecordService.insertOrderWarnRecord(orderWarnRecord));
}
/**
* 修改订单急报记录
*/
@RequiresPermissions("warn:record:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
OrderWarnRecord orderWarnRecord = orderWarnRecordService.selectOrderWarnRecordById(id);
mmap.put("orderWarnRecord", orderWarnRecord);
return prefix + "/edit";
}
/**
* 修改保存订单急报记录
*/
@RequiresPermissions("warn:record:edit")
@Log(title = "订单急报记录", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(OrderWarnRecord orderWarnRecord)
{
return toAjax(orderWarnRecordService.updateOrderWarnRecord(orderWarnRecord));
}
/**
* 删除订单急报记录
*/
@RequiresPermissions("warn:record:remove")
@Log(title = "订单急报记录", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(orderWarnRecordService.deleteOrderWarnRecordByIds(ids));
}
}

8
ghy-admin/src/main/java/com/ghy/web/controller/pay/AdapayCallbackController.java
View File

@ -8,9 +8,7 @@ import com.huifu.adapay.core.AdapayCore;
import com.huifu.adapay.core.util.AdapaySign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/**
@ -74,12 +72,6 @@ public class AdapayCallbackController extends BaseController {
return "NG";
}
@GetMapping("/adapay/callback")
@ResponseBody
public String test() {
return "NG";
}
/**
* 校验签名
*

113
ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java
View File

@ -1,6 +1,5 @@
package com.ghy.web.controller.pay;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.ghy.common.adapay.model.AdapayStatusEnum;
import com.ghy.common.adapay.model.PayParam;
@ -9,19 +8,15 @@ import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.enums.PayStatus;
import com.ghy.common.enums.PayTypeEnum;
import com.ghy.common.utils.MoneyUtil;
import com.ghy.order.domain.OrderAttachmentRecord;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderMaster;
import com.ghy.order.service.IOrderAttachmentRecordService;
import com.ghy.order.service.OrderDetailService;
import com.ghy.order.service.OrderMasterService;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.domain.PaymentRelation;
import com.ghy.payment.service.AdapayService;
import com.ghy.payment.service.FinancialChangeRecordService;
import com.ghy.payment.service.FinancialMasterService;
import com.ghy.payment.service.IPaymentRelationService;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -30,9 +25,8 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.math.RoundingMode;
import java.util.Map;
import java.util.Objects;
/**
@ -49,16 +43,13 @@ public class AlipayController extends BaseController {
@Resource
private OrderMasterService orderMasterService;
@Resource
private OrderDetailService orderDetailService;
@Resource
private FinancialMasterService financialMasterService;
@Resource
private IPaymentRelationService paymentRelationService;
private OrderDetailService orderDetailService;
@Resource
private FinancialChangeRecordService financialChangeRecordService;
@Resource
private IOrderAttachmentRecordService orderAttachmentRecordService;
/**
* 支付宝正扫支付
@ -73,46 +64,24 @@ public class AlipayController extends BaseController {
if (om.getPayStatus() == 1 || fm.getPayStatus() == 1) {
return AjaxResult.error("订单已支付,不要重复付款!");
}
String payMoney = MoneyUtil.toS(fm.getPayMoney());
Map<String, Object> map;
String payMoney = fm.getPayMoney().setScale(2, BigDecimal.ROUND_UNNECESSARY).toString();
// TODO 这里需要补充商品标题和商品描述信息
PayParam payParam = PayParam.delayPayParam(om.getCode() + "_" + System.currentTimeMillis(), payMoney, "商品标题", "商品描述信息");
try {
JSONObject response = adapayService.alipayQrPay(om.getDeptId(), payParam, null, null, null);
boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status"));
if (!status) {
logger.error("创建支付失败: {}", response.toJSONString());
return AjaxResult.error("网络不佳 请稍后再试");
}
// 支付二维码创建成功 保存一下paymentId
String paymentId = response.getString("id");
// 更新财务主单的paymentId
FinancialMaster fm2update = new FinancialMaster();
fm2update.setId(fm.getId());
fm2update.setPaymentId(paymentId);
fm2update.setPayType(PayTypeEnum.ALIPAY_QR.getCode());
financialMasterService.updateFinancialMaster(fm2update);
// 保存支付ID与主财务单ID到关系表
PaymentRelation relation = new PaymentRelation(null, fm.getId(), PaymentRelation.FINANCIAL_MASTER, fm.getPayMoney());
relation.setPaymentId(paymentId);
paymentRelationService.insert(relation);
return AjaxResult.success(response);
map = adapayService.alipayQrPay(om.getDeptId(), payParam, null, null, null);
} catch (BaseAdaPayException e) {
logger.error("创建支付失败", e);
return AjaxResult.error("网络不佳 请稍后再试");
}
return AjaxResult.success(map);
}
@PostMapping("/addMasterQr")
public AjaxResult addMasterQrPay(@RequestBody String orderId) {
orderId = orderId.replace("\"", "");
String [] orderIds = orderId.split(",");
List<String> orderIdList = Arrays.asList(orderIds);
ArrayList<PaymentRelation> relations = new ArrayList<>();
List<Long> fmList = new ArrayList<>();
BigDecimal payMoney = BigDecimal.ZERO;
for (String id : orderIdList){
// 不知道为啥参数可能会带上双引号 这里去掉再转Long
Long orderMasterId = Long.valueOf(id);
Long orderMasterId = Long.valueOf(orderId.replace("\"", ""));
BigDecimal payMoney = BigDecimal.ZERO;
OrderMaster orderMaster = orderMasterService.selectById(orderMasterId);
if (orderMaster == null) {
return AjaxResult.error("主订单不存在!");
@ -125,23 +94,16 @@ public class AlipayController extends BaseController {
// 主单是否付款 没付款的话一起付
boolean fmPaid = Objects.equals(PayStatus.WAIT_PAY.getCode(), fm.getPayStatus());
if (fmPaid) {
fmList.add(fm.getId());
payMoney = payMoney.add(fm.getPayMoney());
relations.add(new PaymentRelation(null, fm.getId(), PaymentRelation.FINANCIAL_MASTER, fm.getPayMoney()));
}else {
return AjaxResult.error("选择了不需要付款的订单!");
}
if (MoneyUtil.lte0(payMoney)) {
return AjaxResult.error("不需要支付");
}
}
// 以第一单为第三放的付款单号
OrderMaster orderMaster = orderMasterService.selectById(Long.valueOf(orderIdList.get(0)));
// 付款
PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + System.currentTimeMillis(),
MoneyUtil.toS(payMoney), "订单支付", "叮咚到家服务");
payMoney.setScale(2, RoundingMode.UNNECESSARY).toString(), "订单支付", "叮咚到家服务");
JSONObject response;
try {
@ -157,19 +119,13 @@ public class AlipayController extends BaseController {
}
// 支付二维码创建成功 保存一下paymentId
String paymentId = response.getString("id");
for (Long id : fmList){
if (fmPaid) {
FinancialMaster fm2update = new FinancialMaster();
fm2update.setId(id);
fm2update.setId(fm.getId());
fm2update.setPaymentId(paymentId);
fm2update.setPayType(PayTypeEnum.ALIPAY_QR.getCode());
financialMasterService.updateFinancialMaster(fm2update);
}
// 保存支付ID与订单ID到关系表
for (PaymentRelation relation : relations) {
relation.setPaymentId(paymentId);
paymentRelationService.insert(relation);
}
return AjaxResult.success(response);
}
@ -190,41 +146,29 @@ public class AlipayController extends BaseController {
if (fm == null) {
return AjaxResult.error("财务单不存在!");
}
ArrayList<PaymentRelation> relations = new ArrayList<>();
// 主单是否付款 没付款的话一起付
boolean fmPaid = Objects.equals(PayStatus.WAIT_PAY.getCode(), fm.getPayStatus());
if (fmPaid && !"01".equals(orderMaster.getConsultMode())) {
if (fmPaid) {
payMoney = payMoney.add(fm.getPayMoney());
relations.add(new PaymentRelation(null, fm.getId(), PaymentRelation.FINANCIAL_MASTER, fm.getPayMoney()));
}
// 查询关联的加价单
FinancialChangeRecord fcr = financialChangeRecordService.selectNotPayRecordByDetailId(orderDetailId);
if (fcr != null && !"01".equals(orderMaster.getConsultMode())) {
payMoney = payMoney.add(fcr.getChangeMoney());
relations.add(new PaymentRelation(null, fcr.getId(), PaymentRelation.FINANCIAL_CHANGE, fcr.getChangeMoney()));
}else if(fcr != null){
payMoney = payMoney.add(fcr.getChangeMoney());
relations.add(new PaymentRelation(null, fcr.getId(), PaymentRelation.CONSULT_ADD, fcr.getChangeMoney()));
}
OrderAttachmentRecord param = new OrderAttachmentRecord();
param.setOrderDetailId(orderDetailId);
List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
if(CollectionUtil.isNotEmpty(orderAttachmentRecordList)){
payMoney = payMoney.add(orderAttachmentRecordList.get(0).getAttachMoney());
relations.add(new PaymentRelation(null, orderAttachmentRecordList.get(0).getId(), PaymentRelation.ORDER_ATTACHMENT, orderAttachmentRecordList.get(0).getAttachMoney()));
FinancialChangeRecord financialChangeRecord = financialChangeRecordService.selectNotPayRecordByDetailId(orderDetailId);
if (financialChangeRecord != null) {
payMoney = payMoney.add(financialChangeRecord.getChangeMoney());
}
if (MoneyUtil.lte0(payMoney)) {
return AjaxResult.error("不需要支付");
}
// 付款
PayParam payParam;
if (fcr == null) {
if (financialChangeRecord == null) {
payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + System.currentTimeMillis(),
payMoney.setScale(2, BigDecimal.ROUND_UNNECESSARY).toString(),
"订单支付", "叮咚到家服务");
} else {
payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + fcr.getId() + "_" + System.currentTimeMillis(),
payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + financialChangeRecord.getId() + "_" + System.currentTimeMillis(),
payMoney.setScale(2, BigDecimal.ROUND_UNNECESSARY).toString(),
"加价付款", "叮咚到家服务");
}
@ -250,23 +194,12 @@ public class AlipayController extends BaseController {
fm2update.setPayType(PayTypeEnum.ALIPAY_QR.getCode());
financialMasterService.updateFinancialMaster(fm2update);
}
if (fcr != null) {
if (financialChangeRecord != null) {
FinancialChangeRecord fcr2update = new FinancialChangeRecord();
fcr2update.setId(fcr.getId());
fcr2update.setId(financialChangeRecord.getId());
fcr2update.setPaymentId(paymentId);
financialChangeRecordService.update(fcr2update);
}
if(CollectionUtil.isNotEmpty(orderAttachmentRecordList)){
OrderAttachmentRecord oarUpdate = new OrderAttachmentRecord();
oarUpdate.setId(orderAttachmentRecordList.get(0).getId());
oarUpdate.setPaymentId(paymentId);
orderAttachmentRecordService.updateOrderAttachmentRecord(oarUpdate);
}
// 保存支付ID与订单ID到关系表
for (PaymentRelation relation : relations) {
relation.setPaymentId(paymentId);
paymentRelationService.insert(relation);
}
return AjaxResult.success(response);
}
}

61
ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
View File

@ -1,12 +1,12 @@
package com.ghy.web.controller.pay;
import com.alibaba.fastjson.JSONObject;
import com.ghy.common.adapay.model.PayParam;
import com.ghy.common.adapay.model.WxpayExpend;
import com.ghy.common.config.WxConfig;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.enums.PayStatus;
import com.ghy.common.json.JSONObject;
import com.ghy.common.utils.StringUtils;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderMaster;
@ -14,11 +14,9 @@ import com.ghy.order.service.OrderDetailService;
import com.ghy.order.service.OrderMasterService;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.domain.PaymentRelation;
import com.ghy.payment.service.AdapayService;
import com.ghy.payment.service.FinancialChangeRecordService;
import com.ghy.payment.service.FinancialMasterService;
import com.ghy.payment.service.IPaymentRelationService;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import org.springframework.stereotype.Controller;
import org.springframework.util.Assert;
@ -32,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Controller
@ -48,8 +47,7 @@ public class WxPayController extends BaseController {
private FinancialMasterService financialMasterService;
@Resource
private OrderDetailService orderDetailService;
@Resource
private IPaymentRelationService paymentRelationService;
@Resource
private FinancialChangeRecordService financialChangeRecordService;
@ -58,11 +56,11 @@ public class WxPayController extends BaseController {
public AjaxResult drawCash(@RequestBody JSONObject object) {
try {
Long deptId = object.getLong("deptId");
String orderNo = object.getString("orderNo");
String cashType = object.getString("cashType");
String cashAmt = object.getString("cashAmt");
String memberId = object.getString("memberId");
String remark = object.getString("remark");
String orderNo = object.getStr("orderNo");
String cashType = object.getStr("cashType");
String cashAmt = object.getStr("cashAmt");
String memberId = object.getStr("memberId");
String remark = object.getStr("remark");
adapayService.drawCash(deptId, orderNo, cashType, cashAmt, memberId, remark, null);
return AjaxResult.success("操作成功");
} catch (Exception e) {
@ -82,60 +80,33 @@ public class WxPayController extends BaseController {
Assert.notNull(orderMaster, "找不到对应的订单");
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMaster.getId());
BigDecimal payMoney = BigDecimal.ZERO;
ArrayList<PaymentRelation> relations = new ArrayList<>();
if (PayStatus.WAIT_PAY.getCode().equals(financialMaster.getPayStatus())) {
if(PayStatus.WAIT_PAY.getCode().equals(financialMaster.getPayStatus())){
payMoney = financialMaster.getPayMoney();
relations.add(new PaymentRelation(null, financialMaster.getId(), PaymentRelation.FINANCIAL_MASTER, financialMaster.getPayMoney()));
}
List<Long> idList = orderDetailService.selectByOrderMasterId(orderMaster.getId()).stream().map(OrderDetail::getId).collect(Collectors.toList());
List<FinancialChangeRecord> financialChangeRecords = financialChangeRecordService.selectByDetailIds(StringUtils.join(idList, ","));
List<Long> financialChangeRecordIds = new ArrayList<>();
for (FinancialChangeRecord fcr : financialChangeRecords) {
if (PayStatus.WAIT_PAY.getCode().equals(fcr.getPayStatus())) {
payMoney = payMoney.add(fcr.getChangeMoney());
financialChangeRecordIds.add(fcr.getId());
relations.add(new PaymentRelation(null, fcr.getId(), PaymentRelation.FINANCIAL_CHANGE, fcr.getChangeMoney()));
for (FinancialChangeRecord financialChangeRecord : financialChangeRecords) {
if (PayStatus.WAIT_PAY.getCode().equals(financialChangeRecord.getPayStatus())) {
payMoney = payMoney.add(financialChangeRecord.getChangeMoney());
financialChangeRecordIds.add(financialChangeRecord.getId());
}
}
//调用adapay微信公众号支付.
WxpayExpend expend = new WxpayExpend();
expend.setOpenId(openId);
Map<String, Object> map;
try {
// TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description
String changeRecordIdStr = financialChangeRecordIds.size() > 0 ? StringUtils.join(financialChangeRecordIds, ",") + "_" : "";
PayParam payParam = PayParam.delayPayParam(orderMaster.getCode() + "_" + changeRecordIdStr + System.currentTimeMillis(),
String.valueOf(payMoney), "工圈子居家设备", "工圈子居家设备购买付费");
JSONObject response = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null);
String paymentId = response.getString("id");
// 更新财务主单的paymentId
if (PayStatus.WAIT_PAY.getCode().equals(financialMaster.getPayStatus())) {
FinancialMaster fm2update = new FinancialMaster();
fm2update.setId(financialMaster.getId());
fm2update.setPaymentId(paymentId);
financialMasterService.updateFinancialMaster(fm2update);
}
// 更新财务变更记录的paymentId
for (FinancialChangeRecord fcr : financialChangeRecords) {
if (PayStatus.WAIT_PAY.getCode().equals(fcr.getPayStatus())) {
FinancialChangeRecord fcr2update = new FinancialChangeRecord();
fcr2update.setId(fcr.getId());
fcr2update.setPaymentId(paymentId);
financialChangeRecordService.update(fcr2update);
}
}
// 保存支付ID与订单ID到关系表
for (PaymentRelation relation : relations) {
relation.setPaymentId(paymentId);
paymentRelationService.insert(relation);
}
return AjaxResult.success(response);
map = adapayService.wxLitePay(orderMaster.getDeptId(), payParam, expend, null, null);
} catch (BaseAdaPayException e) {
logger.error("获取微信用户信息失败", e);
return AjaxResult.error();
}
return AjaxResult.success(map);
}
// /**

10
ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java
View File

@ -9,8 +9,6 @@ import com.ghy.common.enums.BusinessType;
import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.poi.ExcelUtil;
import com.ghy.payment.domain.FinancialDetail;
import com.ghy.payment.request.FinancialAccountBillReq;
import com.ghy.payment.response.FinancialAccountBillResp;
import com.ghy.payment.service.FinancialDetailService;
import com.ghy.web.pojo.vo.FinancialCountRequest;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -70,14 +68,6 @@ public class FinancialDetailController extends BaseController {
return getDataTable(list);
}
@PostMapping("/app/listV2")
@ResponseBody
public TableDataInfo appListV2(@RequestBody FinancialAccountBillReq financialAccountBillReq) {
startPage();
List<FinancialAccountBillResp> list = financialDetailService.selectFinancialDetailListV2(financialAccountBillReq);
return getDataTable(list);
}
@Log(title = "财务细单管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("financial:detail:export")
@PostMapping("/export")

52
ghy-admin/src/main/java/com/ghy/web/controller/tool/AliCloudController.java
View File

@ -1,52 +0,0 @@
package com.ghy.web.controller.tool;
import cn.hutool.json.JSONUtil;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.utils.StringUtils;
import com.ghy.web.pojo.vo.CertNoTwoElementReq;
import com.ghy.web.service.AliCloudService;
import com.ghy.worker.domain.Worker;
import com.ghy.worker.service.WorkerService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@Slf4j
@Tag(name = "阿里云Api接口")
@Controller
@RequestMapping("/tool/ali")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class AliCloudController {
private final AliCloudService aliCloudService;
private final WorkerService workerService;
@Operation(summary = "身份证二要素校验")
@PostMapping("/certNoTwoElementVerification")
@ResponseBody
public AjaxResult certNoTwoElementVerification(@RequestBody CertNoTwoElementReq certNoTwoElementReq){
try {
Worker worker = workerService.selectById(certNoTwoElementReq.getWorkerId());
if(StringUtils.isNotEmpty(worker.getRemark())){
return AjaxResult.success("操作成功!");
}else {
aliCloudService.certNoTwoElementVerification(certNoTwoElementReq);
worker.setRemark(JSONUtil.toJsonStr(certNoTwoElementReq));
workerService.updateWorker(worker);
return AjaxResult.success();
}
}catch (Exception e){
log.error("身份证二要素校验失败:{}", e.getMessage(), e);
return AjaxResult.success(e.getMessage(), "身份证二要素校验失败!");
}
}
}

91
ghy-admin/src/main/java/com/ghy/web/controller/tool/BaiduController.java
View File

@ -17,9 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
/**
* 百度地图逆解析
* @author clunt
@ -41,34 +38,12 @@ public class BaiduController extends BaseController {
JSONObject json = new JSONObject();
String location = jsonObject.getString("location");
// 解析经纬度
String[] coordinates = location.split(",");
if (coordinates.length != 2) {
return AjaxResult.error("location格式错误，应为：经度,纬度");
}
try {
double longitude = Double.parseDouble(coordinates[1]); // 经度
double latitude = Double.parseDouble(coordinates[0]); // 纬度
// 将经纬度添加到返回结果中
json.put("longitude", longitude);
json.put("latitude", latitude);
json.put("coordinates", coordinates);
logger.info("解析到的坐标 - 经度: {}, 纬度: {}", longitude, latitude);
} catch (NumberFormatException e) {
return AjaxResult.error("经纬度格式错误");
}
String url = baiduConfig.getUrl().replace("#AK#", baiduConfig.getAk()) + location;
String result = HttpUtils.sendGet(url);
result = result.replaceAll("\n", "").replaceAll("\t", "");
JSONObject resultJson = JSONObject.parseObject(result);
if("0".equals(resultJson.getString("status"))){
JSONObject addressJson = resultJson.getJSONObject("result").getJSONObject("addressComponent");
logger.info("百度地图获取到的地址 :" + addressJson);
String provinceName = addressJson.getString("province");
logger.info("provinceName :" + provinceName);
SysArea provinceArea = iSysAreaService.selectByName(provinceName, null);
@ -78,25 +53,9 @@ public class BaiduController extends BaseController {
String countryName = addressJson.getString("district");
logger.info("countryName :" + countryName);
SysArea countryArea = iSysAreaService.selectByName(countryName, cityArea.getAreaCode());
String streetName = addressJson.getString("town");
logger.info("streetName :" + streetName);
SysArea streetArea = iSysAreaService.selectByName(streetName, countryArea.getAreaCode());
// 添加地址信息
json.put("provinceArea", provinceArea);
json.put("cityArea", cityArea);
json.put("countryArea", countryArea);
json.put("streetArea", streetArea);
// 添加完整地址
String fullAddress = (provinceName != null ? provinceName : "") +
(cityName != null ? cityName : "") +
(countryName != null ? countryName : "") +
(streetName != null ? streetName : "");
json.put("fullAddress", fullAddress);
// 保留原有的location字段用于兼容
json.put("location", location);
}else {
return AjaxResult.error("Api服务异常!");
}
@ -108,56 +67,6 @@ public class BaiduController extends BaseController {
}
}
/**
* 百度地图正向地理编码（地址 -> 经纬度）
* 接收JSON：{provinceName, cityName, countryName, streetName, address}
*/
@PostMapping("/geocode")
@ResponseBody
public AjaxResult geocode(@RequestBody JSONObject jsonObject) {
try {
String provinceName = jsonObject.getString("provinceName");
String cityName = jsonObject.getString("cityName");
String countryName = jsonObject.getString("countryName");
String streetName = jsonObject.getString("streetName");
String detailAddress = jsonObject.getString("address");
StringBuilder full = new StringBuilder();
if (provinceName != null) { full.append(provinceName); }
if (cityName != null) { full.append(cityName); }
if (countryName != null) { full.append(countryName); }
if (streetName != null) { full.append(streetName); }
if (detailAddress != null) { full.append(detailAddress); }
String address = full.toString();
if (address == null || address.trim().isEmpty()) {
return AjaxResult.error("地址不能为空");
}
String encoded = URLEncoder.encode(address, StandardCharsets.UTF_8.name());
// 使用百度正向地理编码API
String url = "https://api.map.baidu.com/geocoding/v3/?output=json&ak="
+ baiduConfig.getAk() + "&address=" + encoded;
String result = HttpUtils.sendGet(url);
result = result.replaceAll("\n", "").replaceAll("\t", "");
JSONObject resultJson = JSONObject.parseObject(result);
if ("0".equals(resultJson.getString("status"))) {
JSONObject location = resultJson.getJSONObject("result").getJSONObject("location");
JSONObject data = new JSONObject();
data.put("longitude", location.getBigDecimal("lng"));
data.put("latitude", location.getBigDecimal("lat"));
data.put("fullAddress", address);
return AjaxResult.success(data);
} else {
return AjaxResult.error("百度地理编码失败:" + resultJson.getString("msg"));
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
return AjaxResult.error(ExceptionUtil.getExceptionMessage(e));
}
}
public static void main(String[] args) {
String result = " {\"status\":0,\"result\":{\"location\":{\"lng\":113.29950224957551,\"lat\":23.019282373814027},\"formatted_address\":\"广东省广州市番禺区安平路\",\"business\":\"大石\",\"addressComponent\":{\"country\":\"中国\",\"country_code\":0,\"country_code_iso\":\"CHN\",\"country_code_iso2\":\"CN\",\"province\":\"广东省\",\"city\":\"广州市\",\"city_level\":2,\"district\":\"番禺区\",\"town\":\"\",\"town_code\":\"\",\"distance\":\"\",\"direction\":\"\",\"adcode\":\"440113\",\"street\":\"安平路\",\"street_number\":\"\"},\"pois\":[],\"roads\":[],\"poiRegions\":[],\"sematic_description\":\"\",\"cityCode\":257}}\n";

202
ghy-admin/src/main/java/com/ghy/web/controller/tool/WxController.java
View File

@ -1,8 +1,5 @@
package com.ghy.web.controller.tool;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ghy.common.config.WxConfig;
import com.ghy.common.core.controller.BaseController;
@ -11,7 +8,6 @@ import com.ghy.common.enums.OrderStatus;
import com.ghy.common.exception.ServiceException;
import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.StringUtils;
import com.ghy.common.utils.WechatMsgUtils;
import com.ghy.common.utils.WxUtils;
import com.ghy.common.utils.http.HttpUtils;
import com.ghy.customer.domain.Customer;
@ -32,9 +28,7 @@ import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @author clunt
@ -190,205 +184,9 @@ public class WxController extends BaseController {
}
String data = HttpUtils.sendGet(url, null);
JSONObject result = JSONObject.parseObject(data);
// 如果是师傅端,需要调用公众号的获取用户列表接口 -- 遍历列表去找到unionId和openid关联并入库
// if(!"customer".equals(from)){
// String openid = result.getString("openid");
// String unionId = result.getString("unionid");
// // 查询openid是否入库，已经入库则不管
// Worker param = new Worker();
// param.setOpenId(openid);
// Worker worker = workerService.selectByOpenId(param);
// if(worker != null && StringUtils.isEmpty(worker.getWxOpenId())){
// // 公众号token
// String wxToken = WechatMsgUtils.getToken();
// String wxUserOpenidList = HttpUtils.sendGet("https://api.weixin.qq.com/cgi-bin/user/get?access_token="+wxToken+"&next_openid=");
// logger.info("公众号获取的用户列表集合:{}", wxUserOpenidList);
// JSONObject wxOpenidJson = JSONObject.parseObject(wxUserOpenidList);
// JSONObject openIdListJson = wxOpenidJson.getJSONObject("data");
// List<String> openidList = openIdListJson.getObject("openid", ArrayList.class);
// JSONArray openidJsonArray = new JSONArray();
// openidList.forEach(model->{
// JSONObject openidJson = new JSONObject();
// openidJson.put("openid", model);
// openidJson.put("lang", "zh_CN");
// openidJsonArray.add(openidJson);
// });
// JSONObject jsonParam = new JSONObject();
// xw jsonParam.put("user_list", openidJsonArray);
// String unionUrl = "https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token="+WechatMsgUtils.getToken();;
// logger.info("调用获取用户信息,请求url:{}, 请求body:{}", unionUrl, jsonParam.toJSONString());
// String getUnionResult = HttpUtil.post(unionUrl, jsonParam.toJSONString());
// logger.info("获取公众号union列表:{}", getUnionResult);
// JSONObject unionJson = JSONObject.parseObject(getUnionResult);
// JSONArray unionJsonArray = unionJson.getJSONArray("user_info_list");
// for (int index = 0 ; index<unionJsonArray.size(); index ++){
// JSONObject json = unionJsonArray.getJSONObject(index);
// if(StringUtils.isEmpty(json.getString("unionid"))||StringUtils.isEmpty(unionId)){
// return AjaxResult.success(result);
// }
// if(json.getString("unionid").equals(unionId)){
// Worker updateWorker = new Worker();
// updateWorker.setWorkerId(worker.getWorkerId());
// updateWorker.setWxOpenId(json.getString("openid"));
// logger.info("关联后的worker信息:{}", worker);
// workerService.updateWorker(updateWorker);
// }
// }
// }
//
// }
return AjaxResult.success(result);
}
@GetMapping("/check")
@ResponseBody
public AjaxResult check(HttpServletRequest request) {
String url;
boolean flag = false;
String deptId = request.getHeader("deptId");
String from = request.getHeader("from");
SysDeptConfig sysDeptConfig = sysDeptConfigService.selectByDeptId(Long.parseLong(deptId));
String code = request.getHeader("code");
if("customer".equals(from)){
url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + sysDeptConfig.getWxAppId() + "&secret=" + sysDeptConfig.getWxSecret() + "&js_code=" + code + "&grant_type=authorization_code";
}else {
url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + sysDeptConfig.getServWxAppId() + "&secret=" + sysDeptConfig.getServWxSecret() + "&js_code=" + code + "&grant_type=authorization_code";
}
String data = HttpUtils.sendGet(url, null);
JSONObject result = JSONObject.parseObject(data);
// 如果是师傅端,需要调用公众号的获取用户列表接口 -- 遍历列表去找到unionId和openid关联并入库
if(!"customer".equals(from)){
String openid = result.getString("openid");
String unionId = result.getString("unionid");
// 查询openid是否入库，已经入库则不管
Worker param = new Worker();
param.setOpenId(openid);
Worker worker = workerService.selectByOpenId(param);
if(worker != null){
// 公众号token
String wxToken = WechatMsgUtils.getToken();
String wxUserOpenidList = HttpUtils.sendGet("https://api.weixin.qq.com/cgi-bin/user/get?access_token="+wxToken+"&next_openid=");
logger.info("公众号获取的用户列表集合:{}", wxUserOpenidList);
JSONObject wxOpenidJson = JSONObject.parseObject(wxUserOpenidList);
JSONObject openIdListJson = wxOpenidJson.getJSONObject("data");
List<String> openidList = openIdListJson.getObject("openid", ArrayList.class);
List<List<String>> batchList = ListUtil.partition(openidList, 99);
for (List<String> childOpenidList : batchList) {
JSONArray openidJsonArray = new JSONArray();
childOpenidList.forEach(model->{
JSONObject openidJson = new JSONObject();
openidJson.put("openid", model);
openidJson.put("lang", "zh_CN");
openidJsonArray.add(openidJson);
});
JSONObject jsonParam = new JSONObject();
jsonParam.put("user_list", openidJsonArray);
String unionUrl = "https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token="+WechatMsgUtils.getToken();;
logger.info("调用获取用户信息,请求url:{}, 请求body:{}", unionUrl, jsonParam.toJSONString());
String getUnionResult = HttpUtil.post(unionUrl, jsonParam.toJSONString());
logger.info("获取公众号union列表:{}", getUnionResult);
JSONObject unionJson = JSONObject.parseObject(getUnionResult);
JSONArray unionJsonArray = unionJson.getJSONArray("user_info_list");
for (int index = 0 ; index<unionJsonArray.size(); index ++){
JSONObject json = unionJsonArray.getJSONObject(index);
if(StringUtils.isNotEmpty(json.getString("unionid") )&& StringUtils.isNotEmpty(unionId)){
if(json.getString("unionid").equals(unionId)){
Worker updateWorker = new Worker();
updateWorker.setWorkerId(worker.getWorkerId());
updateWorker.setWxOpenId(json.getString("openid"));
logger.info("关联后的worker信息:{}", worker);
workerService.updateWorker(updateWorker);
flag = true;
break;
}
}
}
if(flag){
break;
}
}
}
}
return AjaxResult.success(true);
}
@GetMapping("/neCheck")
@ResponseBody
public AjaxResult neCheck(HttpServletRequest request) {
try {
String url;
boolean flag = false;
String deptId = request.getHeader("deptId");
String from = request.getHeader("from");
SysDeptConfig sysDeptConfig = sysDeptConfigService.selectByDeptId(Long.parseLong(deptId));
String code = request.getHeader("code");
if("customer".equals(from)){
url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + sysDeptConfig.getWxAppId() + "&secret=" + sysDeptConfig.getWxSecret() + "&js_code=" + code + "&grant_type=authorization_code";
}else {
url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + sysDeptConfig.getServWxAppId() + "&secret=" + sysDeptConfig.getServWxSecret() + "&js_code=" + code + "&grant_type=authorization_code";
}
String data = HttpUtils.sendGet(url, null);
JSONObject result = JSONObject.parseObject(data);
// 如果是师傅端,需要调用公众号的获取用户列表接口 -- 遍历列表去找到unionId和openid关联并入库
if(!"customer".equals(from)){
String openid = result.getString("openid");
String unionId = result.getString("unionid");
// 查询openid是否入库，已经入库则不管
Worker param = new Worker();
param.setOpenId(openid);
Worker worker = workerService.selectByOpenId(param);
if(worker != null){
// 公众号token
String wxToken = WechatMsgUtils.getToken();
String wxUserOpenidList = HttpUtils.sendGet("https://api.weixin.qq.com/cgi-bin/user/get?access_token="+wxToken+"&next_openid=");
logger.info("公众号获取的用户列表集合:{}", wxUserOpenidList);
JSONObject wxOpenidJson = JSONObject.parseObject(wxUserOpenidList);
JSONObject openIdListJson = wxOpenidJson.getJSONObject("data");
List<String> openidList = openIdListJson.getObject("openid", ArrayList.class);
List<List<String>> batchList = ListUtil.partition(openidList, 99);
for (List<String> childOpenidList : batchList) {
JSONArray openidJsonArray = new JSONArray();
childOpenidList.forEach(model->{
JSONObject openidJson = new JSONObject();
openidJson.put("openid", model);
openidJson.put("lang", "zh_CN");
openidJsonArray.add(openidJson);
});
JSONObject jsonParam = new JSONObject();
jsonParam.put("user_list", openidJsonArray);
String unionUrl = "https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token="+WechatMsgUtils.getToken();;
logger.info("调用获取用户信息,请求url:{}, 请求body:{}", unionUrl, jsonParam.toJSONString());
String getUnionResult = HttpUtil.post(unionUrl, jsonParam.toJSONString());
logger.info("获取公众号union列表:{}", getUnionResult);
JSONObject unionJson = JSONObject.parseObject(getUnionResult);
JSONArray unionJsonArray = unionJson.getJSONArray("user_info_list");
for (int index = 0 ; index<unionJsonArray.size(); index ++){
JSONObject json = unionJsonArray.getJSONObject(index);
if(StringUtils.isNotEmpty(json.getString("unionid") )&& StringUtils.isNotEmpty(unionId)){
if(json.getString("unionid").equals(unionId)){
Worker updateWorker = new Worker();
updateWorker.setWorkerId(worker.getWorkerId());
updateWorker.setWxOpenId(json.getString("openid"));
logger.info("关联后的worker信息:{}", worker);
workerService.updateWorker(updateWorker);
flag = true;
break;
}
}
}
if(flag){
break;
}
}
}
}
return AjaxResult.success(flag);
}catch (Exception e){
return AjaxResult.success(false);
}
}
@GetMapping("/openid")
@ResponseBody

134
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerAreaController.java
View File

@ -1,10 +1,7 @@
package com.ghy.web.controller.worker;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.core.page.TableDataInfo;
import com.ghy.common.core.text.Convert;
import com.ghy.order.domain.OrderGoods;
import com.ghy.system.domain.SysArea;
import com.ghy.system.service.ISysAreaService;
import com.ghy.worker.domain.WorkerArea;
@ -14,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@ -30,7 +26,7 @@ import java.util.stream.Collectors;
@Slf4j
@Controller
@RequestMapping("worker/area")
public class WorkerAreaController extends BaseController {
public class WorkerAreaController {
@Resource
private WorkerAreaService workerAreaService;
@ -38,154 +34,42 @@ public class WorkerAreaController extends BaseController {
@Autowired
private ISysAreaService sysAreaService;
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(WorkerArea workerArea) {
startPage();
List<WorkerArea> list = workerAreaService.getWorkerAreaList(workerArea);
return getDataTable(list);
}
@GetMapping()
public String area(Long workerId, ModelMap mmap)
{
mmap.put("workerId", workerId);
return "worker/areaDetail";
}
/**
* 查询某个师傅的所有接单地区
*
* @param workerId 师傅ID
* @param serviceType 服务类型：1=服务, 2=商品，不传则查询所有
*/
@GetMapping("worker")
@ResponseBody
public AjaxResult getByWorker(Long workerId, Integer serviceType) {
if (serviceType != null) {
// 根据服务类型查询
return AjaxResult.success(workerAreaService.getByWorkerIdAndType(workerId, serviceType));
} else {
// 查询所有区域（保持向后兼容）
public AjaxResult getByWorker(Long workerId) {
return AjaxResult.success(workerAreaService.getByWorker(workerId));
}
}
/**
* 查询某个师傅的服务区域（类型1）
*
* @param workerId 师傅ID
*/
@GetMapping("worker/service")
@ResponseBody
public AjaxResult getServiceAreasByWorker(Long workerId) {
return AjaxResult.success(workerAreaService.getByWorkerIdAndType(workerId, 1));
}
/**
* 查询某个师傅的商品区域（类型2）
*
* @param workerId 师傅ID
*/
@GetMapping("worker/goods")
@ResponseBody
public AjaxResult getGoodsAreasByWorker(Long workerId) {
return AjaxResult.success(workerAreaService.getByWorkerIdAndType(workerId, 2));
}
@GetMapping("worker/edit")
@ResponseBody
public AjaxResult getEditWorker(Long workerId, Integer type){
public AjaxResult getEditWorker(Long workerId){
Map<Long, List<String>> countryMap = new HashMap<>();
// 需求1：根据类型查询对应的区域数据
List<WorkerArea> byWorker;
if (Integer.valueOf(1).equals(type)) {
// 服务类型：查询服务区域
byWorker = workerAreaService.getByWorkerIdAndType(workerId, 1);
} else if (Integer.valueOf(2).equals(type)) {
// 商品类型：查询商品区域
byWorker = workerAreaService.getByWorkerIdAndType(workerId, 2);
} else {
// 不传类型：查询所有区域
byWorker = workerAreaService.getByWorker(workerId);
}
// 收集只有cityId没有districtId的城市ID集合（用于单独处理）
Set<Long> cityOnlyIds = new HashSet<>();
// 按districtId分组收集cityIds
Map<Long, Set<Long>> districtCityMap = new HashMap<>();
List<WorkerArea> byWorker = workerAreaService.getByWorker(workerId);
for (WorkerArea area : byWorker){
Long districtId = area.getDistrictId();
// 如果有districtId，按districtId分组处理
if (districtId != null) {
List<String> ids;
if(countryMap.containsKey(districtId)){
ids = countryMap.get(districtId);
} else {
if(countryMap.containsKey(area.getDistrictId())){
ids = countryMap.get(area.getDistrictId());
}else {
ids = new ArrayList<>();
}
// 收集该district下的城市ID
if (area.getCityId() != null) {
districtCityMap.computeIfAbsent(districtId, k -> new HashSet<>()).add(area.getCityId());
}
// 添加街道ID
if (area.getStreetId() != null) {
ids.add(String.valueOf(area.getStreetId()));
countryMap.put(area.getDistrictId(), ids);
}
countryMap.put(districtId, ids);
} else {
// 如果只有cityId没有districtId，收集到cityOnlyIds
if (area.getCityId() != null) {
cityOnlyIds.add(area.getCityId());
}
}
}
List<WorkerArea> result = new ArrayList<>();
// 处理有districtId的情况（正常流程）
for (Map.Entry<Long, List<String>> longListEntry : countryMap.entrySet()) {
WorkerArea model = new WorkerArea();
Long districtId = longListEntry.getKey();
SysArea countryArea = sysAreaService.selectById(districtId);
SysArea countryArea = sysAreaService.selectById(longListEntry.getKey());
model.setDistrictArea(countryArea);
SysArea cityArea = sysAreaService.selectById(Long.valueOf(countryArea.getParentCode()));
model.setCityArea(cityArea);
SysArea provinceArea = sysAreaService.selectById(Long.valueOf(cityArea.getParentCode()));
model.setProvinceArea(provinceArea);
// 设置该district下的cityIds
Set<Long> districtCityIds = districtCityMap.getOrDefault(districtId, new HashSet<>());
List<Long> cityIdList = new ArrayList<>(districtCityIds);
model.setCityIds(cityIdList);
// 设置街道ID列表
model.setStreetIds(longListEntry.getValue());
result.add(model);
}
// 处理只有cityId没有districtId的情况（只返回省市信息）
for (Long cityId : cityOnlyIds) {
WorkerArea model = new WorkerArea();
SysArea cityArea = sysAreaService.selectById(cityId);
model.setCityArea(cityArea);
// 获取省份信息
SysArea provinceArea = sysAreaService.selectById(Long.valueOf(cityArea.getParentCode()));
model.setProvinceArea(provinceArea);
// 只设置城市ID列表
List<Long> cityIdList = new ArrayList<>();
cityIdList.add(cityId);
model.setCityIds(cityIdList);
// 不设置district和street信息
result.add(model);
}
return AjaxResult.success(result);

5
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java
View File

@ -81,9 +81,6 @@ public class WorkerCertificationController extends BaseController
workerCertification.setDeptId(this.getSysUser().getDept().getParentId());
}
List<WorkerCertification> list = workerCertificationService.selectWorkerCertificationList(workerCertification);
list.forEach(worker->{
worker.setName(worker.getSurname() + worker.getName());
});
return getDataTable(list);
}
@ -162,8 +159,6 @@ public class WorkerCertificationController extends BaseController
@ResponseBody
@Transactional(rollbackFor = Exception.class)
public AjaxResult appAddCertify(@RequestBody WorkerCertification request) {
Worker worker = workerService.selectById(request.getWorkerId());
request.setWorkerPhone(worker != null ? worker.getPhone() : null);
// 将师傅状态设置为冻结
// Worker worker = new Worker();
// worker.setWorkerId(request.getWorkerId());

205
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
View File

@ -10,7 +10,6 @@ import com.ghy.common.enums.WorkerStatus;
import com.ghy.common.enums.WorkerType;
import com.ghy.common.utils.CacheUtils;
import com.ghy.common.utils.ExceptionUtil;
import com.ghy.common.utils.StringUtils;
import com.ghy.goods.domain.Goods;
import com.ghy.goods.domain.GoodsCategory;
import com.ghy.goods.service.GoodsCategoryService;
@ -85,16 +84,7 @@ public class WorkerController extends BaseController {
Assert.notNull(worker.getPhone(), "手机号码为空");
List<Worker> workerList = workerService.getWorkByPhoneAndPwd(worker);
if(workerList.size() > 0){
Worker loginWorker = workerList.get(0);
// 检查师傅状态：0=生效,1=冻结,2=删除
if(loginWorker.getStatus() == WorkerStatus.DELETED.getCode()){
return AjaxResult.error("账户已被删除，无法登录!");
}
// 检查登录状态：0=允许登录,1=禁止登录
if(loginWorker.getLoginStatus() != null && loginWorker.getLoginStatus() == 1){
return AjaxResult.error("账户登录已被禁用，无法登录!");
}
return AjaxResult.success(loginWorker);
return AjaxResult.success(workerList.get(0));
}else {
return AjaxResult.error("用户名或密码错误!");
}
@ -109,13 +99,11 @@ public class WorkerController extends BaseController {
@ResponseBody
public AjaxResult register(@RequestBody Worker request){
try {
logger.info("注册师傅信息:{}", request);
if (CacheUtils.get(request.getPhone()) == null){
return AjaxResult.error("验证码无效!");
}
// 验证码校验正确
if(CacheUtils.get(request.getPhone()).toString().equals(request.getRegisterCode())){
logger.info("验证码信息:{}", CacheUtils.get(request.getPhone()));
int result = workerService.updateWorker(request);
if(result > 0){
CacheUtils.remove(request.getPhone());
@ -142,103 +130,27 @@ public class WorkerController extends BaseController {
try {
// 查询满足区域条件的师傅区域记录
List<Long> workerIdsByArea = new ArrayList<>();
if(workerListRequest.getAreaId() != null){
WorkerArea workerArea = new WorkerArea();
workerArea.setDistrictId(workerListRequest.getAreaId());
// 如果有省市区的查询条件,需要构建完整的区域查询条件
boolean flag = StringUtils.isNotEmpty(workerListRequest.getDistrictId()) || StringUtils.isNotEmpty(workerListRequest.getProvinceId())
|| StringUtils.isNotEmpty(workerListRequest.getCityId()) || StringUtils.isNotEmpty(workerListRequest.getStreetId());
if(flag){
workerArea.setDistrictId(null);
}
if(StringUtils.isNotEmpty(workerListRequest.getDistrictId())){
workerArea.setDistrictId(Long.valueOf(workerListRequest.getDistrictId()));
}
if(StringUtils.isNotEmpty(workerListRequest.getProvinceId())) {
workerArea.setProvinceId(Long.valueOf(workerListRequest.getProvinceId()));
}
if(StringUtils.isNotEmpty(workerListRequest.getCityId())) {
workerArea.setCityId(Long.valueOf(workerListRequest.getCityId()));
}
if(StringUtils.isNotEmpty(workerListRequest.getStreetId())) {
workerArea.setStreetId(Long.valueOf(workerListRequest.getStreetId()));
}
List<WorkerArea> workerAreaList = workerAreaService.getWorkerAreaList(workerArea);
workerIdsByArea = workerAreaList.stream()
.map(WorkerArea::getWorkerId)
.collect(Collectors.toList());
}
List<Long> workerIdsByArea = workerAreaList.stream().map(WorkerArea::getWorkerId).collect(Collectors.toList());
// 查询满足技能条件的师傅技能记录
List<Long> workerIdsByCategory = new ArrayList<>();
WorkerGoodsCategory workerGoodsCategory = new WorkerGoodsCategory();
if(workerListRequest.getGoodsCategoryId() != null){
workerGoodsCategory.setGoodsCategoryId(workerListRequest.getGoodsCategoryId());
}
// 如果选择了上级类目但未选择最终类目,则查询该类目下所有子类目
if(StringUtils.isNotEmpty(workerListRequest.getCategoryLevel1())
&& StringUtils.isEmpty(workerListRequest.getCategoryLevel2()) && workerListRequest.getGoodsCategoryId() == null) {
// 1. 先查找二级类目
GoodsCategory param = new GoodsCategory();
param.setParentCategoryId(Long.valueOf(workerListRequest.getCategoryLevel1()));
List<GoodsCategory> secondCategories = goodsCategoryService.selectGoodsCategoryList(param);
// 2. 用二级类目查找三级类目
List<String> categoryIds = new ArrayList<>();
for (GoodsCategory secondCategory : secondCategories) {
param.setParentCategoryId(secondCategory.getGoodsCategoryId());
List<GoodsCategory> thirdCategories = goodsCategoryService.selectGoodsCategoryList(param);
categoryIds.addAll(thirdCategories.stream()
.map(x->x.getGoodsCategoryId().toString())
.collect(Collectors.toList()));
}
workerGoodsCategory.setCategoryIds(categoryIds);
}
// 如果选择了二级类目但未选择三级类目
else if(StringUtils.isNotEmpty(workerListRequest.getCategoryLevel2())
&& workerListRequest.getGoodsCategoryId() == null) {
GoodsCategory param = new GoodsCategory();
param.setParentCategoryId(Long.valueOf(workerListRequest.getCategoryLevel2()));
List<GoodsCategory> subCategories = goodsCategoryService.selectGoodsCategoryList(param);
List<String> categoryIds = subCategories.stream()
.map(x->x.getGoodsCategoryId().toString())
.collect(Collectors.toList());
workerGoodsCategory.setCategoryIds(categoryIds);
}
if(CollectionUtils.isNotEmpty(workerGoodsCategory.getCategoryIds()) || workerGoodsCategory.getGoodsCategoryId() != null){
List<WorkerGoodsCategory> workerGoodsCategoryList = workerGoodsCategoryService.getWorkerGoodsCategory(workerGoodsCategory);
workerIdsByCategory = workerGoodsCategoryList.stream()
.map(WorkerGoodsCategory::getWorkerId)
.collect(Collectors.toList());
}
List<Long> workerIdsByCategory = workerGoodsCategoryList.stream().map(WorkerGoodsCategory::getWorkerId).collect(Collectors.toList());
// 两个list中的workerid取交集
List<Long> resWorkerIds = new ArrayList<>();
if(!workerIdsByArea.isEmpty() && !workerIdsByCategory.isEmpty()) {
resWorkerIds.addAll(CollectionUtils.intersection(workerIdsByArea, workerIdsByCategory));
} else if(!workerIdsByArea.isEmpty()) {
resWorkerIds.addAll(workerIdsByArea);
} else if(!workerIdsByCategory.isEmpty()) {
resWorkerIds.addAll(workerIdsByCategory);
}
List<Long> resWorkerIds = new ArrayList<>(CollectionUtils.intersection(workerIdsByArea, workerIdsByCategory));
if (!resWorkerIds.isEmpty() ||
workerListRequest.getAreaId() != null ||
workerListRequest.getGoodsCategoryId() != null) {
// 有查询条件但无匹配结果时直接返回空列表
if(resWorkerIds.isEmpty()) {
if (CollectionUtils.isEmpty(resWorkerIds)) {
// 交集不存在的情况直接返回空list
return getDataTable(resList);
}
}
startPage();
Worker worker = new Worker();
worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null);
worker.setKeyWords(workerListRequest.getWorkerName());
if(StringUtils.isNotEmpty(workerListRequest.getWorkerPhone())){
worker.setPhone(workerListRequest.getWorkerPhone());
}
worker.setName(workerListRequest.getWorkerName());
if(this.getSysUser().getDept().getParentId() != 101){
worker.setDeptId(this.getSysUser().getDept().getParentId());
}
@ -336,7 +248,6 @@ public class WorkerController extends BaseController {
startPage();
// worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null);
worker.setName(workerListRequest.getWorkerName());
worker.setStatus(0);
List<Worker> list = workerService.getWorkList(worker);
list.forEach(w -> {
Goods goods = new Goods();
@ -351,12 +262,7 @@ public class WorkerController extends BaseController {
setDistrictIds(worker.getDistrictIds());
}}));
} else {
List<WorkerArea> workerAreas = workerAreaService.getByWorker(w.getWorkerId());
if(workerAreas.size() > 10){
workerListResponse.setWorkerAreas(workerAreas.subList(0,10));
}else {
workerListResponse.setWorkerAreas(workerAreas);
}
workerListResponse.setWorkerAreas(workerAreaService.getByWorker(w.getWorkerId()));
}
workerListResponse.setGoodsCategories(workerGoodsCategoryService.getByWorker(w.getWorkerId()));
workerListResponse.setSpecialSkills(specialSkillService.getByWorker(w.getWorkerId()));
@ -421,106 +327,19 @@ public class WorkerController extends BaseController {
}
}
@PostMapping("/changeLoginStatus")
@ResponseBody
public AjaxResult changeLoginStatus(Worker worker){
try {
workerService.updateWorker(worker);
return AjaxResult.success("登录状态修改成功");
}catch (Exception e){
logger.error(ExceptionUtil.getExceptionMessage(e));
return AjaxResult.error(e.getMessage());
}
}
@PostMapping("/settled")
@ResponseBody
@Transactional(rollbackFor = Exception.class)
public AjaxResult settled(@RequestBody WorkerSettledRequest request) {
// 入驻服务区域信息持久化（类型1）
workerAreaService.updateWorkerAreaByType(request.getWorkerId(), request.getWorkerAreas(), 1);
// 入驻商品区域信息持久化（类型2）
workerAreaService.updateWorkerAreaByType(request.getWorkerId(), request.getWorkerGoodsAreas(), 2);
// 入驻服务类目信息持久化（类型1）
if (request.getServiceCategories() != null && !request.getServiceCategories().isEmpty()) {
// 使用对象数组方式
workerGoodsCategoryService.updateWorkerGoodsCategoryByType(request.getWorkerId(), request.getServiceCategories(), 1);
} else if (request.getServiceCategoryIds() != null && !request.getServiceCategoryIds().isEmpty()) {
// 使用ID数组方式（兼容旧版本）
List<WorkerGoodsCategory> serviceCategories = request.getServiceCategoryIds().stream()
.map(id -> {
WorkerGoodsCategory category = new WorkerGoodsCategory();
category.setGoodsCategoryId(id);
return category;
}).collect(Collectors.toList());
workerGoodsCategoryService.updateWorkerGoodsCategoryByType(request.getWorkerId(), serviceCategories, 1);
}
// 入驻商品类目信息持久化（类型2）
if (request.getGoodsCategories() != null && !request.getGoodsCategories().isEmpty()) {
// 使用对象数组方式
workerGoodsCategoryService.updateWorkerGoodsCategoryByType(request.getWorkerId(), request.getGoodsCategories(), 2);
} else if (request.getGoodsCategoryIds() != null && !request.getGoodsCategoryIds().isEmpty()) {
// 使用ID数组方式（兼容旧版本）
List<WorkerGoodsCategory> goodsCategories = request.getGoodsCategoryIds().stream()
.map(id -> {
WorkerGoodsCategory category = new WorkerGoodsCategory();
category.setGoodsCategoryId(id);
return category;
}).collect(Collectors.toList());
workerGoodsCategoryService.updateWorkerGoodsCategoryByType(request.getWorkerId(), goodsCategories, 2);
}
// 入驻区域信息持久化
workerAreaService.updateWorkerServArea(request.getWorkerId(), request.getWorkerAreas());
// 入驻服务品类信息持久化
workerGoodsCategoryService.updateWorkerGoodsCategory(request.getWorkerId(), request.getGoodsCategories());
// 更新师傅入驻类型为服务商
Worker worker = new Worker();
worker.setWorkerId(request.getWorkerId());
worker.setType(WorkerType.SP.getCode());
workerService.updateWorker(worker);
return AjaxResult.success("保存成功");
}
/**
* 通过师傅ID获取师傅详情
* @param workerId 师傅ID
* @return 师傅实体对象
*/
@GetMapping("/detail/{workerId}")
@ResponseBody
public AjaxResult getWorkerDetailById(@PathVariable("workerId") Long workerId) {
try {
// 参数校验
if (workerId == null) {
return AjaxResult.error("师傅ID不能为空");
}
// 查询师傅基本信息
Worker worker = workerService.selectById(workerId);
if (worker == null) {
return AjaxResult.error("师傅不存在");
}
return AjaxResult.success(worker);
} catch (Exception e) {
logger.error("获取师傅详情失败: " + ExceptionUtil.getExceptionMessage(e));
return AjaxResult.error("获取师傅详情失败: " + e.getMessage());
}
}
/**
* 删除师傅（软删除）
*/
@RequiresPermissions("worker:worker:remove")
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
try {
return toAjax(workerService.deleteWorkerByIds(ids));
} catch (Exception e) {
logger.error(ExceptionUtil.getExceptionMessage(e));
return AjaxResult.error("删除失败: " + e.getMessage());
}
}
}

112
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerGoodsCategoryController.java
View File

@ -1,14 +1,11 @@
package com.ghy.web.controller.worker;
import com.ghy.common.constant.Constants;
import com.ghy.common.core.controller.BaseController;
import com.ghy.common.core.domain.AjaxResult;
import com.ghy.common.core.page.TableDataInfo;
import com.ghy.common.core.text.Convert;
import com.ghy.common.utils.StringUtils;
import com.ghy.goods.domain.GoodsCategory;
import com.ghy.goods.service.GoodsCategoryService;
import com.ghy.worker.domain.WorkerArea;
import com.ghy.worker.domain.WorkerGoodsCategory;
import com.ghy.worker.request.WorkerGoodsCategorySaveRequest;
import com.ghy.worker.service.WorkerGoodsCategoryService;
@ -16,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@ -32,7 +28,7 @@ import java.util.stream.Collectors;
@Slf4j
@Controller
@RequestMapping("worker/goods/category")
public class WorkerGoodsCategoryController extends BaseController {
public class WorkerGoodsCategoryController {
@Resource
private WorkerGoodsCategoryService workerGoodsCategoryService;
@ -40,51 +36,15 @@ public class WorkerGoodsCategoryController extends BaseController {
@Autowired
private GoodsCategoryService goodsCategoryService;
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(WorkerGoodsCategory workerGoodsCategory) {
startPage();
List<WorkerGoodsCategory> list = workerGoodsCategoryService.getByWorker(workerGoodsCategory.getWorkerId());
for (WorkerGoodsCategory item: list) {
List<String> nameList = new ArrayList<String>();
// 查询所有父级服务类目，拼接服务名称
GoodsCategory goodsCategory = goodsCategoryService.selectById(item.getGoodsCategoryId());
while (goodsCategory.getParentCategoryId() != null) {
nameList.add(goodsCategory.getGoodsCategoryName());
goodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId());
}
Collections.reverse(nameList);
item.setMergeName(StringUtils.join(nameList, Constants.JOIN_SYMBOL));
}
return getDataTable(list);
}
@GetMapping()
public String category(Long workerId, ModelMap mmap)
{
mmap.put("workerId", workerId);
return "worker/categoryDetail";
}
/**
* 查询某个师傅的所有服务类目
*
* @param workerId 师傅ID
* @param serviceType 服务类型：1=服务, 2=商品，不传则查询所有
*/
@GetMapping("worker")
@ResponseBody
public AjaxResult getByWorker(Long workerId, Integer serviceType) {
List<WorkerGoodsCategory> list;
if (serviceType != null) {
// 根据服务类型查询
list = workerGoodsCategoryService.getByWorkerIdAndType(workerId, serviceType);
} else {
// 查询所有类目（保持向后兼容）
list = workerGoodsCategoryService.getByWorker(workerId);
}
public AjaxResult getByWorker(Long workerId) {
List<WorkerGoodsCategory> list = workerGoodsCategoryService.getByWorker(workerId);
for (WorkerGoodsCategory item: list) {
List<String> nameList = new ArrayList<String>();
// 查询所有父级服务类目，拼接服务名称
@ -98,75 +58,14 @@ public class WorkerGoodsCategoryController extends BaseController {
}
return AjaxResult.success(list);
}
/**
* 查询某个师傅的服务类目（类型1）
*
* @param workerId 师傅ID
*/
@GetMapping("worker/service")
@ResponseBody
public AjaxResult getServiceCategoriesByWorker(Long workerId) {
List<WorkerGoodsCategory> list = workerGoodsCategoryService.getByWorkerIdAndType(workerId, 1);
for (WorkerGoodsCategory item: list) {
List<String> nameList = new ArrayList<String>();
// 查询所有父级服务类目，拼接服务名称
GoodsCategory goodsCategory = goodsCategoryService.selectById(item.getGoodsCategoryId());
while (goodsCategory.getParentCategoryId() != null) {
nameList.add(goodsCategory.getGoodsCategoryName());
goodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId());
}
Collections.reverse(nameList);
item.setMergeName(StringUtils.join(nameList, Constants.JOIN_SYMBOL));
}
return AjaxResult.success(list);
}
/**
* 查询某个师傅的商品类目（类型2）
*
* @param workerId 师傅ID
*/
@GetMapping("worker/goods")
@ResponseBody
public AjaxResult getGoodsCategoriesByWorker(Long workerId) {
List<WorkerGoodsCategory> list = workerGoodsCategoryService.getByWorkerIdAndType(workerId, 2);
for (WorkerGoodsCategory item: list) {
List<String> nameList = new ArrayList<String>();
// 查询所有父级服务类目，拼接服务名称
GoodsCategory goodsCategory = goodsCategoryService.selectById(item.getGoodsCategoryId());
while (goodsCategory.getParentCategoryId() != null) {
nameList.add(goodsCategory.getGoodsCategoryName());
goodsCategory = goodsCategoryService.selectById(goodsCategory.getParentCategoryId());
}
Collections.reverse(nameList);
item.setMergeName(StringUtils.join(nameList, Constants.JOIN_SYMBOL));
}
return AjaxResult.success(list);
}
@GetMapping("worker/edit")
@ResponseBody
public AjaxResult getEditWorker(Long workerId, Integer type) {
public AjaxResult getEditWorker(Long workerId) {
Map<Long, List<String>> twoMap = new HashMap<>();
// 根据类型查询对应的商品分类数据
List<WorkerGoodsCategory> list;
if (Integer.valueOf(1).equals(type)) {
// 服务类型：查询服务商品分类
list = workerGoodsCategoryService.getByWorkerIdAndType(workerId, 1);
} else if (Integer.valueOf(2).equals(type)) {
// 商品类型：查询商品分类
list = workerGoodsCategoryService.getByWorkerIdAndType(workerId, 2);
} else {
// 不传类型：查询所有商品分类
list = workerGoodsCategoryService.getByWorker(workerId);
}
List<WorkerGoodsCategory> list = workerGoodsCategoryService.getByWorker(workerId);
if(CollectionUtils.isEmpty(list)){
return AjaxResult.success();
}
for (WorkerGoodsCategory item: list) {
List<String> ids;
GoodsCategory goodsCategory = goodsCategoryService.selectById(item.getGoodsCategoryId());
@ -178,7 +77,6 @@ public class WorkerGoodsCategoryController extends BaseController {
ids.add(String.valueOf(goodsCategory.getGoodsCategoryId()));
twoMap.put(goodsCategory.getParentCategoryId(), ids);
}
List<WorkerGoodsCategory> result = new ArrayList<>();
for (Map.Entry<Long, List<String>> longListEntry : twoMap.entrySet()) {
WorkerGoodsCategory model = new WorkerGoodsCategory();

38
ghy-admin/src/main/java/com/ghy/web/core/config/AliApiConfig.java
View File

@ -1,38 +0,0 @@
package com.ghy.web.core.config;
import com.aliyun.dytnsapi20200217.Client;
import com.aliyun.teaopenapi.models.Config;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
public class AliApiConfig {
@Value("${aliyun.accessKey}")
private String accessKey;
@Value("${aliyun.accessSecret}")
private String accessSecret;
@Value("${aliyun.endpoint}")
private String endpoint;
@Value("${aliyun.authCode}")
private String authCode;
@Bean
public Client createClient() throws Exception {
// 建议使用更安全的 STS 方式，更多鉴权访问方式请参见：https://help.aliyun.com/document_detail/378657.html。
Config config = new Config()
// 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。
.setAccessKeyId(accessKey)
// 必填，请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。
.setAccessKeySecret(accessSecret)
.setEndpoint(endpoint);
return new Client(config);
}
}

2
ghy-admin/src/main/java/com/ghy/web/core/config/SwaggerConfig.java
View File

@ -41,7 +41,7 @@ public class SwaggerConfig
// 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解
.apis(RequestHandlerSelectors.basePackage("com.ghy.web.controller.order"))
.apis(RequestHandlerSelectors.basePackage("com.ghy.web.controller.tool"))
// 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any())
.build();

14
ghy-admin/src/main/java/com/ghy/web/pojo/vo/CertNoTwoElementReq.java
View File

@ -1,14 +0,0 @@
package com.ghy.web.pojo.vo;
import lombok.Data;
@Data
public class CertNoTwoElementReq {
private Long workerId;
private String certNo;
private String certName;
}

23
ghy-admin/src/main/java/com/ghy/web/pojo/vo/InsuranceOrderEditReq.java
View File

@ -1,23 +0,0 @@
package com.ghy.web.pojo.vo;
import lombok.Data;
@Data
public class InsuranceOrderEditReq {
private String requestNo;
private String channelCode = "NNDD0806QH";
private String sign;
private String orderNumber;
private String workName;
private String workerID;
private String shangmenTime;
private String shangmenNum;
}

36
ghy-admin/src/main/java/com/ghy/web/pojo/vo/InsuranceOrderReq.java
View File

@ -1,36 +0,0 @@
package com.ghy.web.pojo.vo;
import lombok.Data;
import java.util.Date;
@Data
public class InsuranceOrderReq {
private String requestNo;
private String channelCode = "NNDD0806QH";
private String sign;
private String orderNumber;
private String orderProductType = "0002";
private String orderStatus = "1";
private String orderStartat;
private String orderEndat;
private String customerAddress;
private String customerPhone;
private String workName;
private String workerID;
}

7
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderChangePriceRequest.java
View File

@ -8,7 +8,6 @@ import java.math.BigDecimal;
/**
* 改价请求实体
*
* @author clunt
*/
@Data
@ -22,10 +21,4 @@ public class OrderChangePriceRequest implements Serializable {
private Integer type;
private String remark;
private String urls;
private String fileNames;
private String reason;
}

4
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListRequest.java
View File

@ -34,8 +34,4 @@ public class OrderListRequest {
* 是否超时 1=是 0=否
*/
private Integer timeout;
private Boolean needImgs = true;
private Integer orderType;
}

184
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -2,15 +2,11 @@ package com.ghy.web.pojo.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ghy.common.annotation.Excel;
import com.ghy.goods.domain.Goods;
import com.ghy.goods.domain.GoodsArea;
import com.ghy.goods.domain.InsuranceManager;
import com.ghy.order.domain.AfterServiceRecord;
import com.ghy.payment.domain.FinancialChangeRecord;
import com.ghy.payment.domain.OrderTimeoutRecord;
import com.ghy.shop.domain.Shop;
import lombok.Data;
import java.math.BigDecimal;
@ -20,29 +16,16 @@ import java.util.List;
@Data
public class OrderListResponse {
// 商品品牌 -- 后台发单才有
private String goodsBrand;
// 商品规格 -- 后台发单才有
private String goodsSpecification;
private String totalName;
private String isCall;
private Long orderMasterId;
private String orderMasterCode;
private String originalOrderMasterCode;
private Long orderDetailId;
private String orderDetailCode;
private Long workerId;
private Long masterWorkerId;
private String workerName;
private String workerPhone;
@ -53,8 +36,6 @@ public class OrderListResponse {
private String masterCompanyName;
private String masterCompanyPhone;
private String customerName;
private String customerPhone;
@ -87,23 +68,14 @@ public class OrderListResponse {
private Integer orderStatus;
private String orderStatusName;
private Integer payStatus;
/**
* 退款支付状态：0=未支付，1=已支付
*/
private Integer refundPayStatus;
private Integer payType;
private BigDecimal totalMoney;
private BigDecimal payMoney;
private BigDecimal payAddMoney;
private BigDecimal finalRecvMoney;
private BigDecimal changeMoney;
@ -177,163 +149,7 @@ public class OrderListResponse {
*/
private Integer timeoutFineTimes;
/**
* 超时时间（用于排序）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date timeoutTime;
private Integer afterTimeout;
private String orderMode;
/*是否合约订单*/
private String consultMode;
private Goods goods;
/*是否有保险id*/
private Long insuranceId;
private InsuranceManager insuranceManager;
private Long cityId;
/*街道id*/
private Long streetId;
private Long provinceId;
private String name;
private String phone;
private String provinceName;
private String cityName;
private String countryName;
private String streetName;
private Long countryId;
/**
* 是否为监控但
* */
private Boolean isMonitoredOrder;
private BigDecimal addMoney;
private String addMoneyRemark;
private BigDecimal paymentMoney;
/**
* 是否已派发服务订单：0=未派发，1=已派发
*/
private Integer hasServiceOrder;
/**
* 下单图片
*/
@Excel(name = "下单图片", cellType = Excel.ColumnType.STRING)
private String orderImages;
/**
* 是否发货到服务店：0=否，1=是
*/
@Excel(name = "是否发货到服务店", cellType = Excel.ColumnType.NUMERIC)
private Integer isDeliveryToStore;
/**
* 是否已开票：0=是，1=否
*/
@Excel(name = "是否已开票", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=是,1=否")
private Integer isInvoiced;
/**
* 是否需要开票：0=不需要，1=需要
*/
@Excel(name = "是否需要开票", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=不需要,1=需要")
private Integer isNeedBill;
/**
* 原师傅id（转单前的师傅）
*/
@Excel(name = "原师傅id", cellType = Excel.ColumnType.NUMERIC)
private Long originalWorkerId;
private Long serverGoodsId;
/**
* 服务店铺ID
*/
private Long serviceShopId;
private Date confirmStartTime;
private Integer deliveryType;
private Long goodsId;
/**
* 发货备注
*/
@Excel(name = "发货备注", cellType = Excel.ColumnType.STRING)
private String deliveryRemark;
/**
* 发货图片
*/
@Excel(name = "发货图片", cellType = Excel.ColumnType.STRING)
private String deliveryImages;
@Excel(name = "交货图片", cellType = Excel.ColumnType.STRING)
private String handoverImages;
@Excel(name = "交货备注", cellType = Excel.ColumnType.STRING)
private String handoverRemark;
/**
* 快递单号
*/
private String trackingNumber;
/**
* 分账倒计时结束时间
*/
@Excel(name = "分账倒计时结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date shareAccountCountdownEndTime;
/**
* 分账倒计时时长（小时）
*/
@Excel(name = "分账倒计时时长（小时）")
private Integer shareAccountCountdownDuration;
private Shop shop;
private Shop serviceShop;
private Long goodsOrderMasterId;
/**
* 是否已撤销服务主单：0=未撤销，1=已撤销
*/
@Excel(name = "是否已撤销服务主单", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=未撤销,1=已撤销")
private Integer serviceCancelled;
/**
* 是否显示售后记录：0=不显示，1=显示
*/
private Integer showAfterServiceRecord = 0;
@Excel(name = "是否显示在监控单", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=不显示,1=显示在监控单")
private Integer showInMonitor;
@Excel(name = "售后状态：0-无售后，1-售后纠纷,2-售后已完成,3-售后已取消")
private Integer afterPlatformServiceStatus;
}

54
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
View File

@ -80,58 +80,4 @@ public class OrderStandardDetail {
*/
private Integer timeoutFineTimes;
private Integer afterTimeout;
private BigDecimal addMoney;
/**
* 退单原因
*/
private String returnReason;
/**
* 退单原因详情
*/
private String returnReasonDetail;
/**
* 退单图片
*/
private String returnImages;
/**
* 发货类型 - 订单的发货方式
*/
private Integer deliveryType;
/**
* 发货备注 - 发货相关备注信息
*/
private String deliveryRemark;
/**
* 发货图片 - 发货凭证图片
*/
private String deliveryImages;
/**
* 快递单号 - 物流跟踪单号
*/
private String trackingNumber;
private String handoverImages;
private String handoverRemark;
private String orderImages;
//= "售后状态：0-无售后，1-售后纠纷,2-售后已完成,3-售后已取消"
private Integer afterPlatformServiceStatus;
private Integer payStatus;
private Integer refundPayStatus;
}

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java
View File

@ -13,6 +13,4 @@ public class OrderStatisticsRequest {
private Long workerId;
private Long deptId;
private Integer orderType;
}

54
ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigRequestVO.java
View File

@ -1,54 +0,0 @@
package com.ghy.web.pojo.vo;
import com.ghy.system.domain.SysGlobalConfig;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import org.springframework.beans.BeanUtils;
/**
* @Author 但星霖
* @Date 2023-03-20 20：37：16
* 说明：系统配置返回vo
*/
@Data
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
@Schema(description = "系统配置请求返回vo")
public class SysGlobalConfigRequestVO {
@Schema(description = "配置项主键ID")
private Long id;
@Schema(description = "配置项名称")
private String name;
@Schema(description = "配置项内容json串")
private String content;
@Schema(description = "排序号")
private Integer sort;
@Schema(description = "描述")
private String describe;
@Schema(description = "配置类型")
private Integer type;
@Schema(description = "数据内容类型")
private Integer dataType;
@Schema(description = "单位")
private String configUnit;
public static SysGlobalConfig toModel(SysGlobalConfigRequestVO vo){
SysGlobalConfig sysConfig = new SysGlobalConfig();
BeanUtils.copyProperties(vo, sysConfig);
return sysConfig;
}
}

116
ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysGlobalConfigResponseVO.java
View File

@ -1,116 +0,0 @@
package com.ghy.web.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ghy.common.annotation.SysConstants;
import com.ghy.common.enums.SysGlobalConfigDataTypeEnum;
import com.ghy.common.enums.SysGlobalConfigEnum;
import com.ghy.common.utils.ObjectVerifyUtils;
import com.ghy.system.domain.SysGlobalConfig;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import org.springframework.beans.BeanUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @Author 但星霖
* @Date 2023-03-20 20：37：16
* 说明：系统配置返回vo
*/
@Data
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
@Schema(description = "系统配置返回vo")
public class SysGlobalConfigResponseVO {
@Schema(description = "配置项主键ID")
private Long id;
@Schema(description = "配置项名称")
private String name;
@Schema(description = "配置项内容json串")
private String content;
@Schema(description = "排序号")
private Integer sort;
@Schema(description = "描述")
private String describe;
@Schema(description = "配置类型")
private Integer type;
@Schema(description = "配置类型枚举")
private SysGlobalConfigEnum typeEnum;
@Schema(description = "配置类型Desc")
private String typeEnumDesc;
@Schema(description = "数据内容类型")
private Integer dataType;
@Schema(description = "数据内容类型")
private SysGlobalConfigDataTypeEnum dataTypeEnum;
@Schema(description = "数据内容类型")
private String dataTypeEnumDesc;
@Schema(description = "单位")
private String configUnit;
@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonFormat(pattern = SysConstants.DATE_TIME_FORMAT, locale = "zh", timezone = "GMT+8")
@Schema(description = "创建时间")
private Date createTime;
@JsonInclude(value = JsonInclude.Include.NON_NULL)
@JsonFormat(pattern = SysConstants.DATE_TIME_FORMAT, locale = "zh", timezone = "GMT+8")
@Schema(description = "更新时间")
private Date updateTime;
public static SysGlobalConfigResponseVO toVo(SysGlobalConfig model) {
if (ObjectVerifyUtils.isNull(model)) {
return null;
}
SysGlobalConfigResponseVO vo = new SysGlobalConfigResponseVO();
BeanUtils.copyProperties(model, vo);
// 配置类型
if (ObjectVerifyUtils.isNotNull(model.getType())) {
SysGlobalConfigEnum configEnum = SysGlobalConfigEnum.parse(model.getType());
if (ObjectVerifyUtils.isNotNull(configEnum)) {
vo.setTypeEnum(configEnum);
vo.setTypeEnumDesc(configEnum.desc());
}
}
// 配置类型数据类型
if (ObjectVerifyUtils.isNotNull(model.getDataType())) {
SysGlobalConfigDataTypeEnum sysConfigDataTypeEnum = SysGlobalConfigDataTypeEnum.parse(model.getDataType());
if (ObjectVerifyUtils.isNotNull(sysConfigDataTypeEnum)) {
vo.setDataTypeEnum(sysConfigDataTypeEnum);
vo.setDataTypeEnumDesc(sysConfigDataTypeEnum.desc());
}
}
// 时间类单独处理
vo.setCreateTime(ObjectVerifyUtils.isNotNull(model.getCreateTime()) ? new Date(model.getCreateTime()) : null);
vo.setUpdateTime(ObjectVerifyUtils.isNotNull(model.getUpdateTime()) ? new Date(model.getUpdateTime()) : null);
return vo;
}
public static List<SysGlobalConfigResponseVO> toVoList(List<SysGlobalConfig> sysConfigList) {
List<SysGlobalConfigResponseVO> voList = new ArrayList<>();
if (ObjectVerifyUtils.isNotEmpty(sysConfigList)) {
sysConfigList.forEach(sysConfig -> voList.add(toVo(sysConfig)));
}
return voList;
}
}

77
ghy-admin/src/main/java/com/ghy/web/pojo/vo/SysOrderRequest.java
View File

@ -1,77 +0,0 @@
package com.ghy.web.pojo.vo;
import com.ghy.common.annotation.Excel;
import lombok.Data;
@Data
public class SysOrderRequest {
@Excel(name = "seq")
private String seq;
@Excel(name = "category")
private String category;
@Excel(name = "lastCategory")
private String lastCategory;
@Excel(name = "brand")
private String brand;
@Excel(name = "date")
private String date;
@Excel(name = "time")
private String time;
@Excel(name = "mode")
private String mode;
@Excel(name = "num")
private String num;
@Excel(name = "price")
private String price;
@Excel(name = "name")
private String name;
@Excel(name = "phone")
private String phone;
@Excel(name = "address")
private String address;
@Excel(name = "remark")
private String remark;
@Excel(name = "money")
private String money;
@Excel(name = "award")
private String award;
@Excel(name = "infoMoney")
private String infoMoney;
@Excel(name = "url")
private String url;
@Excel(name = "logistics")
private String logistics;
@Excel(name = "needHll")
private String needHll;
@Excel(name = "bh")
private String bh;
@Excel(name = "floor")
private String floor;
@Excel(name = "floorUp")
private String floorUp;
@Excel(name = "bhry")
private String bhry;
}

19
ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java
View File

@ -1,6 +1,5 @@
package com.ghy.web.pojo.vo;
import com.ghy.common.core.domain.BaseEntity;
import com.ghy.worker.domain.Worker;
import lombok.Data;
@ -11,7 +10,7 @@ import java.util.List;
* @date : 2022-06-24 17:38
*/
@Data
public class WorkerListRequest extends BaseEntity {
public class WorkerListRequest {
private Long areaId;
private List<Long> areaIds;
@ -20,25 +19,9 @@ public class WorkerListRequest extends BaseEntity {
private String workerName;
private String workerPhone;
private Long workerId;
private Long exceptParentAreaId;
private boolean justShowCurWorkerArea;
private String keyWords;
private String provinceId;
private String cityId;
private String districtId;
private String streetId;
private String categoryLevel1;
private String categoryLevel2;
}

14
ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerSettledRequest.java
View File

@ -21,21 +21,9 @@ public class WorkerSettledRequest {
// 入驻区域
private List<WorkerArea> workerAreas;
// 入驻商品区域
private List<WorkerArea> workerGoodsAreas;
// 入驻服务类目
private List<WorkerGoodsCategory> serviceCategories;
// 入驻商品类目
// 服务品类
private List<WorkerGoodsCategory> goodsCategories;
// 入驻服务类目ID列表（兼容旧版本）
private List<Long> serviceCategoryIds;
// 入驻商品类目ID列表（兼容旧版本）
private List<Long> goodsCategoryIds;
// 特殊技能
// private List<WorkerSpecialSkill> specialSkills;
}

14
ghy-admin/src/main/java/com/ghy/web/service/AliCloudService.java
View File

@ -1,14 +0,0 @@
package com.ghy.web.service;
import com.ghy.web.pojo.vo.CertNoTwoElementReq;
import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>阿里云api合集,二次包装在服务内</p>
* @author clunt
*/
public interface AliCloudService {
void certNoTwoElementVerification(@RequestBody CertNoTwoElementReq certNoTwoElementReq) throws Exception;
}

13
ghy-admin/src/main/java/com/ghy/web/service/InsuranceService.java
View File

@ -1,13 +0,0 @@
package com.ghy.web.service;
import com.ghy.order.domain.OrderDetailInsuranceUser;
public interface InsuranceService {
void clockInsurance(Long orderDetailId) throws Exception;
void orderInsurance(String orderCode) throws Exception;
void editInsurance(OrderDetailInsuranceUser orderDetailInsuranceUser) throws Exception ;
}

38
ghy-admin/src/main/java/com/ghy/web/service/impl/AliCloudServiceImpl.java
View File

@ -1,38 +0,0 @@
package com.ghy.web.service.impl;
import cn.hutool.core.lang.Assert;
import cn.hutool.json.JSONUtil;
import com.aliyun.dytnsapi20200217.Client;
import com.aliyun.dytnsapi20200217.models.CertNoTwoElementVerificationRequest;
import com.aliyun.dytnsapi20200217.models.CertNoTwoElementVerificationResponse;
import com.ghy.web.core.config.AliApiConfig;
import com.ghy.web.pojo.vo.CertNoTwoElementReq;
import com.ghy.web.service.AliCloudService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class AliCloudServiceImpl implements AliCloudService {
private final AliApiConfig aliApiConfig;
@Override
public void certNoTwoElementVerification(CertNoTwoElementReq certNoTwoElementReq) throws Exception{
// 校验是否是历史记录
Client client = aliApiConfig.createClient();
CertNoTwoElementVerificationRequest request = new CertNoTwoElementVerificationRequest();
request.setAuthCode(aliApiConfig.getAuthCode());
request.setCertNo(certNoTwoElementReq.getCertNo());
request.setCertName(certNoTwoElementReq.getCertName());
log.info("调用身份证二要素校验接口,入参:{}", certNoTwoElementReq);
CertNoTwoElementVerificationResponse response =client.certNoTwoElementVerification(request);
log.info("调用身份证二要素校验接口,响应:{}", JSONUtil.toJsonStr(response.getBody()));
Assert.isTrue("OK".equals(response.getBody().getCode()), Exception::new);
Assert.isTrue("1".equals(response.getBody().getData().getIsConsistent()), "身份二要素验证失败!");
}
}

153
ghy-admin/src/main/java/com/ghy/web/service/impl/InsuranceServiceImpl.java
View File

@ -1,153 +0,0 @@
package com.ghy.web.service.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.ghy.common.utils.security.Md5Utils;
import com.ghy.customer.domain.CustomerAddress;
import com.ghy.customer.service.CustomerAddressService;
import com.ghy.order.domain.OrderDetail;
import com.ghy.order.domain.OrderDetailInsuranceUser;
import com.ghy.order.domain.OrderMaster;
import com.ghy.order.service.IOrderDetailInsuranceUserService;
import com.ghy.order.service.OrderDetailService;
import com.ghy.order.service.OrderMasterService;
import com.ghy.web.pojo.vo.CertNoTwoElementReq;
import com.ghy.web.pojo.vo.InsuranceOrderEditReq;
import com.ghy.web.pojo.vo.InsuranceOrderReq;
import com.ghy.web.service.InsuranceService;
import com.ghy.worker.domain.Worker;
import com.ghy.worker.domain.WorkerCertification;
import com.ghy.worker.service.IWorkerCertificationService;
import com.ghy.worker.service.WorkerService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
@Slf4j
@Service
public class InsuranceServiceImpl implements InsuranceService {
private final static String Key = "96ndsd26k25jm";
private final static String baseUrl = "https://pre-hbhp-xianding.hzins.com/api/external/";
@Autowired
private OrderMasterService orderMasterService;
@Autowired
private CustomerAddressService customerAddressService;
@Autowired
private WorkerService workerService;
@Autowired
private OrderDetailService orderDetailService;
@Autowired
private IOrderDetailInsuranceUserService orderDetailInsuranceUserService;
@Override
public void orderInsurance(String orderCode) throws Exception{
InsuranceOrderReq req = new InsuranceOrderReq();
OrderMaster master = orderMasterService.selectByCode(orderCode);
if(master.getInsuranceId() == null){
return;
}
req.setOrderNumber(master.getCode());
req.setRequestNo(master.getCode() + System.currentTimeMillis());
req.setSign(Md5Utils.hash(req.getRequestNo() + req.getChannelCode() + Key));
// 查询客户地址信息
CustomerAddress customerAddress = customerAddressService.selectByCustomerAddressId(master.getAddressId());
req.setCustomerAddress(customerAddress.getAddress());
req.setCustomerPhone(customerAddress.getPhone());
// 查师傅信息
Worker worker = workerService.selectById(master.getWorkerId());
CertNoTwoElementReq certNoTwoElementReq = JSONUtil.toBean(worker.getRemark(), CertNoTwoElementReq.class);
req.setWorkerID(certNoTwoElementReq.getCertNo());
req.setWorkName(certNoTwoElementReq.getCertName());
req.setOrderStartat(DateUtil.format(DateUtil.offset(new Date(), DateField.SECOND, 30), DatePattern.NORM_DATETIME_PATTERN));
req.setOrderEndat(DateUtil.format(DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, 30),DatePattern.NORM_DATETIME_PATTERN));
log.info("调用保险请求url:{},内容:{}", baseUrl+"/platInterface/order", JSONUtil.toJsonStr(req));
String result = HttpUtil.post(baseUrl+"/platInterface/order", JSONUtil.toJsonStr(req));
log.info("调用保险返回内容:{}", result);
if(!"1".equals(JSONObject.parseObject(result).getString("code")) && !JSONObject.parseObject(result).getString("msg").contains("已存在该工单")){
throw new Exception(JSONObject.parseObject(result).getString("msg"));
}
}
@Override
public void editInsurance(OrderDetailInsuranceUser orderDetailInsuranceUser) throws Exception {
// 查询子单
OrderDetail detail = orderDetailService.selectById(orderDetailInsuranceUser.getOrderDetailId());
// 查询主单
OrderMaster master = orderMasterService.selectById(detail.getOrderMasterId());
// 查师傅信息
Worker worker = workerService.selectById(master.getWorkerId());
CertNoTwoElementReq certNoTwoElementReq = JSONUtil.toBean(worker.getRemark(), CertNoTwoElementReq.class);
// 查询主单下的所有子单
List<OrderDetail> detailList = orderDetailService.selectByOrderMasterId(detail.getOrderMasterId());
StringBuilder workerName = new StringBuilder();
StringBuilder workerId = new StringBuilder();
// 拼上主单信息
workerName.append(certNoTwoElementReq.getCertName());
workerId.append(certNoTwoElementReq.getCertNo());
detailList.forEach(model->{
OrderDetailInsuranceUser param = new OrderDetailInsuranceUser();
param.setOrderDetailId(model.getId());
List<OrderDetailInsuranceUser> users = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(param);
if(!CollectionUtils.isEmpty(users)){
users.forEach(user->{
workerName.append(",").append(user.getName());
workerId.append(",").append(user.getIdCardNum());
});
}
});
// 再拼上 现在要加入的师傅的信息
workerName.append(",").append(orderDetailInsuranceUser.getName());
workerId.append(",").append(orderDetailInsuranceUser.getIdCardNum());
InsuranceOrderEditReq editReq = new InsuranceOrderEditReq();
editReq.setOrderNumber(master.getCode());
editReq.setRequestNo(master.getCode() + System.currentTimeMillis());
editReq.setSign(Md5Utils.hash(editReq.getRequestNo() + editReq.getChannelCode() + Key));
editReq.setOrderNumber(master.getCode());
editReq.setWorkName(workerName.toString());
editReq.setWorkerID(workerId.toString());
log.info("调用保险请求url:{},内容:{}", baseUrl+"/platInterface/updateOrder", JSONUtil.toJsonStr(editReq));
String result = HttpUtil.post(baseUrl+"/platInterface/updateOrder", JSONUtil.toJsonStr(editReq));
log.info("调用保险返回内容:{}", result);
if(!"1".equals(JSONObject.parseObject(result).getString("code"))){
throw new Exception(JSONObject.parseObject(result).getString("msg"));
}
}
@Override
public void clockInsurance(Long orderDetailId) throws Exception {
// 查询子单
OrderDetail detail = orderDetailService.selectById(orderDetailId);
// 查询主单
OrderMaster master = orderMasterService.selectById(detail.getOrderMasterId());
if(master.getInsuranceId() != null){
InsuranceOrderEditReq editReq = new InsuranceOrderEditReq();
editReq.setOrderNumber(master.getCode());
editReq.setRequestNo(master.getCode() + System.currentTimeMillis());
editReq.setSign(Md5Utils.hash(editReq.getRequestNo() + editReq.getChannelCode() + Key));
editReq.setOrderNumber(master.getCode());
editReq.setShangmenTime(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
editReq.setShangmenNum("1");
log.info("调用保险请求url:{},内容:{}", baseUrl+"/platInterface/service", JSONUtil.toJsonStr(editReq));
String result = HttpUtil.post(baseUrl+"/platInterface/service", JSONUtil.toJsonStr(editReq));
log.info("调用保险返回内容:{}", result);
if(!"1".equals(JSONObject.parseObject(result).getString("code"))){
throw new Exception(JSONObject.parseObject(result).getString("msg"));
}
}
}
}

8
ghy-admin/src/main/resources/application-druid.yml
View File

@ -24,7 +24,7 @@ shiro:
cipherKey:
session:
# Session超时时间，-1代表永不过期（默认30分钟）
expireTime: 720
expireTime: 30
# 同步session到数据库的周期（默认1分钟）
dbSyncPeriod: 1
# 相隔多久检查一次session的有效性，默认就是10分钟
@ -45,9 +45,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://8.138.169.236:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: clunt@12345
url: jdbc:mysql://103.39.234.64:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: admin
password: Clunt@12345
# 从库数据源
slave:
# 从数据源开关/默认关闭

38
ghy-admin/src/main/resources/application.yaml
View File

@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2021
# 实例演示开关
demoEnabled: false
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /home/ruoyi/uploadPath
# 获取ip地址开关
@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为80
port: 19001
port: 80
servlet:
# 应用的访问路径
context-path: /
@ -116,12 +116,12 @@ qiniu:
accessKey: 'QTNOppkvtufxTxLjt1V7YZwvzV2Rc6WLD5yXLBVY'
secretKey: 'V8SM9nkbO-dft4JmG7UaCH6RYxXdqzrvQ0zWO2W3'
bucketName: 'gqz'
mediaUrl: 'https://gqz.opsoul.com/'
mediaUrl: 'http://gqz.opsoul.com/'
adapay:
debug: true
prod-mode: true
notifyUrl: 'https://gmhl.gmjlb.com/adapay/callback'
notifyUrl: 'https://www.opsoul.com:8881/adapay/callback'
jim:
appKey: '110e8830290152d76e2f1d97'
@ -130,7 +130,7 @@ jim:
# 百度地图应用api
baidu:
ak: 'i0sdnIsMmJVik7vJhfqMHA6DmS6d0fMB'
ak: 'ZQTgMW7W0GTuE7Ripb0HDp5TqRaOI6PZ'
url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=#AK#&output=json&coordtype=wgs84ll&location='
sms:
@ -138,31 +138,3 @@ sms:
account: '8a216da85f008800015f0eb223620557'
appId: '8a216da85f008800015f0eb224db055d'
token: '3cef1bc80d814637a236d93004e7ffa5'
# 阿里云api接口, 这里是身份证二要素的
aliyun:
accessKey: LTAI5tDmv3T3Ze1Mt9wi5Be6
accessSecret: EV4dzWRfKTQaPRjf3tFziMuVBCsThU
endpoint: dytnsapi.aliyuncs.com
authCode: od2FgE9a9g
# 物流API配置
# logistics:
# kdniao:
# # 快递鸟 API配置
# appId: '1889454' # 快递鸟应用ID，需要到快递鸟官网申请
# appKey: 'b2483529-807d-49af-b0e1-1ed218baa4db' # 快递鸟API密钥，需要到快递鸟官网申请
# url: 'https://api.kdniao.com/api/dist' # 快递鸟即时查询接口地址
# 快递鸟支持两种接口：
# 1. 即时查询接口：https://api.kdniao.com/api/dist
# 2. 物流跟踪接口：https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
logistics:
# 阿里云快递查询API配置
aliyun:
# 阿里云API网关AppCode，需要在阿里云市场购买快递查询服务后获取
appCode: "78064b8aaa294f64ab07a285f129aea6"
# API主机地址
host: "https://kzexpress.market.alicloudapi.com"
# API路径
path: "/api-mall/api/express/query"

3
ghy-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js vendored
View File

@ -273,7 +273,8 @@
var _defaultRootFlag = item[options.parentCode] == '0' ||
item[options.parentCode] == 0 ||
item[options.parentCode] == null ||
item[options.parentCode] == '';
item[options.parentCode] == '' ||
$.inArray(item[options.code], parentCodes) > 0 && !rootFlag;
if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) {
rootFlag = true;
if (!target.data_list["_root_"]) {

37
ghy-admin/src/main/resources/static/css/cascader.css
View File

@ -19,33 +19,22 @@ body {
z-index: 100;
}
.cascader-wrap:after {
/*opacity: 1;*/
content: "展开";
padding: 5px 10px;
background-color: #1d85c6;
color: #feffff;
border-radius: 4px;
text-align: center;
opacity: 1;
content: "";
border-color: transparent transparent #888 transparent;
border-style: solid;
height: 0;
margin-top: -2px;
position: absolute;
top: 12%;
right: 5px;
/*border-color: transparent transparent #888 transparent;*/
/*border-style: solid;*/
/*height: 0;*/
/*margin-top: -2px;*/
/*position: absolute;*/
/*top: 50%;*/
/*right: 10px;*/
/*width: 0;*/
/*border-width: 0 4px 5px 4px;*/
/*transform: rotate(180deg);*/
top: 50%;
right: 10px;
width: 0;
border-width: 0 4px 5px 4px;
transform: rotate(180deg);
transition: all 0.1s;
}
.cascader-wrap.is-show:after {
/*transform: rotate(0deg);*/
content: "收起";
background-color: #e82d2d;
color: #feffff;
transform: rotate(0deg);
}
.cascader-wrap.is-show .eo-cascader-panel {
display: block;
@ -73,7 +62,7 @@ body {
z-index: 9;
}
.cascader-wrap.is-clear:after {
/*opacity: 0;*/
opacity: 0;
}
.eo-cascader-panel {
display: flex;

2
ghy-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -391,7 +391,7 @@ var table = {
importTemplate: function() {
$.get(activeWindow().table.options.importTemplateUrl, function(result) {
if (result.code == web_status.SUCCESS) {
window.location.href = "http://gqz.opsoul.com/%E6%89%B9%E9%87%8F%E4%B8%8B%E5%8D%95%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls";
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {

49
ghy-admin/src/main/resources/templates/add/record/add.html
View File

@ -1,49 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增发单加价记录')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-record-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">订单id：</label>
<div class="col-sm-8">
<input name="orderId" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">申请师傅：</label>
<div class="col-sm-8">
<input name="workerId" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">报价金额：</label>
<div class="col-sm-8">
<input name="addMoney" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "worker/record"
$("#form-record-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-record-add').serialize());
}
}
</script>
</body>
</html>

50
ghy-admin/src/main/resources/templates/add/record/edit.html
View File

@ -1,50 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改发单加价记录')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-record-edit" th:object="${orderAddRecord}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">订单id：</label>
<div class="col-sm-8">
<input name="orderId" th:field="*{orderId}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">申请师傅：</label>
<div class="col-sm-8">
<input name="workerId" th:field="*{workerId}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">报价金额：</label>
<div class="col-sm-8">
<input name="addMoney" th:field="*{addMoney}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "worker/record";
$("#form-record-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-record-edit').serialize());
}
}
</script>
</body>
</html>

110
ghy-admin/src/main/resources/templates/add/record/record.html
View File

@ -1,110 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('发单加价记录列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>订单id：</label>
<input type="text" name="orderId"/>
</li>
<li>
<label>申请师傅：</label>
<input type="text" name="workerId"/>
</li>
<li>
<label>报价金额：</label>
<input type="text" name="addMoney"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="worker:record:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="worker:record:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="worker:record:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="worker:record:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('worker:record:edit')}]];
var removeFlag = [[${@permission.hasPermi('worker:record:remove')}]];
var prefix = ctx + "worker/record";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "发单加价记录",
columns: [{
checkbox: true
},
{
field: 'id',
title: '主键',
visible: false
},
{
field: 'orderId',
title: '订单id'
},
{
field: 'workerId',
title: '申请师傅'
},
{
field: 'addMoney',
title: '报价金额'
},
{
field: 'status',
title: '状态 01初始 02选中'
},
{
field: 'remark',
title: '备注'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

139
ghy-admin/src/main/resources/templates/config/globalConfig/edit.html
View File

@ -1,139 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('')"/>
<th:block th:include="include :: select2-css"/>
</head>
<body>
<div class="main-content">
<form id="form-goods-add" class="form-horizontal">
<h4 class="form-header h4">基本信息</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">主订单已发布更新提示音：</label>
<div class="col-sm-8">
<input name="orderMasterHaveReleasedUrl" id="orderMasterHaveReleasedUrl" placeholder="主订单已发布更新提示音" class="form-control" type="text"
required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">主订单新订单更新提示音：</label>
<div class="col-sm-8">
<input name="orderMasterNewOrderUrl" id="orderMasterNewOrderUrl" placeholder="主订单新订单更新提示音" class="form-control" type="text"
required>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">子订单售后更新提示音：</label>
<div class="col-sm-8">
<input name="orderDetailsAfterUrl" id="orderDetailsAfterUrl" placeholder="子订单售后更新提示音" class="form-control" type="text"
required>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">子订单售后纠纷更新提示音：</label>
<div class="col-sm-8">
<input name="orderDetailsAfterSalesDisputeUrl" id="orderDetailsAfterSalesDisputeUrl" placeholder="子订单售后纠纷更新提示音" class="form-control" type="text"
required>
</div>
</div>
</div>
</div>
<a class="btn btn-primary btn-rounded btn-sm" onclick="tijiao()">提交</a>
</form>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: select2-js"/>
<script>
var prefix = ctx + "goods/goods";
var id = "";
var name = "";
var sort = "";
var describe = "";
var type = "";
var dataType = "";
var configUnit = "";
//请求接口加载页面输入框值
function globalConfiginit(){
$.ajax({
type: "GET",
dataType:"json",
url: "/config/globalConfig/search/type/1001",
data: { },
success: function (data) {
id = data.data.id;
name = data.data.name;
sort = data.data.sort;
describe = data.data.describe;
type = data.data.type;
dataType = data.data.dataType;
configUnit = data.data.configUnit;
//alert(data.data.content);
var response = JSON.parse(data.data.content);
$('#orderMasterHaveReleasedUrl').val(response.orderMasterHaveReleasedUrl);
$('#orderMasterNewOrderUrl').val(response.orderMasterNewOrderUrl);
$('#orderDetailsAfterUrl').val(response.orderDetailsAfterUrl);
$('#orderDetailsAfterSalesDisputeUrl').val(response.orderDetailsAfterSalesDisputeUrl);
}
})
}
//页面加载
window.onload = function () {
//请求接口加载页面输入框值
globalConfiginit();
}
//提交按钮
function tijiao(){
$.ajax({
type: "PUT",
dataType:"json",
contentType: 'application/json',
url: "/config/globalConfig/update",
data: JSON.stringify({
id: id,
name: name,
content: JSON.stringify({
"orderMasterHaveReleasedUrl":$('#orderMasterHaveReleasedUrl').val(),
"orderMasterNewOrderUrl":$('#orderMasterNewOrderUrl').val(),
"orderDetailsAfterUrl":$('#orderDetailsAfterUrl').val(),
"orderDetailsAfterSalesDisputeUrl":$('#orderDetailsAfterSalesDisputeUrl').val()
}),
sort: sort,
describe: describe,
type: type,
dataType: dataType,
unit: configUnit
}),
success: function (data) {
if(data.code == 0){
//请求接口加载页面输入框值
globalConfiginit();
alert("成功");
}else {
alert("失败");
}
}
})
}
</script>
</body>
</html>

30
ghy-admin/src/main/resources/templates/customer/changePlace.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改上级分销')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-change-insurance">
<input name="customerId" type="hidden" th:value="${customerId}" />
<div class="form-group">
<label class="col-sm-3 control-label">上级分销：</label>
<div class="col-sm-8">
<select id="customerPlace" name="customerPlace" class="form-control control-label" required>
<option th:each="customerPlace:${customerPlaces}" th:value="${customerPlace.customerId}" th:text="${customerPlace.phone} + ${customerPlace.placeName}" ></option>
</select>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
function submitHandler() {
if ($.validate.form()) {
$.operate.save(ctx + "customer/changePlace", $('#form-change-insurance').serialize());
}
}
</script>
</body>
</html>

25
ghy-admin/src/main/resources/templates/customer/customer.html
View File

@ -118,22 +118,6 @@
field: 'phone',
title: '手机号'
},
{
field: 'customerPlaceName',
title: '上级分销'
},
{
field: 'customerPlacePhone',
title: '上级手机号'
},
{
field: 'parentCustomerPlaceName',
title: '最上级分销'
},
{
field: 'parentCustomerPlacePhone',
title: '最上级手机号'
},
{
field: 'openId',
title: '微信唯一id',
@ -146,8 +130,7 @@
var actions = [];
actions.push('<img class="img-circle" src="' + row.customerLogoUrl + '" alt="消费者头像" />');
return actions.join('');
},
visible: false
}
},
{
visible: editFlag == 'hidden' ? false : true,
@ -168,7 +151,6 @@
formatter: function(value, row, index) {
if (row.customerId != 1) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="changePlace(\'' + row.customerId + '\')"></i>修改上级分销</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.customerId + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join('');
} else {
@ -180,11 +162,6 @@
$.table.init(options);
}
function changePlace(customerId) {
var url = ctx + "customer/changePlace/" + customerId;
$.modal.open("修改上级分销", url, '600', '300');
}
/* 用户管理-重置密码 */
function resetPwd(customerId) {

36
ghy-admin/src/main/resources/templates/customer/place/place.html
View File

@ -42,9 +42,9 @@
<a class="btn btn-danger multiple disabled" onclick="auditStatus(1)" shiro:hasPermission="customer:place:remove">
<i class="fa fa-remove"></i> 拒绝
</a>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="customer:place:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="customer:place:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="customer:place:export">
<i class="fa fa-download"></i> 导出
</a>
@ -79,33 +79,17 @@
field: 'name',
title: '名字'
},
// {
// field: 'customerId',
// title: '关联消费者id'
// },
{
field: 'customerId',
title: '关联消费者id'
},
{
field: 'phone',
title: '注册手机号'
},
{
field: 'customerPlaceName',
title: '上级分销'
},
{
field: 'customerPlacePhone',
title: '上级手机号'
},
{
field: 'parentCustomerPlaceName',
title: '最上级分销'
},
{
field: 'parentCustomerPlacePhone',
title: '最上级手机号'
},
{
field: 'cityName',
title: '城市名'
field: 'city',
title: '城市id'
},
{
field: 'status',
@ -123,7 +107,7 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}

43
ghy-admin/src/main/resources/templates/goods/category/add.html
View File

@ -46,18 +46,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">保险设定：</label>
<div class="col-xs-10">
<label th:each="insurance:${insurances}" class="check-box">
<input name="insurance" type="checkbox" th:value="${insurance.id}" th:text="${insurance.companyName}">
</label>
</div>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
@ -99,39 +87,10 @@
function submitHandler() {
if ($.validate.form()) {
// 方法一：使用saveModal，新增成功后不刷新表格，只显示提示信息
//$.operate.saveModal(prefix + "/add", $('#form-dept-add').serialize());
// 方法二：使用自定义Ajax保存（如果需要更多控制）
customSave();
$.operate.save(prefix + "/add", $('#form-dept-add').serialize());
}
}
// 自定义保存方法（可选）
function customSave() {
$.ajax({
url: prefix + "/add",
type: "post",
dataType: "json",
data: $('#form-dept-add').serialize(),
beforeSend: function () {
$.modal.loading("正在处理中，请稍候...");
},
success: function(result) {
$.modal.closeLoading();
if (result.code == web_status.SUCCESS) {
$.modal.alertSuccess(result.msg);
// 如果需要关闭窗口，取消注释下面这行
$.modal.close();
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg);
} else {
$.modal.alertError(result.msg);
}
}
});
}
/*部门管理-新增-选择父部门树*/
function selectDeptTree() {
var treeId = $("#treeId").val();

25
ghy-admin/src/main/resources/templates/goods/category/category.html
View File

@ -124,29 +124,8 @@
function remove(id) {
$.modal.confirm("确认要删除吗", function () {
customRemove(id);
});
}
function customRemove(id) {
$.ajax({
url: prefix + '/remove/' + id,
type: "post",
dataType: "json",
beforeSend: function () {
$.modal.loading("正在处理中，请稍候...");
},
success: function(result) {
$.modal.closeLoading();
if (result.code == web_status.SUCCESS) {
$.modal.alertSuccess(result.msg);
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg);
} else {
$.modal.alertError(result.msg);
}
}
});
$.operate.post(prefix + '/remove/' + id);
})
}
</script>
</body>

64
ghy-admin/src/main/resources/templates/goods/category/edit.html
View File

@ -17,15 +17,15 @@
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">上级类目：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group">-->
<!-- <input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${goodsCategoryName}" required>-->
<!-- <span class="input-group-addon"><i class="fa fa-search"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">上级类目：</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${goodsCategoryName}" required>
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">类别名称：</label>
<div class="col-sm-8">
@ -48,8 +48,7 @@
<label class="col-sm-3 control-label">类目类别：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('goods_category_type')}">
<input type="radio" th:id="${dict.dictCode}" name="type" th:value="${dict.dictValue}"
th:checked="${goodsCategory.type != null ? goodsCategory.type.toString() == dict.dictValue : dict.default}">
<input type="radio" th:id="${dict.dictCode}" name="type" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
@ -63,18 +62,6 @@
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-2 control-label">保险设定：</label>
<div class="col-xs-10">
<label th:each="insurance:${insurances}" class="check-box">
<input name="insurance" type="checkbox" th:value="${insurance.id}" th:text="${insurance.companyName}" th:checked="${insurance.flag}">
</label>
</div>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
@ -116,39 +103,10 @@
function submitHandler() {
if ($.validate.form()) {
var data = $("#form-dept-edit").serializeArray();
var insuranceIds = $.form.selectCheckeds("insurance");
data.push({"name": "insuranceIds", "value": insuranceIds});
// 自定义保存，不刷新表格
customEditSave(data);
$.operate.save(prefix + "/edit", $('#form-dept-edit').serialize());
}
}
// 自定义编辑保存方法
function customEditSave(data) {
$.ajax({
url: prefix + "/edit",
type: "post",
dataType: "json",
data: data,
beforeSend: function () {
$.modal.loading("正在处理中，请稍候...");
},
success: function(result) {
$.modal.closeLoading();
if (result.code == web_status.SUCCESS) {
$.modal.alertSuccess(result.msg);
$.modal.close();
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg);
} else {
$.modal.alertError(result.msg);
}
}
});
}
/*部门管理-修改-选择部门树*/
function selectDeptTree() {
var treeId = $("#treeId").val();

69
ghy-admin/src/main/resources/templates/goods/category/serviceTree.html
View File

@ -1,69 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('选择服务类目')" />
<th:block th:include="include :: ztree-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-tree">
<div class="form-group">
<label class="col-sm-3 control-label">服务类目：</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" id="treeName" readonly="true">
<input type="hidden" id="treeId">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-8">
<div id="tree" class="ztree"></div>
</div>
</div>
<!-- <div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭</button>
</div>
</div> -->
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: ztree-js" />
<script type="text/javascript">
$(function() {
var url = ctx + "goods/category/serviceTreeData";
var options = {
url: url,
expandLevel: 2,
onClick : zOnClick
};
$.tree.init(options);
});
function zOnClick(event, treeId, treeNode) {
$("#treeId").val(treeNode.id);
$("#treeName").val(treeNode.name);
}
function submitHandler() {
var treeId = $("#treeId").val();
var treeName = $("#treeName").val();
if (treeId == "" || treeName == "") {
$.modal.alertWarning("请选择服务类目");
return;
}
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
}
function closeItem() {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
}
</script>
</body>
</html>

4
ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
View File

@ -145,7 +145,9 @@
formatter: function (value, row, index) {
if (row.parentId !== 0) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deptGoodsCategoryId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.deptGoodsCategoryId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
// actions.push('<a class="btn btn-info btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.deptGoodsCategoryId + '\')"><i class="fa fa-plus"></i>新增</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="remove(\'' + row.deptGoodsCategoryId + '\')"><i class="fa fa-trash"></i>删除</a>');
return actions.join('');
} else {
return "";

74
ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html
View File

@ -11,7 +11,6 @@
<div class="main-content">
<form class="form-horizontal" id="form-deptGoodsCategory-edit" th:object="${deptGoodsCategory}">
<input id="deptGoodsCategoryId" name="deptGoodsCategoryId" type="hidden" th:field="*{deptGoodsCategoryId}"/>
<input id="type" name="type" type="hidden" th:field="*{type}"/>
<div class="row">
<div class="col-sm-6">
@ -24,19 +23,6 @@
</div>
</div>
</div>
<div class="col-sm-6" th:if="*{type != 1}">
<div class="form-group">
<label class="col-sm-6 control-label">服务类目：</label>
<div class="col-sm-6">
<div class="input-group">
<input class="form-control" type="text" onclick="selectServiceCategoryTree()" id="treeName" readonly="true" th:value="*{serviceCategoryName}">
<input type="hidden" id="treeId" name="serviceCategoryId" th:value="*{serviceCategoryId}">
<input type="hidden" id="serviceCategoryName" name="serviceCategoryName" th:value="*{serviceCategoryName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
@ -254,38 +240,12 @@
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-6 control-label">倒计时小时数：</label>
<label class="col-sm-6 control-label">是否需要保险：</label>
<div class="col-sm-6">
<input name="countdownHours" placeholder="请输入倒计时小时数" class="form-control" type="number" min="1" max="168"
th:field="*{countdownHours}">
</div>
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-3 control-label">PC保险设定：</label>
<div class="col-xs-9">
<label th:each="insurance:${pcInsurances}" class="check-box">
<input name="pcInsurance" type="checkbox" th:value="${insurance.id}" th:text="${insurance.insuranceName}" th:checked="${insurance.flag}">
</label>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-xs-3 control-label">商城保险设定：</label>
<div class="col-xs-9">
<label th:each="insurance:${shopInsurances}" class="check-box">
<input name="shopInsurance" type="checkbox" th:value="${insurance.id}" th:text="${insurance.insuranceName}" th:checked="${insurance.flag}">
</label>
</div>
<select name="isSure" class="form-control m-b" th:field="*{isSure}" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:text="否" th:value="0"/>
<option th:text="是" th:value="1"/>
</select>
</div>
</div>
</div>
@ -333,10 +293,6 @@
function submitHandler() {
if ($.validate.form()) {
var data = $("#form-deptGoodsCategory-edit").serializeArray();
var pcInsuranceIds = $.form.selectCheckeds("pcInsurance");
var shopInsuranceIds = $.form.selectCheckeds("shopInsurance");
data.push({"name": "pcInsuranceIds", "value": pcInsuranceIds});
data.push({"name": "shopInsuranceIds", "value": shopInsuranceIds});
$.operate.saveTab(prefix + "/edit", data);
$.modal.close();
}
@ -398,26 +354,6 @@
}
});
/*选择服务类目树*/
function selectServiceCategoryTree() {
var treeId = $("#treeId").val();
var options = {
title: '服务类目选择',
width: "380",
url: ctx + "goods/category/selectServiceCategoryTree",
callBack: doSubmit
};
$.modal.openOptions(options);
}
function doSubmit(index, layero) {
var body = $.modal.getChildFrame(index);
$("#treeId").val(body.find('#treeId').val());
$("#treeName").val(body.find('#treeName').val());
$("#serviceCategoryName").val(body.find('#treeName').val());
$.modal.close(index);
}
</script>
</body>
</html>

55
ghy-admin/src/main/resources/templates/goods/manager/add.html
View File

@ -1,55 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增保险管理')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-manager-add">
<div class="form-group">
<label class="col-sm-3 control-label">保险公司名称：</label>
<div class="col-sm-8">
<input name="companyName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保险项目名称：</label>
<div class="col-sm-8">
<input name="insuranceName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">保险费用：</label>
<div class="col-sm-8">
<input name="insuranceAmount" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保险条例url：</label>
<div class="col-sm-8">
<textarea name="insuranceUrl" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "goods/manager"
$("#form-manager-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-manager-add').serialize());
}
}
</script>
</body>
</html>

56
ghy-admin/src/main/resources/templates/goods/manager/edit.html
View File

@ -1,56 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改保险管理')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-manager-edit" th:object="${insuranceManager}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">保险公司名称：</label>
<div class="col-sm-8">
<input name="companyName" th:field="*{companyName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保险项目名称：</label>
<div class="col-sm-8">
<input name="insuranceName" th:field="*{insuranceName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">保险费用：</label>
<div class="col-sm-8">
<input name="insuranceAmount" th:field="*{insuranceAmount}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">保险条例url：</label>
<div class="col-sm-8">
<textarea name="insuranceUrl" class="form-control">[[*{insuranceUrl}]]</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "goods/manager";
$("#form-manager-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-manager-edit').serialize());
}
}
</script>
</body>
</html>

110
ghy-admin/src/main/resources/templates/goods/manager/manager.html
View File

@ -1,110 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('保险管理列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>保险公司名称：</label>
<input type="text" name="companyName"/>
</li>
<li>
<label>保险项目名称：</label>
<input type="text" name="insuranceName"/>
</li>
<li>
<label>保险费用：</label>
<input type="text" name="insuranceAmount"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="goods:manager:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="goods:manager:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goods:manager:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="goods:manager:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('goods:manager:edit')}]];
var removeFlag = [[${@permission.hasPermi('goods:manager:remove')}]];
var prefix = ctx + "goods/manager";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "保险管理",
columns: [{
checkbox: true
},
{
field: 'id',
title: '主键',
visible: false
},
{
field: 'companyName',
title: '保险公司名称'
},
{
field: 'insuranceName',
title: '保险项目名称'
},
{
field: 'insuranceAmount',
title: '保险费用'
},
{
field: 'insuranceUrl',
title: '保险条例url'
},
{
field: 'remark',
title: '备注'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

53
ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html
View File

@ -180,12 +180,15 @@
</div>
<div class="col-sm-4">
<select class="form-control" name="servTime" required>
<option value="08:00-10:00">08:00-10:00</option>
<option value="10:00-12:00">10:00-12:00</option>
<option value="12:00-14:00">12:00-14:00</option>
<option value="14:00-16:00">14:00-16:00</option>
<option value="16:00-18:00">16:00-18:00</option>
<option value="18:00-20:00">18:00-20:00</option>
<option value="8:00-12:00">8:00-12:00</option>
<option value="8:00-12:00">12:00-16:00</option>
<option value="8:00-12:00">16:00-20:00</option>
<option value="8:00-12:00">8:00-10:00</option>
<option value="8:00-12:00">10:00-12:00</option>
<option value="8:00-12:00">12:00-14:00</option>
<option value="8:00-12:00">14:00-16:00</option>
<option value="8:00-12:00">16:00-18:00</option>
<option value="8:00-12:00">18:00-20:00</option>
</select>
</div>
</div>
@ -245,13 +248,13 @@
<label class="col-sm-2 control-label is-required">下单模式：</label>
<div class="col-sm-8 row" id="orderModeRadioGroup">
<div class="col-sm-2">
<label><input type="radio" value="02" name="orderMode" checked > 带价发布</label>
<label><input id="publishWithPrice" type="radio" value="02" name="orderMode" checked onclick="selectPublishWithPrice(this)"> 带价发布</label>
</div>
<div class="col-sm-2">
<label><input type="radio" value="01" name="orderMode"> 一票价发布</label>
</div>
<div class="col-sm-2">
<label><input type="radio" value="03" name="orderMode"> 回收模式</label>
<label><input type="radio" value="01" name="orderMode"> 回收模式</label>
</div>
</div>
</div>
@ -342,15 +345,10 @@
<span class="yuan-symbol">¥</span>
<span class="yuan-symbol" id="totalMoney">0</span>
</div>
<div class="oper-banner-end col-sm-5" >
<div class="oper-banner-end col-sm-5">
<div class="m-r">
<div class="checkbox">
<a href="#" shiro:hasPermission="consult:order:add"><input id="consultOrder" type="checkbox" value="02" name="consultOrder" onclick="changeConsultOrder(this)" >合约订单</a>
</div>
</div>
<div class="m-r">
<div class="checkbox">
<label><input id="payOnDoorMode" type="checkbox" value="02" name="payMode" onclick="changePayOnDoorMode(this)">上门到付/保外单</label>
<label><input id="payOnDoorMode" type="checkbox" value="02" name="orderMode" onclick="changePayOnDoorMode(this)">上门到付/保外单</label>
</div>
</div>
<div class="m-r">
@ -535,21 +533,16 @@
<!-- })-->
<!-- }-->
function changeConsultOrder(e){
if ($(e).is(':checked')) {
$('#consultOrder').prop("value", '01');
} else {
$('#consultOrder').prop("value", '02');
}
function selectPublishWithPrice(e) {
<!-- if ($(e).is(':checked')) {-->
<!-- $('#payOnDoorMode').prop("checked", false);-->
<!-- }-->
}
function changePayOnDoorMode(e) {
if ($(e).is(':checked')) {
$('#payOnDoorMode').prop("value", '01');
} else {
$('#payOnDoorMode').prop("value", '02');
}
<!-- if ($(e).is(':checked')) {-->
<!-- $('#publishWithPrice').prop("checked", false);-->
<!-- }-->
}
function validSpecialComponent() {
@ -604,8 +597,6 @@
params.cityId = areaCascader.getCheckedPaths()[0][1];
params.districtId = areaCascader.getCheckedPaths()[0][2];
params.streetId = areaCascader.getCheckedPaths()[0][3];
params.payMode = $('#payOnDoorMode').val();
params.consultMode = $('#consultOrder').val();
return params;
}
@ -664,7 +655,7 @@
}
});
} else {
$.modal.msgError(result.msg)
$.modal.msgError("请求失败")
}
}
})
@ -689,7 +680,7 @@
if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("提交成功")
} else {
$.modal.msgError(result.msg)
$.modal.msgError("请求失败")
}
}
})

2
ghy-admin/src/main/resources/templates/include.html
View File

@ -30,7 +30,7 @@
<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.19.3}"></script>
<script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.19.3}"></script>
<!-- bootstrap-table 表格树插件 -->
<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js?v=1.18.3}"></script>
<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js?v=1.18.3}"></script>
<!-- 遮罩层 -->
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>

7
ghy-admin/src/main/resources/templates/login.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>叮咚工链</title>
<title>追风者</title>
<meta name="description" content="后台管理框架">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@ -64,9 +64,8 @@
</div>
<div class="signup-footer">
<div class="pull-left">
Copyright © 2018-2021 gmjlb.com All Rights Reserved. <br>
<a href="https://beian.miit.gov.cn/" target="_blank">备案号:</a>
<a href="https://beian.miit.gov.cn/" target="_blank">桂ICP备2024024616号-3</a>
Copyright © 2018-2021 opsoul.com All Rights Reserved. <br>
备案号 粤ICP备2021044349号-1
</div>
</div>
</div>

4
ghy-admin/src/main/resources/templates/order/assignWholeOrder.html
View File

@ -89,8 +89,8 @@
</div>
</div>
<div class="flex-board input-content m-t">
<label class="form-control-label">名称/手机号：</label>
<input name="keyWords" type="text" class="form-control normal-input m-r">
<label class="form-control-label">人员名称：</label>
<input name="workerName" type="text" class="form-control normal-input m-r">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('workerForm')"><i

36
ghy-admin/src/main/resources/templates/order/batchChangePrice.html
View File

@ -1,36 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('批量改价')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-change-price">
<input name="orderIds" type="hidden" th:value="${orderIds}" />
<div class="form-group">
<label class="col-sm-3 control-label">输入修改后价格：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="changePrice" id="changePrice">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
$("#changePrice").validate({
rules:{
changePrice:{
required:true
},
}
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(ctx + "order/master/batchChangePrice", $('#form-change-price').serialize());
}
}
</script>
</body>
</html>

30
ghy-admin/src/main/resources/templates/order/batchPcOrderInsurance.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('选择保险')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-change-insurance">
<input name="orderMasterIds" type="hidden" th:value="${orderIds}" />
<div class="form-group">
<label class="col-sm-3 control-label">保险：</label>
<div class="col-sm-8">
<select id="insuranceId" name="insuranceId" class="form-control control-label" required>
<option th:each="insurance:${insurances}" th:value="${insurance.id}" th:text="${insurance.insuranceName}" ></option>
</select>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
function submitHandler() {
if ($.validate.form()) {
$.operate.save(ctx + "order/master/pcOrderWorker/batchChangeInsurance", $('#form-change-insurance').serialize());
}
}
</script>
</body>
</html>

77
ghy-admin/src/main/resources/templates/order/imgs.html
View File

@ -1,77 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('完单图片')"/>
<th:block th:include="include :: layout-latest-css"/>
</head>
<body class="gray-bg">
<div class="ui-layout-center">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="order-goods-form">
<!-- <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<script th:inline="javascript">
var prefix = ctx + "order/imgs";
var orderId = '[[${orderId}]]';
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 185});
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win: $('.ui-layout-center'),
doc: $('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryOrderCallList();
});
function queryOrderCallList() {
var options = {
url: prefix + "/list?remark=" + orderId,
modalName: "完单图片记录",
search: false,
showSearch: false,
showToggle: false,
showColumns: false,
showRefresh: false,
columns: [
{
field: 'imgUrl',
title: '完单图片',
formatter: function(value) {
if (value != null && value !== ''){return '<a target="_blank" href="' + value+ '" >查看图片<a/>';}
else {return '<a>无<a/>'}
}
}
]
};
$.table.init(options);
}
</script>
</body>
</html>

572
ghy-admin/src/main/resources/templates/order/master.html
View File

@ -73,35 +73,31 @@
<option value="">全部</option>
<option value="">在途</option>
</select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待付款', sysPayStatus: 0})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {sysPayStatus: 0})">
待付款
(<span id="nonPaidOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待约单', orderStatus: 1, isCall : '01'})">
待约单
(<span id="notCallOrderNum">0</span>)
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})">
已接单
(<span id="acceptedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待排期', orderStatus: 1, isCall : '02'})">
待排期
(<span id="notSetTimeOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待上门', orderStatus: 2})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})">
待上门
(<span id="waitForDoorOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '进行中', orderStatus: 3})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})">
进行中
(<span id="servingOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '确认审核', orderStatus: 4})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})">
确认审核
(<span class="confirmingOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '完成', orderStatus: 5})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})">
完成
(<span id="finishedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '关闭', orderStatus: 6})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})">
关闭
(<span id="canceledOrderNum">0</span>)
</a>
@ -113,21 +109,21 @@
明日待上门
(<span id="tomorrowOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后', searchAfterList: true})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {searchAfterList: true})">
售后
(<span id="afterServiceOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '急报中', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
急报中
(<span>0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '退单', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
退单
(<span>0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后纠纷', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
售后纠纷
(<span id="afterServiceDisputeNum">0</span>)
(<span>0</span>)
</a>
</div>
<div class="flex-board">
@ -260,13 +256,13 @@
接单超时
(<span id="newTimeoutOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '01'})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})">
约单超时
(<span id="acceptedTimeoutOrderNum">0</span>)
(<span class="acceptedTimeoutOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '02'})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})">
排单超时
(<span id="plainTimeoutOrderNum">0</span>)
(<span class="acceptedTimeoutOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
无法排单
@ -417,36 +413,7 @@
}
})
$.ajax({
type: "GET",
dataType:"json",
data: {isCall: '01'},
url: prefix + '/differentStatus/count',
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#notCallOrderNum').text(result.data.acceptedOrderNum);
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
$.ajax({
type: "GET",
dataType:"json",
data: {isCall: '02'},
url: prefix + '/differentStatus/count',
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#notSetTimeOrderNum').text(result.data.acceptedOrderNum);
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
<!-- 不同状态超时订单数量统计-->
$.ajax({
type: "GET",
dataType:"json",
@ -455,6 +422,7 @@
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#newTimeoutOrderNum').text(result.data.newOrderNum);
$('.acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum);
$('#servingTimeoutOrderNum').text(result.data.servingOrderNum);
$('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum);
} else {
@ -463,34 +431,7 @@
}
})
$.ajax({
type: "GET",
dataType:"json",
url: prefix + '/differentStatus/count',
data: {timeout: 1, isCall : '01'},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum);
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
$.ajax({
type: "GET",
dataType:"json",
url: prefix + '/differentStatus/count',
data: {timeout: 1, isCall : '02'},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#plainTimeoutOrderNum').text(result.data.acceptedOrderNum);
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
<!-- 待付款订单数量统计-->
$.ajax({
type: "GET",
dataType:"json",
@ -505,6 +446,7 @@
}
})
<!-- 今日和明日单数量统计-->
var date = new Date();
$.ajax({
type: "GET",
@ -541,6 +483,7 @@
}
})
<!-- 售后订单数量统计-->
$.ajax({
type: "GET",
dataType:"json",
@ -553,20 +496,6 @@
}
}
})
// 售后纠纷数量统计
$.ajax({
type: "GET",
dataType:"json",
url: prefix + '/after/dispute/count',
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#afterServiceDisputeNum').text(result.data);
} else {
$.modal.msgError("售后纠纷数量加载错误，请重试！")
}
}
})
});
function changeOrderMode(orderMode) {
@ -626,12 +555,6 @@
{
checkbox: true
},
{
title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}
},
{
field: 'id',
title: '订单ID',
@ -644,14 +567,15 @@
return '<div style="display:flex;justify-content: center;align-items: center;">'
+ '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
+ '<div>'
+ '<p> ' + row.code + '<p/>'
+ '<p> ' + row.consoleGoodsName + '<p/>'
+ '<p> 联系人：' + row.addressName + '</p>'
+ '<p> 联系电话：' + row.addressPhone + '</p>'
+ '<p> 联系地址：' + row.address + '</p>'
+ '<p> 下单时间：' + row.createTime + '</p>'
+ '<p> 预约时间：' + row.mixExpectTime + '</p>'
+ '<p> 总金额：' + row.financialMasterMoney + '元 应得金额：' + row.financialDetailMoney + '元</p>'
+ '<small> 订单编号：' + row.code + '<small/> <br>'
+ '<h4> ' + value.goodsName + '<h4/>'
// + '<small> ' + value.goodsDesc + '</small> <br>'
+ '<small>' + row.addressName + '</small> <br>'
+ '<small>' + row.addressPhone + '</small> <br>'
+ '<small>' + row.address + '</small> <br>'
+ '<small> 下单时间：' + row.createTime + '</small> <br>'
+ '<small> 预约时间：' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '</small> <br>'
+ '<small> 总金额：' + row.financialMasterMoney + '元 应得金额：' + row.financialDetailMoney + '元</small> <br>'
+ '</div>'
+ '</div>';
}
@ -661,90 +585,49 @@
title: '订单状态',
align: 'center',
formatter: function (value, row, index) {
if(row.orderStatusName){
return row.orderStatusName;
}else {
return $.table.selectDictLabel(orderStatus, value);
}
}
},
{
field: 'goodsWorker',
title: '师傅接单信息',
formatter: function (value, row, index) {
if(value){
return '<p>' + value.name + '</p>'
+ '<p>' + value.phone + '</p>';
}
}
},
{
field: 'worker',
title: '师傅做单信息',
title: '接单信息',
formatter: function (value, row, index) {
if(value){
return '<p>' + value.name + value.phone + '</p>'
+ '<p>接单时间：' + value.createTime + '</p>';
return '<small>' + value.name + value.phone + '</small><br>'
+ '<small>接单时间：' + value.createTime + '</small>';
}
}
},
{
field: 'lastCallTime',
title: '最近联系时间'
},
{
title: '操作',
align: 'left',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-info"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="callDetail(\'' + row.orderMasterId + '\')"><i class="fa fa-info"></i>拨号详情</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderDetailReject(\'' + row.id + '\')"></i>师傅退单</a> ');
// actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.orderMasterId + '\')"></i>商家退单</a> ');
// actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showOrderWorker(\'' + row.id + '\')"></i>指派</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.orderMasterId + '\')"></i>商家退单</a> ');
<!-- actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showOrderWorker(\'' + row.id + '\')"></i>指派</a> ');-->
if (row.payStatus == 0) {
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showPayQrcode(\'' + row.id + '\')"></i>付款</a> ');
}
// 售后纠纷处理按钮
if (row.afterServiceStatus == 1) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="handleAfterServiceDispute(\'' + row.id + '\')"><i class="fa fa-gavel"></i>售后纠纷处理</a> ');
}
return actions.join('');
}
},
{
field: 'goodsWorker',
title: '商家信息',
formatter: function (value, row, index) {
if(value){
return '<small>' + value.name + '</small><br>'
+ '<small>' + value.phone + '</small>';
}
}
},
{
field: 'changeMoney',
title: '商家追加金额',
align: 'center'
},
{
field: 'orderImgs',
title: '完单图片'
},
{
field: 'orderImages',
title: '下单图片',
align: 'center',
formatter: function (value, row, index) {
if (value && value.trim() !== '') {
return '<img src="' + value + '" style="width: 50px; height: 50px; object-fit: cover;" onclick="showImagePreview(\'' + value + '\')">';
}
return '-';
}
},
{
field: 'isDeliveryToStore',
title: '是否发货到服务店',
align: 'center',
formatter: function (value, row, index) {
if (value === 1) {
return '<span class="label label-success">是</span>';
} else {
return '<span class="label label-default">否</span>';
}
}
},
{
},{
field: 'orderType',
title: '订单类型',
align: 'center',
@ -786,12 +669,6 @@
var url = "order/goods?orderId=" + id;
$.modal.open("商品信息", url);
}
function callDetail(id) {
var url = "order/record?orderId=" + id;
$.modal.open("拨号记录", url);
}
function orderDetailReject(id) {
$.modal.confirm("确定要退单吗？", function() {
const url = "detail/reject";
@ -891,359 +768,6 @@
});
}
// 子订单全部
var orderDetailsAfterUrl = "";
// 子订单新订单
var orderDetailsAfterSalesDisputeUrl = "";
//请求接口加载页面输入框值
function globalConfiginit(){
$.ajax({
type: "GET",
dataType:"json",
url: "/config/globalConfig/search/type/1001",
data: { },
success: function (data) {
var response = JSON.parse(data.data.content);
orderDetailsAfterUrl = response.orderDetailsAfterUrl;
orderDetailsAfterSalesDisputeUrl = response.orderDetailsAfterSalesDisputeUrl;
}
})
}
//页面加载
window.onload = function () {
//请求接口加载页面输入框值
globalConfiginit();
}
// 定义一个要延迟执行的函数
function delayedFunction() {
console.log("");
}
var totalOrderNumber = 0;
var inServiceNumber = 0;
var lastTotalOrderNumber = 0;
var lastInServiceNumber = 0;
function fetchData() {
$.ajax({
type: "GET",
dataType: "json",
url: "/order/detail/statistics/now",
data: {},
success: function (data) {
// 更新当前值
totalOrderNumber = data.data.totalOrderNumber;
inServiceNumber = data.data.inServiceNumber;
console.log(totalOrderNumber+"-----"+lastTotalOrderNumber );
// 检查新值是否大于旧值
if (totalOrderNumber > lastTotalOrderNumber) {
console.log("收到新子订单数据，开始播放。播放通知音频：" + orderDetailsAfterUrl);
// 获取source元素
var source = document.getElementById('myAudio');
// 设置新的音频文件路径
source.src = orderDetailsAfterUrl;
var audio = document.getElementById('myAudio');
audio.play().catch(function(error) {
console.log('播放失败：', error);
});
}
// 设置延迟时间为2000毫秒（2秒）
setTimeout(delayedFunction, 2000);
if (inServiceNumber > lastInServiceNumber) {
console.log("收到新子单数据，开始播放。播放通知音频：" + orderDetailsAfterSalesDisputeUrl);
// 获取source元素
var source = document.getElementById('myAudio');
// 设置新的音频文件路径
source.src = orderDetailsAfterSalesDisputeUrl;
var audio = document.getElementById('myAudio');
audio.play().catch(function(error) {
console.log('播放失败：', error);
});
}
// 更新上一次的值
lastTotalOrderNumber = totalOrderNumber;
lastInServiceNumber = inServiceNumber;
}
});
}
// 设置定时器，每隔一分钟执行一次 fetchData 函数
setInterval(fetchData, 60000);
// 图片预览功能
function showImagePreview(imageUrl) {
if (!imageUrl || imageUrl.trim() === '') {
$.modal.msgError("图片地址不能为空");
return;
}
layer.open({
type: 1,
title: '图片预览',
shadeClose: true,
shade: 0.8,
area: ['auto', 'auto'],
content: '<div style="text-align: center; padding: 20px;"><img src="' + imageUrl + '" style="max-width: 800px; max-height: 600px; object-fit: contain;" /></div>'
});
}
// 售后纠纷处理
function handleAfterServiceDispute(orderDetailId) {
if (!orderDetailId) {
$.modal.msgError("子单ID不能为空");
return;
}
// 查询该子单的售后纠纷记录
$.ajax({
type: "POST",
dataType: "json",
url: prefix + "/after/records/byDetailId",
data: {orderDetailId: orderDetailId},
success: function (result) {
if (result.code == web_status.SUCCESS) {
showAfterServiceDisputeModal(orderDetailId, result.data);
} else {
$.modal.msgError("查询售后纠纷记录失败：" + result.msg);
}
},
error: function () {
$.modal.msgError("查询售后纠纷记录失败，请重试");
}
});
}
// 显示售后纠纷处理弹窗
function showAfterServiceDisputeModal(orderDetailId, disputeRecords) {
if (!disputeRecords || disputeRecords.length === 0) {
$.modal.msgError("没有找到售后纠纷记录");
return;
}
// 直接获取订单详情来判断订单类型
getOrderDetailInfo(orderDetailId, function(orderDetail) {
showDisputeModalWithOrderInfo(orderDetailId, disputeRecords, orderDetail);
});
}
// 获取订单详情信息
function getOrderDetailInfo(orderDetailId, callback) {
$.ajax({
type: "POST",
dataType: "json",
contentType: "application/json",
url: prefix + "/app/detail",
data: JSON.stringify({id: orderDetailId}),
success: function(result) {
if (result.code == web_status.SUCCESS) {
callback(result.data);
} else {
callback(null);
}
},
error: function() {
callback(null);
}
});
}
// 根据订单信息显示售后纠纷处理弹窗
function showDisputeModalWithOrderInfo(orderDetailId, disputeRecords, orderDetail) {
var isGoodsOrder = orderDetail && orderDetail.orderType === 1; // 1表示商品订单
var modalContent = '<div class="modal-body">';
modalContent += '<div class="table-responsive">';
modalContent += '<table class="table table-bordered table-striped">';
modalContent += '<thead><tr>';
modalContent += '<th>子单号</th>';
modalContent += '<th>申请退款金额</th>';
modalContent += '<th>师傅反馈</th>';
modalContent += '<th>客户确认</th>';
modalContent += '<th style="width: 280px;">操作</th>';
modalContent += '</tr></thead><tbody>';
disputeRecords.forEach(function(record) {
modalContent += '<tr>';
modalContent += '<td>' + (record.orderDetailCode || record.id) + '</td>';
modalContent += '<td>¥' + (record.refund || record.agreedRefund || 0) + '</td>';
// 师傅反馈列 - 如果是商品订单则增加workerAgreeType显示
var workerFeedbackContent = getWorkerFeedbackText(record.workerFeedbackResult) + '<br/><span style="color: #666; font-size: 12px;">反馈金额：¥' + (record.agreedRefund || 0) + '</span>';
if (isGoodsOrder && record.workerAgreeType) {
workerFeedbackContent += '<br/><span style="color: #007bff; font-size: 12px;">处理方式：' + getWorkerAgreeTypeText(record.workerAgreeType) + '</span>';
}
modalContent += '<td>' + workerFeedbackContent + '</td>';
modalContent += '<td>' + getCustomerCheckText(record.customerFinalCheck) + '</td>';
modalContent += '<td>';
modalContent += '<div style="margin-bottom: 8px;">';
modalContent += '<label style="font-size: 12px; color: #666; margin-bottom: 2px; display: block;">退款金额：</label>';
modalContent += '<input type="number" class="form-control" id="refundAmount_' + record.id + '" placeholder="输入退款金额" value="' + (record.agreedRefund || 0) + '" style="width: 100%; font-size: 12px; height: 28px;">';
modalContent += '</div>';
modalContent += '<div style="margin-bottom: 8px;">';
modalContent += '<label style="font-size: 12px; color: #666; margin-bottom: 2px; display: block;">处理原因：</label>';
modalContent += '<input type="text" class="form-control" id="processReason_' + record.id + '" placeholder="请输入处理原因" style="width: 100%; font-size: 12px; height: 28px;">';
modalContent += '</div>';
modalContent += '<button class="btn btn-primary btn-xs" onclick="processRefund(' + record.id + ', ' + orderDetailId + ')" style="width: 100%; font-size: 12px; height: 28px;">处理退款</button>';
modalContent += '<button class="btn btn-warning btn-xs" onclick="cancelAfterService(' + record.id + ', ' + orderDetailId + ')" style="width: 100%; font-size: 12px; height: 28px; margin-top: 4px;">取消售后</button>';
modalContent += '</td>';
modalContent += '</tr>';
});
modalContent += '</tbody></table>';
// 如果是商品订单，在表格下方增加提示文字
if (isGoodsOrder) {
modalContent += '<div style="margin-top: 15px; padding: 10px; background-color: #fff3cd; border: 1px solid #ffeaa7; border-radius: 4px;">';
modalContent += '<i class="fa fa-exclamation-triangle" style="color: #856404; margin-right: 5px;"></i>';
modalContent += '<span style="color: #856404; font-weight: bold;">商品退款需确认是否存在退货，并确认退完与否再操作退款！同时确认子单款项金额是否符合退款要求！</span>';
modalContent += '</div>';
}
modalContent += '</div>';
modalContent += '</div>';
layer.open({
type: 1,
title: '售后纠纷处理 - 子单ID: ' + orderDetailId,
shadeClose: true,
shade: 0.8,
area: ['90%', '80%'],
content: modalContent
});
}
// 获取师傅同意处理方式文本
function getWorkerAgreeTypeText(type) {
var typeMap = {
1: '即时退单退款',
2: '货物拦截后退单退款',
3: '快递返回货物后退单退款',
4: '退回货物后退单退款'
};
return typeMap[type] || '未知';
}
// 处理退款
function processRefund(recordId, orderDetailId) {
var refundAmount = $('#refundAmount_' + recordId).val();
var processReason = $('#processReason_' + recordId).val();
if (!refundAmount || refundAmount <= 0) {
$.modal.msgError("请输入有效的退款金额");
return;
}
if (!processReason || processReason.trim() === '') {
$.modal.msgError("请输入处理原因");
return;
}
$.modal.confirm("确认处理退款吗？<br/>退款金额：¥" + refundAmount + "<br/>处理原因：" + processReason, function() {
$.ajax({
type: "POST",
dataType: "json",
contentType: "application/json",
url: ctx + "order/master/after/dispute/handle",
data: JSON.stringify({
recordId: recordId,
orderDetailId: orderDetailId,
refundAmount: refundAmount,
platformHandleReason: processReason
}),
success: function (result) {
if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("退款处理成功");
// 关闭弹窗
layer.closeAll();
// 刷新表格
$.table.refresh();
} else {
$.modal.msgError("退款处理失败：" + result.msg);
}
},
error: function () {
$.modal.msgError("退款处理失败，请重试");
}
});
});
}
// 取消售后
function cancelAfterService(recordId, orderDetailId) {
// 获取处理原因输入框的值
var processReason = $('#processReason_' + recordId).val();
if (!processReason || processReason.trim() === '') {
$.modal.msgError("请输入处理原因");
return;
}
$.modal.confirm("确认取消该售后申请吗？", function() {
$.ajax({
type: "POST",
dataType: "json",
url: ctx + "order/master/after/cancel",
data: {
afterServiceRecordId: recordId,
platformHandleReason: processReason.trim()
},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("取消售后成功");
// 关闭弹窗
layer.closeAll();
// 刷新表格
$.table.refresh();
} else {
$.modal.msgError("取消售后失败：" + result.msg);
}
},
error: function () {
$.modal.msgError("取消售后失败，请重试");
}
});
});
}
// 获取售后类型文本
function getAfterServiceTypeText(type) {
var typeMap = {
1: '未收到货',
2: '已收到货',
3: '质量问题',
4: '其他'
};
return typeMap[type] || '未知';
}
// 获取师傅反馈文本
function getWorkerFeedbackText(result) {
var resultMap = {
0: '拒绝',
1: '同意',
2: '上门补做/重做',
3: '重做/补做完成'
};
return resultMap[result] || '未处理';
}
// 获取客户确认文本
function getCustomerCheckText(check) {
var checkMap = {
0: '不同意',
1: '同意',
2: '未处理'
};
return checkMap[check] || '未处理';
}
</script>
</body>

91
ghy-admin/src/main/resources/templates/order/masterGoods.html
View File

@ -1,91 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('订单商品列表')"/>
<th:block th:include="include :: layout-latest-css"/>
</head>
<body class="gray-bg">
<div class="ui-layout-center">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="order-goods-form">
<!-- <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<script th:inline="javascript">
var prefix = ctx + "order/goods";
var orderId = '[[${orderId}]]';
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 185});
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win: $('.ui-layout-center'),
doc: $('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryOrderGoodsList();
});
function queryOrderGoodsList() {
var options = {
url: prefix + "/list?orderId=" + orderId,
modalName: "订单商品",
search: false,
showSearch: false,
showToggle: false,
showColumns: false,
showRefresh: false,
columns: [
{
field: 'orderGoodsId',
title: '订单商品id',
visible: false
},
{
field: 'orderId',
title: '订单id',
visible: false
},
{
field: 'goodsName',
title: '商品名称'
},
{
field: 'goodsNum',
title: '商品数量'
},
{
field: 'serverGoodsNum',
title: '已服务数量'
}
]
};
$.table.init(options);
}
</script>
</body>
</html>

747
ghy-admin/src/main/resources/templates/order/orderManager.html
View File

@ -56,37 +56,6 @@
border-color: #1c84c6;
color: #fff;
}
/* 表格滚动条样式 */
.table-scroll-container {
overflow-x: auto;
overflow-y: auto;
max-height: 600px;
}
.table-scroll-container::-webkit-scrollbar {
width: 8px;
height: 8px;
}
.table-scroll-container::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 4px;
}
.table-scroll-container::-webkit-scrollbar-thumb {
background: #c1c1c1;
border-radius: 4px;
}
.table-scroll-container::-webkit-scrollbar-thumb:hover {
background: #a8a8a8;
}
/* 表格最小宽度 */
#bootstrap-table {
min-width: 1000px;
}
</style>
</head>
<body class="gray-bg">
@ -103,11 +72,11 @@
<option value="">全部</option>
<option value="">在途</option>
</select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待付款', orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
待付款
(<span id="nonPaidOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '已发布', orderStatus: 0, workerId: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, workerId: -1})">
已发布
(<span id="publishedOrderNum">0</span>)
</a>
@ -115,31 +84,31 @@
<!-- 已接单-->
<!-- (<span id="acceptedOrderNum">0</span>)-->
<!-- </a>-->
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待约单', orderStatus: 1, isCall: '01'})">
待约单
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})">
未约时
(<span id="notAppointedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待排期', orderStatus: 1, isCall: '02'})">
待排期
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">
未排班
(<span id="notArrangedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '待上门', orderStatus: 2})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})">
待上门
(<span id="waitForDoorOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '进行中', orderStatus: 3})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})">
进行中
(<span id="servingOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '确认审核', orderStatus: 4})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})">
确认审核
(<span class="confirmingOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '完成', orderStatus: 5})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})">
完成
(<span id="finishedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '关闭', orderStatus: 6})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})">
关闭
(<span id="canceledOrderNum">0</span>)
</a>
@ -151,21 +120,21 @@
明日待上门
(<span id="tomorrowOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后', searchAfterList: true})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {searchAfterList: true})">
售后
(<span id="afterServiceOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '急报中', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
急报中
(<span>0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '退单', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
退单
(<span>0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName : '售后纠纷', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
售后纠纷
(<span id="afterServiceDisputeNum">0</span>)
(<span>0</span>)
</a>
</div>
<div class="flex-board">
@ -280,7 +249,7 @@
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">订单查询：</label>
<input id="keywords" type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话">
<input id="keyWords" type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="searchByForm()"><i
@ -290,7 +259,7 @@
</div>
</div>
<div class="m-t condition-btn">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, workerId : -2})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0})">
新订单
(<span id="newOrderNum">0</span>)
</a>
@ -344,31 +313,19 @@
shiro:hasPermission="order:order:export">
<i class="fa fa-download"></i> 导出
</a>
<a class="btn btn-warning" onclick="$.table.importExcel()">
<i class="fa fa-download"></i> 导入
</a>
<a class="btn btn-default" onclick="mergePay()">
<i class="fa fa-money"></i> 付款
</a>
<a class="btn btn-default" onclick="showPcOrderWorker()">
<i class="fa fa-money"></i> 指派
</a>
<a class="btn btn-default" onclick="batchChangePrice()">
<i class="fa fa-money"></i> 批量改价
</a>
<a class="btn btn-default" onclick="batchChangeInsurance()">
<i class="fa fa-money"></i> 批量选择保险
</a>
</div>
</div>
<div class="col-sm-12 select-table table-striped table-scroll-container">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<audio id="myAudio" src=""></audio>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
@ -378,8 +335,6 @@
<script th:inline="javascript">
var payTypes = [[${@dict.getType('pay_type')}]];
var orderTypes = [[${@dict.getType('goods_category_type')}]];
var orderModes = [[${@dict.getType('order_mode')}]];
var payModes = [[${@dict.getType('pay_mode')}]];
var payStatus = [[${@dict.getType('pay_status')}]];
var orderStatus = [[${@dict.getType('order_status')}]];
@ -387,7 +342,6 @@
var prefix = ctx + "order/master";
var customParams = {};
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
@ -573,22 +527,6 @@
}
}
})
<!-- 售后纠纷订单数量统计-->
$.ajax({
type: "POST",
dataType:"json",
url: prefix + '/after/dispute/count',
contentType: 'application/json',
data: JSON.stringify({}),
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#afterServiceDisputeNum').text(result.data);
} else {
$.modal.msgError("售后纠纷数据加载错误，请重试！")
}
}
})
});
function changeOrderMode(orderMode) {
@ -667,22 +605,14 @@
var options = {
url: prefix + "/list",
exportUrl: prefix + "/export",
importUrl: prefix + "/importData",
queryParams: queryParams,
sortName: "createTime",
sortOrder: "desc",
modalName: "订单",
uniqueId: 'id',
columns: [
{
checkbox: true
},
{
title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}
},
{
field: 'id',
title: '订单ID',
@ -692,18 +622,18 @@
field: 'goods',
title: '订单信息',
formatter: function (value, row) {
var imgUrl = (value && value.goodsImgUrl) ? value.goodsImgUrl : '';
return '<div style="display:flex;justify-content: center;align-items: center;">'
+ '<img decoding="async" src="' + imgUrl + '" width="100" height="100" />'
+ '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
+ '<div>'
+ '<p>' + (row.code || '') + '</p>'
+ '<p>' + (row.consoleGoodsName || '') + '</p>'
+ '<p>联系人：' + (row.addressName || '') + '</p>'
+ '<p>联系电话：' + (row.addressPhone || '') + '</p>'
+ '<p>联系地址：' + (row.address || '') + '</p>'
+ '<p>下单时间：' + (row.createTime || '') + '</p>'
+ '<p>预约时间：' + (row.mixExpectTime || '') + '</p>'
+ '<p>下单总金额：' + (row.financialMasterMoney || '') + '元,师傅实收金额: ' + (row.financialMasterPayMoney || '') + '</p>'
+ '<small> 订单编号：' + row.code + '<small/> <br>'
+ '<h4> ' + value.goodsName + '<h4/>'
+ '<small> ' + value.goodsDesc + '</small> <br>'
+ '<small> 联系人：' + row.addressName + '</small> <br>'
+ '<small> 联系电话：' + row.addressPhone + '</small> <br>'
+ '<small> 联系地址：' + row.address + '</small> <br>'
+ '<small> 下单时间：' + row.createTime + '</small> <br>'
+ '<small> 预约时间：' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '</small> <br>'
+ '<small> 总金额：' + row.financialMasterMoney + '元</small> <br>'
+ '</div>'
+ '</div>';
}
@ -713,53 +643,26 @@
title: '订单状态',
align: 'center',
formatter: function (value, row, index) {
if(row.orderStatusName){
return row.orderStatusName;
}else {
return $.table.selectDictLabel(orderStatus, value);
}
}
},
{
title: '挂帐',
align: 'center',
formatter: function (value, row, index) {
return statusTools(row);
}
},
{
title: '未派联系',
align: 'center',
formatter: function (value, row, index) {
return contactTools(row);
}
},
{
field: 'worker',
title: '师傅接单信息',
title: '接单信息',
formatter: function (value, row, index) {
if(value){
return '<p>' + value.name + value.phone + '</p>'
+ '<p>接单时间：' + row.createTime + '</p>';
return '<small>' + value.name + value.phone + '</small><br>'
+ '<small>接单时间：' + row.revTime + '</small>';
}
}
},
{
field: 'lastCallTime',
title: '最近联系时间'
},
{
title: '操作',
align: 'left',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-info"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="editServingInfo(\'' + row.id + '\')"><i class="fa fa-info"></i>修改</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="callDetail(\'' + row.id + '\')"><i class="fa fa-info"></i>拨号详情</a> ');
if(row.orderStatus == 0 || row.orderStatus == 1){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.id + '\')"></i>主单退单</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterCancel(\'' + row.id + '\')"></i>商家退单</a> ');
}
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.orderMasterId + '\')"></i>商家退单</a> ');
if (row.workerId != null) {
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showOrderWorker(\'' + row.id + '\')"></i>指派</a> ');
} else {
@ -768,15 +671,6 @@
if (row.payStatus == 0) {
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showPayQrcode(\'' + row.id + '\')"></i>付款</a> ');
}
if (row.insuranceId){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)"></i>已投保险</a> ');
} else {
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="pcOrderInsurance(\'' + row.id + '\')"></i>选择保险</a> ');
}
// 售后纠纷处理按钮
if (row.afterServiceStatus == 1) {
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="handleAfterServiceDispute(\'' + row.id + '\')"><i class="fa fa-gavel"></i>售后纠纷处理</a> ');
}
return actions.join('');
}
},
@ -794,27 +688,6 @@
field: 'changeMoney',
title: '商家追加金额',
align: 'center'
},
{
field: 'orderImgs',
title: '完单图片',
align: 'center'
},
{
field: 'payMode',
title: '商家付费模式',
align: 'center',
formatter: function (value, row, index) {
return $.table.selectDictLabel(payModes, value);
}
},
{
field: 'orderMode',
title: '下单模式',
align: 'center',
formatter: function (value, row, index) {
return $.table.selectDictLabel(orderModes, value);
}
},{
field: 'orderType',
title: '订单类型',
@ -842,93 +715,11 @@
{
field: 'payTime',
title: '付款时间'
},
{
field: 'returnReason',
title: '退单原因',
align: 'center',
formatter: function (value, row, index) {
return value || '-';
}
},
{
field: 'returnReasonDetail',
title: '退单原因详情',
align: 'center',
formatter: function (value, row, index) {
if (value && value.length > 20) {
return value.substring(0, 20) + '...';
}
return value || '-';
}
},
{
field: 'returnImages',
title: '退单图片',
align: 'center',
formatter: function (value, row, index) {
if (value) {
var images = value.split(',');
var html = '';
for (var i = 0; i < Math.min(images.length, 3); i++) {
html += '<img src="' + images[i] + '" style="width:30px;height:30px;margin:2px;" onclick="showImage(\'' + images[i] + '\')" />';
}
if (images.length > 3) {
html += '<span style="color:#999;">+' + (images.length - 3) + '</span>';
}
return html;
}
return '-';
}
}]
};
$.table.init(options);
}
function statusTools(row) {
if (row.isCharge === "01") {
return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.id + '\')"></i> ';
} else {
return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.id + '\')"></i> ';
}
}
/* 用户管理-停用 */
function disable(orderId) {
$.modal.confirm("确认要取消挂帐吗？", function() {
$.operate.post(prefix + "/changeIsCharge", { "id": orderId, "isCharge": "01"});
})
}
/* 用户管理启用 */
function enable(orderId) {
$.modal.confirm("确认要挂帐吗？", function() {
$.operate.post(prefix + "/changeIsCharge", { "id": orderId, "isCharge": "02"});
})
}
function contactTools(row) {
if (row.isContact === "01") {
return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="contactEnable(\'' + row.id + '\')"></i> ';
} else {
return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="contactDisable(\'' + row.id + '\')"></i> ';
}
}
/* 用户管理-停用 */
function contactDisable(orderId) {
$.modal.confirm("确认未联系吗？", function() {
$.operate.post(prefix + "/changeIsContact", { "id": orderId, "isContact": "01"});
})
}
/* 用户管理启用 */
function contactEnable(orderId) {
$.modal.confirm("确认已联系吗？", function() {
$.operate.post(prefix + "/changeIsContact", { "id": orderId, "isContact": "02"});
})
}
function queryParams(params) {
var search = $.table.queryParams(params);
Object.assign(search, customParams)
@ -936,20 +727,9 @@
}
function detail(id) {
var url = "order/goods/master?orderId=" + id;
var url = "order/goods?orderId=" + id;
$.modal.open("商品信息", url);
}
function editServingInfo(id) {
let url = "order/popup/editServingInfo?orderId=" + id + "&pageCode=orderManager";
$.modal.open("信息修改", url);
}
function callDetail(id) {
var url = "order/record?orderId=" + id;
$.modal.open("拨号记录", url);
}
function orderDetailReject(id) {
$.modal.confirm("确定要退单吗？", function() {
const url = "detail/reject";
@ -957,40 +737,14 @@
$.operate.post(url, data);
});
}
// function orderMasterReject(id) {
// $.modal.confirm("确定要退单吗？", function() {
// const url = "master/reject";
// const data = { "id": id };
// $.operate.post(url, data);
// });
// }
// 商家退单
function orderMasterCancel(id){
$.modal.confirm("确定要取消订单吗？", function() {
const url = "cancel";
const data = { "orderMasterId": id };
function orderMasterReject(id) {
$.modal.confirm("确定要退单吗？", function() {
const url = "master/reject";
const data = { "id": id };
$.operate.post(url, data);
});
}
function orderMasterReject(id) {
$.modal.confirm("确定要退单吗？", function() {
const url = "console/cancel";
const data = { "id": id };
$.ajax({
type: "POST",
dataType: "json",
url: url,
data: JSON.stringify(data),
contentType: 'application/json',
success: function (result) {
$.operate.ajaxSuccess(result);
}
});
});
}
function changeConditionBtnChosenStyle(e) {
$('.condition-btn .btn').removeClass('active-condition-btn');
$(e).addClass('active-condition-btn');
@ -1038,7 +792,7 @@
storePhone: $('#storePhone').val(),
workerName: $('#workerName').val(),
workerPhone: $('#workerPhone').val(),
keywords: $('#keywords').val()
keyWords: $('#keyWords').val()
}
customParams = Object.assign(customParams, params);
@ -1073,434 +827,17 @@
});
}
function showPcOrderWorker() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (rows.length === 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
var url = "pcOrderWorker/" + rows.join(",");
layer.open({
type: 2,
area: ['800px', '450px'],
fix: false,
//不固定
maxmin: true,
shade: 0.3,
title: '指派师傅',
content: url,
// 弹层外区域关闭
shadeClose: true
});
}
function pcOrderInsurance(id) {
var url = ctx + "order/master/pcOrderInsurance/" + id;
$.modal.open("选择保险", url, '600', '300');
}
function batchChangePrice() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (rows.length === 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
var url = prefix + "/changePrice/" + rows.join(",");
$.modal.open("批量改价", url, '800', '300');
}
function batchChangeInsurance() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (rows.length === 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
var url = ctx + "order/master/batchChangeInsurance/" + rows.join(",");
$.modal.open("批量选择保险", url, '600', '300');
}
function mergePay() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (rows.length == 0) {
if (rows.length === 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
showPayQrcode(rows.join());
}
// 显示退单图片
function showImage(imageUrl) {
if (!imageUrl) {
return;
}
var html = '<div style="text-align:center;">' +
'<img src="' + imageUrl + '" style="max-width:100%;max-height:500px;" />' +
'</div>';
layer.open({
type: 1,
title: '退单图片',
area: ['600px', '500px'],
content: html,
shadeClose: true,
btn: ['关闭']
});
}
// 主订单全部
var orderMasterHaveReleasedUrl = "";
// 主订单新订单
var orderMasterNewOrderUrl = "";
//请求接口加载页面输入框值
function globalConfiginit(){
$.ajax({
type: "GET",
dataType:"json",
url: "/config/globalConfig/search/type/1001",
data: { },
success: function (data) {
var response = JSON.parse(data.data.content);
orderMasterHaveReleasedUrl = response.orderMasterHaveReleasedUrl;
orderMasterNewOrderUrl = response.orderMasterNewOrderUrl;
}
})
}
//页面加载
window.onload = function () {
//请求接口加载页面输入框值
globalConfiginit();
}
// 定义一个要延迟执行的函数
function delayedFunction() {
console.log("");
}
var totalOrderNumber = 0;
var finishCheckNumber = 0;
var lastTotalOrderNumber = 0;
var lastFinishCheckNumber = 0;
function fetchData() {
$.ajax({
type: "GET",
dataType: "json",
url: "/order/master/statistics/now",
data: {},
success: function (data) {
// 更新当前值
totalOrderNumber = data.data.totalOrderNumber;
finishCheckNumber = data.data.finishCheckNumber;
console.log(totalOrderNumber+"-----"+lastTotalOrderNumber );
// 检查新值是否大于旧值
if (totalOrderNumber > lastTotalOrderNumber) {
console.log("收到新总订单数据，开始播放。播放通知音频：" + orderMasterHaveReleasedUrl);
// 获取source元素
var source = document.getElementById('myAudio');
// 设置新的音频文件路径
source.src = orderMasterHaveReleasedUrl;
var audio = document.getElementById('myAudio');
audio.play().catch(function(error) {
console.log('播放失败：', error);
});
}
// 设置延迟时间为2000毫秒（2秒）
setTimeout(delayedFunction, 2000);
if (finishCheckNumber > lastFinishCheckNumber) {
console.log("收到新订单数据，开始播放。播放通知音频：" + orderMasterNewOrderUrl);
// 获取source元素
var source = document.getElementById('myAudio');
// 设置新的音频文件路径
source.src = orderMasterNewOrderUrl;
var audio = document.getElementById('myAudio');
audio.play().catch(function(error) {
console.log('播放失败：', error);
});
}
// 更新上一次的值
lastTotalOrderNumber = totalOrderNumber;
lastFinishCheckNumber = finishCheckNumber;
}
});
}
// 设置定时器，每隔一分钟执行一次 fetchData 函数
setInterval(fetchData, 60000);
// 售后纠纷处理弹窗
function handleAfterServiceDispute(orderMasterId) {
// 查询该主单的售后记录
$.ajax({
type: "POST",
dataType: "json",
url: prefix + '/after/records/byMasterId',
contentType: 'application/json',
data: JSON.stringify({id: orderMasterId}),
success: function (result) {
if (result.code == web_status.SUCCESS) {
showAfterServiceDisputeModal(orderMasterId, result.data);
} else {
$.modal.msgError("查询售后记录失败：" + result.msg);
}
},
error: function() {
$.modal.msgError("查询售后记录失败，请重试！");
}
});
}
// 获取订单详情信息
function getOrderDetailInfo(orderMasterId, callback) {
$.ajax({
type: "POST",
dataType: "json",
url: prefix + "/app/detail",
contentType: "application/json",
data: JSON.stringify({id: orderMasterId}),
success: function (result) {
if (result.code == web_status.SUCCESS) {
callback(result.data);
} else {
$.modal.msgError("获取订单详情失败：" + result.msg);
}
},
error: function() {
$.modal.msgError("获取订单详情失败，请重试！");
}
});
}
// 获取师傅同意类型文本
function getWorkerAgreeTypeText(type) {
var types = {
1: '同意',
2: '不同意',
3: '部分同意'
};
return types[type] || '未处理';
}
// 显示售后纠纷处理弹窗
function showAfterServiceDisputeModal(orderMasterId, afterServiceRecords) {
// 先获取订单详情以判断订单类型
getOrderDetailInfo(orderMasterId, function(orderDetail) {
showDisputeModalWithOrderInfo(orderMasterId, afterServiceRecords, orderDetail);
});
}
// 根据订单信息显示售后纠纷处理弹窗
function showDisputeModalWithOrderInfo(orderMasterId, afterServiceRecords, orderDetail) {
var isGoodsOrder = orderDetail && orderDetail.orderType === 1;
var html = '<div class="modal fade" id="afterServiceDisputeModal" tabindex="-1" role="dialog">';
html += '<div class="modal-dialog modal-lg" role="document">';
html += '<div class="modal-content">';
html += '<div class="modal-header">';
html += '<h4 class="modal-title">售后纠纷处理</h4>';
html += '<button type="button" class="close" data-dismiss="modal">&times;</button>';
html += '</div>';
html += '<div class="modal-body">';
if (afterServiceRecords && afterServiceRecords.length > 0) {
html += '<div class="table-responsive">';
html += '<table class="table table-bordered table-striped">';
// 根据订单类型决定表头
if (isGoodsOrder) {
html += '<thead><tr><th>子单号</th><th>申请退款金额</th><th>师傅反馈</th><th>师傅同意类型</th><th>客户确认</th><th>操作</th></tr></thead>';
} else {
html += '<thead><tr><th>子单号</th><th>申请退款金额</th><th>师傅反馈</th><th>客户确认</th><th>操作</th></tr></thead>';
}
html += '<tbody>';
afterServiceRecords.forEach(function(record) {
html += '<tr>';
html += '<td>' + (record.orderDetailCode || '') + '</td>';
html += '<td>¥' + (record.refund || record.agreedRefund || 0) + '</td>';
html += '<td>' + getWorkerFeedbackText(record.workerFeedbackResult) + '<br><small style="color: #999;">反馈金额：¥' + (record.agreedRefund || 0) + '</small></td>';
// 如果是商品订单，添加师傅同意类型列
if (isGoodsOrder) {
html += '<td>' + getWorkerAgreeTypeText(record.workerAgreeType) + '</td>';
}
html += '<td>' + getCustomerCheckText(record.customerFinalCheck) + '</td>';
html += '<td style="width: 280px;">';
html += '<div style="margin-bottom: 8px;">';
html += '<label style="font-size: 12px; color: #666; margin-bottom: 2px; display: block;">退款金额：</label>';
html += '<input type="number" class="form-control" id="refundAmount_' + record.id + '" placeholder="输入退款金额" value="' + (record.refund || 0) + '" style="width: 100%; font-size: 12px; height: 28px;" min="0" step="0.01">';
html += '</div>';
html += '<div style="margin-bottom: 8px;">';
html += '<label style="font-size: 12px; color: #666; margin-bottom: 2px; display: block;">处理原因：</label>';
html += '<input type="text" class="form-control" id="processReason_' + record.id + '" placeholder="请输入处理原因" style="width: 100%; font-size: 12px; height: 28px;">';
html += '</div>';
html += '<button class="btn btn-primary btn-xs" onclick="processRefund(\'' + record.id + '\', \'' + orderMasterId + '\')" style="width: 100%; font-size: 12px; height: 28px;">处理退款</button>';
html += '<button class="btn btn-warning btn-xs" onclick="cancelAfterService(\'' + record.id + '\', \'' + orderMasterId + '\')" style="width: 100%; font-size: 12px; height: 28px; margin-top: 4px;">取消售后</button>';
html += '</td>';
html += '</tr>';
});
html += '</tbody></table></div>';
// 如果是商品订单，添加提示文字
if (isGoodsOrder) {
html += '<div class="alert alert-warning" style="margin-top: 15px;">';
html += '<strong>提示：</strong>商品退款需确认是否存在退货，并确认退完与否再操作退款！同时确认子单款项金额是否符合退款要求！';
html += '</div>';
}
} else {
html += '<div class="alert alert-info">该订单暂无售后纠纷记录</div>';
}
html += '</div>';
html += '<div class="modal-footer">';
html += '<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>';
html += '</div>';
html += '</div></div></div>';
// 移除已存在的弹窗
$('#afterServiceDisputeModal').remove();
// 添加弹窗到页面
$('body').append(html);
// 显示弹窗
$('#afterServiceDisputeModal').modal('show');
}
// 处理退款
function processRefund(recordId, orderMasterId) {
var refundAmount = $('#refundAmount_' + recordId).val();
var processReason = $('#processReason_' + recordId).val();
if (!refundAmount || refundAmount <= 0) {
$.modal.msgError("请输入有效的退款金额");
return;
}
if (!processReason || processReason.trim() === '') {
$.modal.msgError("请输入处理原因");
return;
}
$.modal.confirm("确认处理退款 ¥" + refundAmount + " 吗？", function() {
$.ajax({
type: "POST",
dataType: "json",
url: prefix + '/after/dispute/handle',
contentType: 'application/json',
data: JSON.stringify({
recordId: recordId,
orderMasterId: orderMasterId,
refundAmount: parseFloat(refundAmount),
platformHandleReason: processReason.trim()
}),
success: function (result) {
if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("退款处理成功");
$('#afterServiceDisputeModal').modal('hide');
// 刷新页面数据
$.table.refresh();
} else {
$.modal.msgError("退款处理失败：" + result.msg);
}
},
error: function() {
$.modal.msgError("退款处理失败，请重试！");
}
});
});
}
// 取消售后
function cancelAfterService(recordId, orderMasterId) {
// 获取处理原因输入框的值
var processReason = $('#processReason_' + recordId).val();
if (!processReason || processReason.trim() === '') {
$.modal.msgError("请输入处理原因");
return;
}
$.modal.confirm("确认取消该售后申请吗？", function() {
$.ajax({
type: "POST",
dataType: "json",
url: prefix + '/after/cancel',
data: {
afterServiceRecordId: recordId,
platformHandleReason: processReason.trim()
},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("取消售后成功");
$('#afterServiceDisputeModal').modal('hide');
// 刷新页面数据
$.table.refresh();
} else {
$.modal.msgError("取消售后失败：" + result.msg);
}
},
error: function() {
$.modal.msgError("取消售后失败，请重试！");
}
});
});
}
// 获取售后类型文本
function getAfterServiceTypeText(type) {
var types = {
1: '未收到货退单退款',
2: '未收到货退款',
3: '已收到货退款退货'
};
return types[type] || '未知';
}
// 获取师傅反馈文本
function getWorkerFeedbackText(result) {
var results = {
0: '拒绝',
1: '同意',
2: '上门补做/重做',
3: '重做/补做完成'
};
return results[result] || '未处理';
}
// 获取客户确认文本
function getCustomerCheckText(check) {
if (check === 1) return '同意';
if (check === 0) return '不同意';
return '未确认';
}
</script>
</body>
<script id="importTpl" type="text/template">
<form enctype="multipart/form-data" class="mt20 mb10">
<div class="col-xs-offset-1">
<input type="file" id="file" name="file"/>
<div class="mt10 pt5">
<input type="checkbox" id="updateSupport" name="updateSupport" title="如果登录账户已经存在，更新这条数据。"> 是否更新已经存在的用户数据
&nbsp; <a href="http://gqz.opsoul.com/%E6%89%B9%E9%87%8F%E4%B8%8B%E5%8D%95%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xls" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
</div>
<font color="red" class="pull-left mt10">
提示：仅允许导入“xls”或“xlsx”格式文件！
</font>
</div>
</form>
</script>
</html>

11
ghy-admin/src/main/resources/templates/order/orderWorker.html
View File

@ -92,10 +92,6 @@
<label class="form-control-label">人员名称：</label>
<input name="workerName" type="text" class="form-control normal-input m-r">
</div>
<div class="flex-board input-content m-t">
<label class="form-control-label">手机号：</label>
<input name="workerPhone" type="text" class="form-control normal-input m-r">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('workerForm')"><i
class="fa fa-search"></i>&nbsp;搜索</a>
@ -219,12 +215,7 @@
checkbox: true
}, {
field: 'name',
title: '昵称',
align: "left"
},
{
field: 'realName',
title: '真实姓名',
title: '人员名称',
align: "left"
}, {
field: 'phone',

185
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -72,15 +72,15 @@
<option value="">全部</option>
<option value="">在途</option>
</select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'待付款', orderStatus: 0, sysPayStatus: 0, payMode: '02'})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
待付款
(<span id="nonPaidOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'已发布', orderStatus: 0, workerId: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, workerId: -1})">
已发布
(<span id="publishedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'已接单', orderStatus: 1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})">
已接单
(<span id="acceptedOrderNum">0</span>)
</a>
@ -90,23 +90,23 @@
<!-- <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">-->
<!-- 未排班-->
<!-- </a>-->
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'待上门', orderStatus: 2})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})">
待上门
(<span id="waitForDoorOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'进行中', orderStatus: 3})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})">
进行中
(<span id="servingOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'确认审核', orderStatus: 4})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})">
确认审核
(<span id="confirmingOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'完成', orderStatus: 5})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})">
完成
(<span id="finishedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'关闭', orderStatus: 6})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})">
关闭
(<span id="canceledOrderNum">0</span>)
</a>
@ -118,11 +118,11 @@
明日待上门
(<span id="tomorrowOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'售后', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
售后
(<span>0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatusName:'急报中', orderStatus: -1})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
急报中
(<span>0</span>)
</a>
@ -148,7 +148,7 @@
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">订单查询：</label>
<input name="keywords" id="keywords" type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
<input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@ -170,12 +170,6 @@
<a class="btn btn-default" onclick="mergePay()">
<i class="fa fa-money"></i> 付款
</a>
<a class="btn btn-default" onclick="batchChangeInsurance()">
<i class="fa fa-money"></i> 批量选择保险
</a>
<!-- <a class="btn btn-default" onclick="showOrderWorker()">-->
<!-- <i class="fa fa-money"></i> 指派-->
<!-- </a>-->
</div>
</div>
@ -194,8 +188,6 @@
<script th:inline="javascript">
var payTypes = [[${@dict.getType('pay_type')}]];
var orderTypes = [[${@dict.getType('goods_category_type')}]];
var orderModes = [[${@dict.getType('order_mode')}]];
var payModes = [[${@dict.getType('pay_mode')}]];
var payStatus = [[${@dict.getType('pay_status')}]];
var orderStatus = [[${@dict.getType('order_status')}]];
@ -290,7 +282,7 @@
type: "GET",
dataType:"json",
url: prefix + '/count',
data: {orderStatus: 0, sysPayStatus: 0, payMode: '02'},
data: {orderStatus: 0, sysPayStatus: 0, orderMode: '02'},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#nonPaidOrderNum').text(result.data);
@ -396,7 +388,6 @@
function initOrderList() {
var options = {
url: prefix + "/list",
uniqueId: 'id',
exportUrl: prefix + "/export",
queryParams: queryParams,
sortName: "createTime",
@ -406,12 +397,6 @@
{
checkbox: true
},
{
title: "序号",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}
},
{
field: 'id',
title: '订单ID',
@ -422,18 +407,19 @@
title: '订单信息',
formatter: function (value, row) {
return '<div style="display:flex;justify-content: center;align-items: center;">'
+ '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
// + '<img decoding="async" src="' + value.goodsImgUrl + '" width="100" height="100" />'
+ '<div>'
+ '<p>' + row.code + '<p/>'
+ '<p> ' + row.consoleGoodsName + '<p/> '
+ '<p> 联系人：' + row.addressName + '</p> '
+ '<p> 联系电话：' + row.addressPhone + '</p> '
+ '<p> 联系地址：' + row.address + '</p> '
+ '<p> 下单时间：' + row.createTime + '</p> '
+ '<p> 预约时间：' + row.mixExpectTime + '</p> '
+ '<p> 下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + ' </p> '
+ '</p>'
+ '</p>';
+ '<small> 订单编号：' + row.code + '<small/> <br>'
// + '<h4> ' + value.goodsName + '<h4/>'
// + '<small> ' + value.goodsDesc + '</small> <br>'
+ '<small> 联系人：' + row.addressName + '</small> <br>'
+ '<small> 联系电话：' + row.addressPhone + '</small> <br>'
+ '<small> 联系地址：' + row.address + '</small> <br>'
+ '<small> 下单时间：' + row.createTime + '</small> <br>'
+ '<small> 预约时间：' + row.expectTimeStart + ' - ' + row.expectTimeEnd + '</small> <br>'
+ '<small> 总金额：' + row.financialMasterMoney + '元</small> <br>'
+ '</div>'
+ '</div>';
}
},
{
@ -446,17 +432,11 @@
},
{
field: 'worker',
title: '师傅接单信息',
title: '接单信息',
formatter: function (value, row, index) {
if(value){
return '<p>' + value.name + '</p>'
+ '<p>接单时间：' + row.createTime + '</p>';
<!-- return '<small>' + value.name + value.phone + '</small><br>'-->
<!-- + '<small>接单时间：' + row.revTime + '</small>';-->
}
}
},
{
field: 'lastCallTime',
title: '最近联系时间'
},
{
title: '操作',
@ -464,21 +444,10 @@
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-info"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="callDetail(\'' + row.id + '\')"><i class="fa fa-info"></i>拨号详情</a> ');
if(row.orderStatus == 0 || row.orderStatus == 1){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterCancel(\'' + row.id + '\')"></i>商家退单</a> ');
}
if(row.orderStatus == 5){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="finishImgs(\'' + row.id + '\')"></i>完单图片</a> ');
}
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.orderMasterId + '\')"></i>商家退单</a> ');
if (row.payStatus == 0) {
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showPayQrcode(\'' + row.id + '\')"></i>付款</a> ');
}
if (row.insuranceId){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)"></i>已投保险</a> ');
} else {
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="pcOrderInsurance(\'' + row.id + '\')"></i>选择保险</a> ');
}
return actions.join('');
}
},
@ -493,28 +462,7 @@
{
field: 'changeMoney',
title: '商家追加金额',
align: 'center',
visible: false
},
{
field: 'orderImgs',
title: '完单图片'
},
{
field: 'payMode',
title: '商家付费模式',
align: 'center',
formatter: function (value, row, index) {
return $.table.selectDictLabel(payModes, value);
}
},
{
field: 'orderMode',
title: '下单模式',
align: 'center',
formatter: function (value, row, index) {
return $.table.selectDictLabel(orderModes, value);
}
align: 'center'
},{
field: 'orderType',
title: '订单类型',
@ -564,43 +512,14 @@
$.operate.post(url, data);
});
}
function callDetail(id) {
var url = "order/record?orderId=" + id;
$.modal.open("拨号记录", url);
}
// 商家退单
function orderMasterCancel(id){
$.modal.confirm("确定要取消订单吗？", function() {
const url = "cancel";
const data = { "orderMasterId": id };
function orderMasterReject(id) {
$.modal.confirm("确定要退单吗？", function() {
const url = "master/reject";
const data = { "id": id };
$.operate.post(url, data);
});
}
function finishImgs(id){
var url = "order/imgs?orderId=" + id;
$.modal.open("拨号记录", url);
}
function orderMasterReject(id) {
$.modal.confirm("确定要退单吗？", function() {
const url = "console/cancel";
const data = { "id": id };
$.ajax({
type: "POST",
dataType: "json",
url: url,
data: JSON.stringify(data),
contentType: 'application/json',
success: function (result) {
$.operate.ajaxSuccess(result);
}
});
});
}
function changeConditionBtnChosenStyle(e) {
$('.condition-btn .btn').removeClass('active-condition-btn');
$(e).addClass('active-condition-btn');
@ -674,44 +593,6 @@
showPayQrcode(rows.join());
}
function showOrderWorker() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (rows.length === 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
var url = "pcOrderWorker/" + rows.join(",");
layer.open({
type: 2,
area: ['800px', '450px'],
fix: false,
//不固定
maxmin: true,
shade: 0.3,
title: '指派师傅',
content: url,
// 弹层外区域关闭
shadeClose: true
});
}
function pcOrderInsurance(id) {
var url = ctx + "order/master/pcOrderInsurance/" + id;
$.modal.open("选择保险", url, '600', '300');
}
function batchChangeInsurance() {
table.set();
var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
if (rows.length === 0) {
$.modal.alertWarning("请至少选择一条记录");
return;
}
var url = ctx + "order/master/batchChangeInsurance/" + rows.join(",");
$.modal.open("批量选择保险", url, '600', '300');
}
</script>
</body>

30
ghy-admin/src/main/resources/templates/order/pcOrderInsurance.html
View File

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('选择保险')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-change-insurance">
<input name="id" type="hidden" th:value="${orderIds}" />
<div class="form-group">
<label class="col-sm-3 control-label">保险：</label>
<div class="col-sm-8">
<select id="insuranceId" name="insuranceId" class="form-control control-label" required>
<option th:each="insurance:${insurances}" th:value="${insurance.id}" th:text="${insurance.insuranceName}" ></option>
</select>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
function submitHandler() {
if ($.validate.form()) {
$.operate.save(ctx + "order/master/pcOrderWorker/changeInsurance", $('#form-change-insurance').serialize());
}
}
</script>
</body>
</html>

227
ghy-admin/src/main/resources/templates/order/pcOrderWorker.html
View File

@ -1,227 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('指派师傅')"/>
<th:block th:include="include :: layout-latest-css"/>
<style>
.custom-container {
padding: 0 30px 20px 30px;
}
.flex-board {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
align-items: center;
}
.flex-board-no-wrap {
display: flex;
justify-content: flex-start;
align-items: center;
}
.flex-board.select-content {
flex-basis: 100%
}
.flex-board.select-content .flex-board-no-wrap {
flex-basis: 90%
}
.flex-board.input-content {
flex-basis: 50%;
}
.flex-board.input-content input {
flex-basis: 75%
}
.specCanAssignNum {
text-align: center;
line-height: 31px;
}
</style>
</head>
<body class="gray-bg">
<div class="animated fadeInRight row custom-container">
<div class="col-sm-12 search-collapse">
<form class="flex-board m" id="workerForm">
<div class="flex-board select-content m-t">
<label class="form-control-label">区域筛选：</label>
<div id="areaCxSelect" class="flex-board-no-wrap">
<select class="province form-control cx-select-input m-r" name="province" id="province" data-first-title="选择省" onchange="selectRegion('province', 'city')"></select>
<select class="city form-control cx-select-input m-r" name="city" id="city" data-first-title="选择市" onchange="selectRegion('city', 'district')"></select>
<select class="district form-control cx-select-input m-r" name="areaId" id="district" data-first-title="选择区" onchange="selectRegion('district', 'street')"></select>
<select class="street form-control cx-select-input m-r" name="streetId" id="streetId" data-first-title="选择街道" ></select>
</div>
</div>
<div class="flex-board select-content m-t">
<label class="form-control-label">类别筛选：</label>
<div id="categoryCxSelect" class="flex-board-no-wrap">
<select class="category1 form-control cx-select-input m-r" name="category1" id="category1" data-first-title="选择一类"></select>
<select class="category2 form-control cx-select-input m-r" name="category2" id="category2" data-first-title="选择二类"></select>
<select class="category3 form-control cx-select-input m-r" name="goodsCategoryId" id="category3" data-first-title="选择三类"></select>
<select class="category4 form-control cx-select-input m-r" name="category4" id="category4" data-first-title="选择四类" ></select>
</div>
</div>
<div class="flex-board input-content m-t">
<label class="form-control-label">人员名称：</label>
<input name="workerName" type="text" class="form-control normal-input m-r">
</div>
<div class="m-t">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('workerForm')"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('workerForm')"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: jquery-cxselect-js" />
<script type="text/javascript">
var orderMasterIds = '[[${orderIds}]]';
var prefix = ctx + "worker"
$(function () {
initForm();
initTable();
});
function initForm() {
$.ajax({
type: "POST",
dataType:"json",
url: ctx + "system/area/list",
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#areaCxSelect').cxSelect({
selects: ['province', 'city', 'district', 'street'],
jsonValue: 'areaId',
jsonName: 'areaName',
data: result.data
});
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
$.ajax({
type: "POST",
dataType:"json",
url: ctx + "goods/deptcategory/app/list",
data: JSON.stringify({deptId: 101, goodsCategoryId: 1}),
contentType: 'application/json',
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#categoryCxSelect').cxSelect({
selects: ['category1', 'category2', 'category3', 'category4'],
jsonValue: 'goodsCategoryId',
jsonName: 'goodsCategoryName',
jsonSub: 'child',
data: result.data
});
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
}
function initTable() {
var options = {
url: prefix + "/list",
modalName: "师傅派单列表",
firstLoad: false,
columns: [
{
checkbox: true
}, {
field: 'name',
title: '昵称',
align: "left"
},
{
field: 'realName',
title: '真实姓名',
align: "left"
}, {
field: 'phone',
title: '手机号',
align: "left"
}, {
title: '操作',
align: 'left',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="assign(' + row.workerId + ')">指派</a> ');
return actions.join('');
}
}
]
};
$.table.init(options);
$.table.search('workerForm');
}
function selectRegion(regionLevelName, nextRegionLevelName) {
var regionId = $("#" + regionLevelName).val();
if ($.common.isEmpty(regionId)) {
return;
}
//Ajax调用处理
$.ajax({
type: "POST",
dataType:"json",
url: ctx + "system/area/list",
data: {parentCode: regionId},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#areaCxSelect').cxSelect({
selects: [nextRegionLevelName],
jsonValue: 'areaId',
jsonName: 'areaName',
data: result.data
});
} else {
$.modal.msgError("数据加载错误，请重试！")
}
}
})
}
function assign(workerId) {
var params = {
workerId: workerId,
orderMasterIds: orderMasterIds
};
$.ajax({
type: "POST",
dataType:"json",
url: ctx + "order/master/assign",
data: JSON.stringify(params),
contentType: 'application/json',
success: function (result) {
if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("指派成功")
loadCanAssignSpecInfo();
} else {
$.modal.msgError("指派失败")
}
}
})
}
</script>
</body>
</html>

205
ghy-admin/src/main/resources/templates/order/popup/editServingInfo.html
View File

@ -1,205 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('信息修改')"/>
<th:block th:include="include :: layout-latest-css"/>
<style>
.enabled-click-disabled-ele {
pointer-events: none;
}
</style>
</head>
<body class="white-bg">
<div class="ui-layout-center">
<div class="container-div">
<div class="row">
<div class="col-sm-12 m-t m-b">
<form id="order-form" class="form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label">客户地址：</label>
<div class="col-sm-8">
<input id="address" name="address" type="text" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户联系方式：</label>
<div class="col-sm-8">
<input id="addressPhone" name="addressPhone" type="text" class="form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">上门日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input id="expectDate" name="expectDate" type="text" class="form-control date-input" readonly>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">上门时间：</label>
<div class="col-sm-8">
<div onclick="toggleTimeDurationType('halfAnHourTimeDurationOpts', 'twoHoursTimeDurationOpts')">
<select id="halfAnHourTimeDurationOpts" name="expectDuration" class="form-control normal-select-input m-r">
<option value=""></option>
<option value="08:00-08:30">08:00-08:30</option>
<option value="08:30-09:00">08:30-09:00</option>
<option value="09:00-09:30">09:00-09:30</option>
<option value="09:30-10:00">09:30-10:00</option>
<option value="10:00-10:30">10:00-10:30</option>
<option value="10:30-11:00">10:30-11:00</option>
<option value="11:00-11:30">11:00-11:30</option>
<option value="11:30-12:00">11:30-12:00</option>
<option value="12:00-12:30">12:00-12:30</option>
<option value="12:30-13:00">12:30-13:00</option>
<option value="13:00-13:30">13:00-13:30</option>
<option value="13:30-14:00">13:30-14:00</option>
<option value="14:00-14:30">14:00-14:30</option>
<option value="14:30-15:00">14:30-15:00</option>
<option value="15:00-15:30">15:00-15:30</option>
<option value="15:30-16:00">15:30-16:00</option>
<option value="16:00-16:30">16:00-16:30</option>
<option value="16:30-17:00">16:30-17:00</option>
<option value="17:00-17:30">17:00-17:30</option>
<option value="17:30-18:00">17:30-18:00</option>
<option value="18:00-18:30">18:00-18:30</option>
<option value="18:30-19:00">18:30-19:00</option>
<option value="19:00-19:30">19:00-19:30</option>
<option value="19:30-20:00">19:30-20:00</option>
</select>
</div>
<div class="m-t m-b">或</div>
<div onclick="toggleTimeDurationType('twoHoursTimeDurationOpts', 'halfAnHourTimeDurationOpts')">
<select id="twoHoursTimeDurationOpts" name="expectDuration" class="form-control normal-select-input m-r enabled-click-disabled-ele" disabled>
<option value=""></option>
<option value="08:00-10:00">08:00-10:00</option>
<option value="10:00-12:00">10:00-12:00</option>
<option value="12:00-14:00">12:00-14:00</option>
<option value="14:00-16:00">14:00-16:00</option>
<option value="16:00-18:00">16:00-18:00</option>
<option value="18:00-20:00">18:00-20:00</option>
</select>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var orderId = '[[${orderId}]]';
var pageCode = '[[${pageCode}]]';
$(function () {
console.log(pageCode);
console.log(orderId);
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 185});
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win: $('.ui-layout-center'),
doc: $('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
initComponent();
});
function initComponent() {
$("#expectDate").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
}
function toggleTimeDurationType(enabledDurationId, disabledDurationId) {
let $enabledIdSelector = $("#" + enabledDurationId);
let $disabledIdSelector = $("#" + disabledDurationId);
$enabledIdSelector.prop('disabled', false);
$enabledIdSelector.removeClass('enabled-click-disabled-ele');
$disabledIdSelector.prop('disabled', true);
$disabledIdSelector.addClass('enabled-click-disabled-ele');
$disabledIdSelector.val('');
}
function validIfHasAtleastOneContent() {
if ($("#address").val()
|| $("#addressPhone").val()) {
return true;
}
if ($("#expectDate").val()
&& ($("#halfAnHourTimeDurationOpts").val()
|| $("#twoHoursTimeDurationOpts").val())) {
return true;
} else if ($("#expectDate").val()
|| ($("#halfAnHourTimeDurationOpts").val()
|| $("#twoHoursTimeDurationOpts").val())) {
$.modal.msgError("上门日期与时间需要同时填写");
return false;
}
$.modal.msgError("请填写需要修改的内容");
return false;
}
function translateFormInfo(data) {
let tmpParams = {};
data.forEach(function (item){
tmpParams[item.name] = item.value;
});
let params = {};
params.address = tmpParams.address;
params.addressPhone = tmpParams.addressPhone;
if (tmpParams.expectDuration && tmpParams.expectDate) {
let expectTimeArr = tmpParams.expectDuration.split('-');
let expectTimeStart = tmpParams.expectDate + ' ' + expectTimeArr[0] + ':00';
let expectTimeEnd = tmpParams.expectDate + ' ' + expectTimeArr[1] + ':00';
params.expectTimeStart = expectTimeStart;
params.expectTimeEnd = expectTimeEnd;
}
return params;
}
function submitHandler() {
if (!validIfHasAtleastOneContent()) return;
let data = $("#order-form").serializeArray();
let params = this.translateFormInfo(data);
params.id = orderId;
$.ajax({
type: "POST",
dataType:"json",
url: ctx + "order/master/editServingInfo",
data: JSON.stringify(params),
contentType: 'application/json',
success: function (result) {
if (result.code === web_status.SUCCESS) {
$.modal.msgSuccess("修改成功");
parent.layer.close(parent.layer.getFrameIndex(window.name));
} else {
$.modal.msgError(result.msg)
}
}
})
}
</script>
</body>
</html>

88
ghy-admin/src/main/resources/templates/order/record.html
View File

@ -1,88 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('拨号记录')"/>
<th:block th:include="include :: layout-latest-css"/>
</head>
<body class="gray-bg">
<div class="ui-layout-center">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="order-goods-form">
<!-- <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<script th:inline="javascript">
var prefix = ctx + "order/record";
var orderId = '[[${orderId}]]';
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 185});
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win: $('.ui-layout-center'),
doc: $('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryOrderCallList();
});
function queryOrderCallList() {
var options = {
url: prefix + "/list?orderType=01&orderId=" + orderId,
modalName: "拨号记录",
search: false,
showSearch: false,
showToggle: false,
showColumns: false,
showRefresh: false,
columns: [
{
field: 'id',
title: 'id',
visible: false
},
{
field: 'orderId',
title: '订单id',
visible: false
},
{
field: 'orderType',
title: '单据类型',
visible: false
},
{
field: 'callTime',
title: '联系时间'
}
]
};
$.table.init(options);
}
</script>
</body>
</html>

73
ghy-admin/src/main/resources/templates/worker/areaDetail.html
View File

@ -1,73 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('服务区域')"/>
<th:block th:include="include :: layout-latest-css"/>
</head>
<body class="gray-bg">
<div class="ui-layout-center">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="order-goods-form">
<!-- <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<script th:inline="javascript">
var prefix = ctx + "worker/area";
var workerId = '[[${workerId}]]';
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 185});
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win: $('.ui-layout-center'),
doc: $('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryOrderGoodsList();
});
function queryOrderGoodsList() {
var options = {
url: prefix + "/list?workerId=" + workerId,
modalName: "服务区域",
search: false,
showSearch: false,
showToggle: false,
showColumns: false,
showRefresh: false,
columns: [
{
field: 'mergerName',
title: '服务区域'
}
]
};
$.table.init(options);
}
</script>
</body>
</html>

73
ghy-admin/src/main/resources/templates/worker/categoryDetail.html
View File

@ -1,73 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('服务技能')"/>
<th:block th:include="include :: layout-latest-css"/>
</head>
<body class="gray-bg">
<div class="ui-layout-center">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="order-goods-form">
<!-- <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<script th:inline="javascript">
var prefix = ctx + "worker/goods/category";
var workerId = '[[${workerId}]]';
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 185});
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win: $('.ui-layout-center'),
doc: $('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryOrderGoodsList();
});
function queryOrderGoodsList() {
var options = {
url: prefix + "/list?workerId=" + workerId,
modalName: "服务技能",
search: false,
showSearch: false,
showToggle: false,
showColumns: false,
showRefresh: false,
columns: [
{
field: 'mergeName',
title: '服务技能'
}
]
};
$.table.init(options);
}
</script>
</body>
</html>

Some files were not shown because too many files have changed in this diff Show More