From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java | 155 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 133 insertions(+), 22 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java index fae13ee..4651a84 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java @@ -1,9 +1,7 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO; -import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO; -import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO; +import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.model.dos.ComShopOrderDO; @@ -15,61 +13,174 @@ public interface ComShopOrderService extends IService<ComShopOrderDO> { /** + * 分页搜索订单记录 + * + * @param pageComShopOrderSearchDTO + * 分页数据 + * @return 分页订单 + */ + R pageShopOrder(PageComShopOrderSearchDTO pageComShopOrderSearchDTO); + + /** * 订单预览 - * @param orderPreviewDTO 请求参数 - * @return 订单预览数据 + * + * @param orderPreviewDTO + * 请求参数 + * @return 订单预览数据 */ R orderPreview(ComShopOrderPreviewDTO orderPreviewDTO); /** * 创建订单 - * @param orderCreateDTO 创建订单请求参数 - * @return 创建结果 + * + * @param orderCreateDTO + * 创建订单请求参数 + * @return 创建结果 */ R orderCreate(ComShopOrderCreateDTO orderCreateDTO); /** * 分页查询用户订单列表 - * @param comOrderListDTO 请求参数 - * @return 查询结果 + * + * @param comOrderListDTO + * 请求参数 + * @return 查询结果 */ R pageOrderList(PageComOrderListDTO comOrderListDTO); /** * 根据订单id查询订单详情 - * @param orderId 订单id - * @return 订单详情 + * + * @param orderId + * 订单id + * @return 订单详情 */ R orderDetail(Long orderId); /** * 根据订单id取消订单 - * @param orderId 订单id - * @param phone 操作用户手机号 - * @return 取消结果 + * + * @param comShopOrderQueryDTO + * 订单信息 + * @return 取消结果 */ - R orderCancel(Long orderId,String phone); + R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO); /** * 根据订单id删除订单 - * @param orderId 订单id - * @return 删除结果 + * + * @param orderId + * 订单id + * @return 删除结果 */ R orderDelete(Long orderId); /** * 根据订单id确认收货 - * @param orderId 订单id - * @param phone 手机号 - * @return 确认结果 + * + * @param orderId + * 订单id + * @param phone + * 手机号 + * @return 确认结果 */ R orderConfirm(Long orderId, String phone); /** * 统计用户订单数量 - * @param userId 用户id - * @return 统计结果 + * + * @param userId + * 用户id + * @return 统计结果 */ R orderStatistics(Long userId); + /** + * 商家资金的订单详情 + * + * @param id + * 订单id + * @return + */ + R capitalDetailByStore(Long id); + + /** + * 订单发货 + * + * @param orderShipDTO + * 订单发货信息 + * @return 发货结果 + */ + R shipOrder(ComShopOrderShipDTO orderShipDTO); + + /** + * 订单配送 + * + * @param orderDeliverDTO + * 订单信息 + * @return 配送结果 + */ + R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO); + + /** + * 订单完成配送 + * + * @param orderDeliverDTO + * 订单信息 + * @return 完成配送结果 + */ + R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO); + + /** + * 获取订单导出数据 + * + * @param comShopOrderExportDTO + * 订单导出参数 + * @return 订单数据 + */ + R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO); + + /** + * 获取资金导出数据 + * + * @param comShopFundsExportDTO + * 资金导出参数 + * @return 资金数据 + */ + R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO); + + /** + * 获取用户资金信息 + * + * @param userId + * 用户ID + * @return 统计结果 + */ + R getFundsStat(Long userId); + + /** + * 获取分页 资金订单数据 + * + * @param pageComShopFundsSearchDTO + * 资金导出参数 + * @return 资金订单数据 + */ + R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO); + + /** + * 微信支付订单回调 + * + * @param wxPayNotifyOrderDTO + * 订单支付回调参数 + */ + void wxOrderPayNotify(WxPayNotifyOrderDTO wxPayNotifyOrderDTO); + + /** + * 用户点击去支付 + * + * @param orderPayDTO + * 请求参数 + * @return 返回支付对象 + */ + R wxPay(OrderPayDTO orderPayDTO); } -- Gitblit v1.7.1