订单相关代码调整，删除无用代码

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/HomeController.java

@@ -80,9 +80,10 @@ public class HomeController {
             String currentMonth = DateTimeUtils.formatDate(new Date(), DateTimeUtils.DATE_NUMBER_YEAR_MONTH_FORMAT2);
             //营业额
             //订单量
-            List<HomeBlock> blockOrder = orderService.getBlock(start, end, deptId);
+//            List<HomeBlock> blockOrder = orderService.getBlock(start, end, deptId);
+            List<HomeBlock> blockOrder = new ArrayList<>();
 
-            //提现
+                    //提现
 //        List<HomeBlock> blockAmount = consumptionLogMapper.getBlockGetAmount(start, end, deptId);
             List<HomeBlock> blockAmount = txRecordMapper.getBlockGetAmount(start, end, deptId);
             //用户总数
@@ -170,7 +171,8 @@ public class HomeController {
         Date end = DateTimeUtils.getEndDayOfMonth(new Date());
         //营业额
         //订单量
-        List<HomeBlock> blockOrder = orderService.getBlock(start, end, deptId);
+        List<HomeBlock> blockOrder = new ArrayList<>();
+//        List<HomeBlock> blockOrder = orderService.getBlock(start, end, deptId);
         //提现
         List<HomeBlock> blockAmount = txRecordMapper.getBlockGetAmount(start, end, deptId);
         //用户总数

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TFinancialIncomeController.java

@@ -44,7 +44,8 @@ public class TFinancialIncomeController extends BaseController {
             LoginUser loginUser = this.getLoginUser();
             log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
 //            order.setDeptId(loginUser.getDeptId().toString());
-            Page<TOrder> all = orderService.getPcOrderIncome(page, order);
+//            Page<TOrder> all = orderService.getPcOrderIncome(page, order);
+            Page<TOrder> all = new Page<>();
             return R.ok(all);
         } catch (Exception e) {
             e.printStackTrace();
@@ -59,7 +60,8 @@ public class TFinancialIncomeController extends BaseController {
         LoginUser loginUser = this.getLoginUser();
         log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
 //        param.setDeptId(loginUser.getDeptId().toString());
-        Page<TOrder> all = orderService.getAll(page, param);
+//        Page<TOrder> all = orderService.getAll(page, param);
+        Page<TOrder> all = new Page<>();
         ExcelUtil<TOrder> util = new ExcelUtil<>(TOrder.class);
         util.exportExcel(response, all.getRecords(), "订单");
     }

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -1,643 +0,0 @@
-package com.ylx.web.controller.massage;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ylx.common.annotation.Log;
-import com.ylx.common.core.controller.BaseController;
-import com.ylx.common.core.domain.R;
-import com.ylx.common.core.domain.model.LoginUser;
-import com.ylx.common.enums.BusinessType;
-import com.ylx.common.exception.ServiceException;
-import com.ylx.common.utils.StringUtils;
-import com.ylx.common.utils.poi.ExcelUtil;
-import com.ylx.massage.domain.TJs;
-import com.ylx.order.domain.TOrder;
-import com.ylx.massage.domain.TWxUser;
-import com.ylx.massage.domain.vo.OrderAllocationResultVo;
-import com.ylx.massage.domain.vo.OrderVerificationVo;
-import com.ylx.massage.domain.vo.TechnicianAvailabilityVo;
-import com.ylx.massage.enums.Enumproject;
-import com.ylx.massage.enums.OrderStatusEnum;
-import com.ylx.massage.enums.OrderStatusEnumVo;
-import com.ylx.massage.domain.OrderAllocationLog;
-import com.ylx.massage.service.TJsService;
-import com.ylx.order.service.TOrderService;
-import com.ylx.massage.service.OrderAllocationLogService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * 订单表 前端控制器
- */
-@RestController
-@Slf4j
-@Api(tags = {"订单管理"})
-@RequestMapping("api/order/v1")
-public class TOrderController extends BaseController {
-    @Resource
-    private TOrderService orderService;
-
-    @Resource
-    private OrderAllocationLogService allocationLogService;
-
-    @Resource
-    private TJsService jsService;
-
-
-    /**
-     * 下单
-     *
-     * @param order
-     * @return R<TOrder>
-     */
-    @ApiOperation("下单")
-    @RequestMapping(value = "wx/add", method = RequestMethod.POST)
-    public R<TOrder> add(@RequestBody TOrder order) {
-        try {
-            return R.ok(orderService.addOrder(order));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 优惠卷核销
-     *
-     * @param order
-     * @return R<OrderVerificationVo>
-     */
-    @Log(title = "优惠卷核销", businessType = BusinessType.UPDATE)
-    @ApiOperation("优惠卷核销")
-    @RequestMapping(value = "wx/verification", method = RequestMethod.POST)
-    public R<OrderVerificationVo> verification(@RequestBody TOrder order) {
-        try {
-            return R.ok(orderService.verification(order));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 转单
-     *
-     * @param order
-     * @return R<TOrder>
-     */
-    @Log(title = "转单", businessType = BusinessType.INSERT)
-    @ApiOperation("转单")
-    @RequestMapping(value = "wx/transferOrder", method = RequestMethod.POST)
-    public R<TOrder> transferOrder(@RequestBody TOrder order) {
-        try {
-            return R.ok(orderService.transferOrder(order));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 支付订单
-     *
-     * @param order
-     * @return R
-     */
-    @ApiOperation("支付订单")
-    @Log(title = "支付订单", businessType = BusinessType.UPDATE)
-    @RequestMapping(value = "wx/pay", method = RequestMethod.POST)
-    public R pay(@RequestBody TOrder order) {
-        try {
-            log.info("支付订单接口前端传递的参数:{}", JSON.toJSONString(order));
-            return orderService.payOrder(order);
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-
-    /**
-     * 退单申请
-     *
-     * 业务流程：
-     * 1. 用户在订单详情页点击"取消订单"按钮
-     * 2. 填写退单原因
-     * 3. 提交申请
-     * 4. 系统创建退单申请记录，状态为待审核
-     * 5. 等待客服审核
-     *
-     *
-     * @param order 订单对象
-     * @return R
-     */
-    //@Log(title = "取消订单申请", businessType = BusinessType.UPDATE)
-    @ApiOperation("退单申请")
-    @RequestMapping(value = "wx/applyCancle", method = RequestMethod.POST)
-    public R applyCancle(@RequestBody JSONObject jsonObject) {
-        try {
-            log.info("收到退单申请请求，订单ID：{}，退单原因：{}", jsonObject.getString("cId"), jsonObject.getString("cancelReason"));
-            // 调用服务层处理退单申请
-            orderService.applyCancle(jsonObject.getString("cId"), jsonObject.getString("cancelReason"));
-            // 返回成功提示
-            return R.ok("您的申请已提交，客服审核中，请注意接听客服电话：19936963696");
-        } catch (ServiceException s) {
-            log.error("退单申请失败：{}", s.getMessage());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            log.error("退单申请系统异常", e);
-            return R.fail("系统异常，请稍后重试");
-        }
-    }
-
-    /**
-     * 取消退单申请（用户操作的接口）
-     *
-     * 业务流程：
-     * 1. 用户在订单详情页点击"取消退单申请"按钮
-     * 2. 系统校验订单状态和退单申请状态
-     * 3. 取消退单申请，将申请状态标记为已取消
-     * 4. 恢复订单到申请前的原始状态
-     * 5. 返回成功提示
-     *
-     * @param order 订单对象，需要包含cId（订单ID）
-     * @return R 操作结果
-     */
-    @ApiOperation("取消退单申请")
-    @RequestMapping(value = "wx/cancelApplyCancle", method = RequestMethod.POST)
-    public R cancelApplyCancle(@RequestBody TOrder order) {
-        try {
-            log.info("收到取消退单申请请求，订单ID：{}", order.getId());
-            // 调用服务层处理取消退单申请
-            orderService.cancelApplyCancle(order);
-            // 返回成功提示
-            return R.ok("已成功取消退单申请，订单已恢复到原状态");
-        } catch (ServiceException s) {
-            log.error("取消退单申请失败：{}", s.getMessage());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            log.error("取消退单申请系统异常", e);
-            return R.fail("系统异常，请稍后重试");
-        }
-    }
-
-    /**
-     * 取消订单（用户操作的接口）
-     *
-     * @param order
-     * @return R
-     */
-    @Log(title = "取消订单", businessType = BusinessType.UPDATE)
-    @ApiOperation("取消订单")
-    @RequestMapping(value = "wx/cancle", method = RequestMethod.POST)
-    public R cancle(@RequestBody TOrder order) {
-        try {
-            return R.ok(orderService.cancle(order));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 拒绝订单
-     *
-     * @param order
-     * @return
-     */
-    @Log(title = "拒绝订单", businessType = BusinessType.UPDATE)
-    @ApiOperation("拒绝订单")
-    @RequestMapping(value = "wx/jujue", method = RequestMethod.POST)
-    public R jujue(@RequestBody TOrder order) {
-        try {
-            return R.ok(orderService.jujue(order));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-
-    /**
-     * 接受订单（技师端操作的接口）
-     *
-     * @param order
-     * @return R
-     */
-    @Log(title = "接受订单", businessType = BusinessType.UPDATE)
-    @ApiOperation("接受订单")
-    @RequestMapping(value = "wx/takingOrders", method = RequestMethod.POST)
-    public R takingOrders(@RequestBody TOrder order) {
-        try {
-            orderService.takingOrders(order);
-            return R.ok();
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-
-    /**
-     * 出发（技师端操作的接口）
-     *
-     * @param order
-     * @return R
-     */
-    @Log(title = "出发", businessType = BusinessType.UPDATE)
-    @ApiOperation("出发")
-    @RequestMapping(value = "wx/depart", method = RequestMethod.POST)
-    public R depart(@RequestBody TOrder order) {
-        try {
-            orderService.depart(order);
-            return R.ok();
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 到达订单位置（技师端操作的接口）
-     *
-     * @param order
-     * @return R
-     */
-    @Log(title = "到达订单位置", businessType = BusinessType.UPDATE)
-    @ApiOperation("到达订单位置")
-    @RequestMapping(value = "wx/reach", method = RequestMethod.POST)
-    public R reach(@RequestBody TOrder order) {
-        try {
-            log.info("到达订单位置，order对象的值：{}", JSON.toJSONString(order));
-
-            LambdaQueryWrapper<TOrder> wrapper = new LambdaQueryWrapper<>();
-//            wrapper.eq(TOrder::getcId, order.getcId()).eq(TOrder::getnStatus, OrderStatusEnum.DEPART.getCode());
-//            order.setnStatus(OrderStatusEnum.ARRIVED.getCode());
-//            order.setReachTime(LocalDateTime.now());
-//            order.setArrivalLatitude(Optional.ofNullable(order.getArrivalLatitude()).orElse(BigDecimal.ZERO));
-//            order.setArrivalLongitude(Optional.ofNullable(order.getArrivalLongitude()).orElse(BigDecimal.ZERO));
-            order.setArrivalPhoto(Optional.ofNullable(order.getArrivalPhoto()).orElse(StringUtils.EMPTY));
-            return R.ok(orderService.update(order, wrapper));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 开始服务（技师端操作的接口）
-     *
-     * @param order
-     * @return R
-     */
-    @Log(title = "开始服务", businessType = BusinessType.UPDATE)
-    @ApiOperation("开始服务")
-    @RequestMapping(value = "wx/service", method = RequestMethod.POST)
-    public R service(@RequestBody TOrder order) {
-        try {
-            LambdaQueryWrapper<TOrder> wrapper = new LambdaQueryWrapper<>();
-//            wrapper.eq(TOrder::getcId, order.getcId()).eq(TOrder::getnStatus, OrderStatusEnum.ARRIVED.getCode());
-//            // 设置订单状态：服务中
-//            order.setnStatus(OrderStatusEnum.SERVICE.getCode());
-            order.setStartTime(LocalDateTime.now());
-            return R.ok(orderService.update(order, wrapper));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 确认订单（技师端的操作接口）
-     *
-     * @param order
-     * @return R
-     */
-    //@Log(title = "确认服务完成", businessType = BusinessType.UPDATE)
-    @ApiOperation("确认服务完成")
-    @RequestMapping(value = "wx/confirm", method = RequestMethod.POST)
-    public R confirm(@RequestBody TOrder order) {
-        try {
-            return R.ok(orderService.confirm(order));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "."
-                    + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 获取订单信息（H5端 用户端）
-     *
-     * @param page
-     * @param param
-     * @return R
-     */
-    @Log(title = "微信获取订单信息", businessType = BusinessType.OTHER)
-    @ApiOperation("获取订单信息")
-    @RequestMapping(value = "wx/getOrder", method = RequestMethod.GET)
-    public R getOrder(Page<TOrder> page, TOrder param) {
-        try {
-            Page<TOrder> all = orderService.getAll(page, param);
-            return R.ok(all);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Log(title = "技师端-获取待接单数量", businessType = BusinessType.OTHER)
-    @ApiOperation("技师端-获取待接单数量")
-    @RequestMapping(value = "wx/waitOrder", method = RequestMethod.GET)
-    public R waitOrder(@RequestParam String cJsId) {
-        List<TOrder> list = new ArrayList<>();
-//                List<TOrder> list = orderService.list(new LambdaQueryWrapper<TOrder>().
-//                eq(TOrder::getnStatus, OrderStatusEnum.WAIT_JD.getCode()).
-//                eq(TOrder::getcJsId, cJsId));
-        return R.ok(list.size());
-    }
-
-
-    /**
-     * PC获取订单信息（PC端）
-     *
-     * @param page
-     * @param order
-     * @return R
-     */
-    @Log(title = "PC获取订单信息", businessType = BusinessType.OTHER)
-    @ApiOperation("PC获取订单信息")
-    @RequestMapping(value = "pc/getOrder", method = RequestMethod.GET)
-    public R getPcOrder(Page<TOrder> page, TOrder order) {
-        try {
-            LoginUser loginUser = this.getLoginUser();
-            log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
-//            order.setDeptId(loginUser.getDeptId().toString());
-            Page<TOrder> all = orderService.getAll(page, order);
-            return R.ok(all);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Log(title = "微信获取订单信息", businessType = BusinessType.EXPORT)
-    @ApiOperation("导出")
-    @PostMapping(value = "wx/export")
-    public void export(HttpServletResponse response, Page<TOrder> page, TOrder param) {
-        Page<TOrder> all = orderService.getAll(page, param);
-        ExcelUtil<TOrder> util = new ExcelUtil<>(TOrder.class);
-        util.exportExcel(response, all.getRecords(), "订单");
-    }
-
-    /**
-     * 分页查询订单数据
-     *
-     * @param page
-     * @param order
-     * @return R
-     */
-    @ApiOperation("分页查询订单数据")
-    @RequestMapping(value = "/select", method = RequestMethod.GET)
-    public R selectSp(Page<TOrder> page, TOrder order) {
-        LambdaQueryWrapper<TOrder> tOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-//        tOrderLambdaQueryWrapper.eq(StringUtils.isNotBlank(order.getcJsId()), TOrder::getcJsId, order.getcJsId()).
-//                eq(StringUtils.isNotBlank(order.getcOpenId()), TOrder::getcOpenId, order.getcOpenId()).
-//                eq(null != order.getnStatus(), TOrder::getnStatus, order.getnStatus());
-        // 获取查询返回结果
-        Page<TOrder> pageSelect = orderService.page(page, tOrderLambdaQueryWrapper);
-        return R.ok(pageSelect);
-    }
-
-
-    /**
-     * 更新订单数据
-     *
-     * @param borrow
-     * @return R 操作结果
-     */
-    @ApiOperation("更新订单数据")
-    @Log(title = "更新订单数据", businessType = BusinessType.OTHER)
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public R update(@RequestBody TOrder borrow) {
-        try {
-            return R.ok(orderService.updateAddressById(borrow));
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            StackTraceElement stackTraceElement = e.getStackTrace()[0];
-            log.error("系统出错，错误信息:" + e + " at " + stackTraceElement.getClassName() + "."
-                    + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber());
-            return R.fail("系统异常");
-        }
-    }
-
-    /**
-     * 根据订单ID删除订单数据
-     *
-     * @param borrow
-     * @return R 操作结果
-     */
-    @ApiOperation("删除数据")
-    @RequestMapping(value = "/del", method = RequestMethod.POST)
-    public R del(@RequestBody TOrder borrow) {
-        try {
-            log.info("删除订单ID：{}", borrow.getId());
-            return R.ok(orderService.removeById(borrow));
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 根据订单ID查询订单详情
-     *
-     * @param borrow
-     * @return R<TOrder> 订单详情
-     */
-    @ApiOperation("根据订单ID查询订单详情")
-    @RequestMapping(value = "/getByid", method = RequestMethod.POST)
-    public R<TOrder> getByid(@RequestBody TOrder borrow) {
-        try {
-            return R.ok(orderService.getById(borrow.getId()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 获取订单状态
-     *
-     * @return R
-     */
-    @ApiOperation("订单状态")
-    @RequestMapping(value = "/getStatus", method = RequestMethod.GET)
-    public R getStatus() {
-        List<Enumproject> statusEnum = OrderStatusEnumVo.getStatusEnum();
-        return R.ok(statusEnum);
-    }
-
-    /**
-     * 分页查询订单分配操作记录
-     *
-     * @param page    分页参数
-     * @param orderNo 订单号
-     * @return R 分页结果
-     */
-    @Log(title = "分页查询订单分配操作记录", businessType = BusinessType.OTHER)
-    @ApiOperation("分页查询订单分配操作记录")
-    @RequestMapping(value = "/allocationLogs/page", method = RequestMethod.GET)
-    public R getAllocationLogsPage(Page<OrderAllocationLog> page, @RequestParam String orderNo) {
-        try {
-            // 构建查询条件
-            LambdaQueryWrapper<OrderAllocationLog> wrapper = new LambdaQueryWrapper<>();
-            // 订单号条件
-            wrapper.eq(StringUtils.isNotBlank(orderNo), OrderAllocationLog::getOrderNo, orderNo);
-            // 按创建时间倒序排列
-            wrapper.orderByDesc(OrderAllocationLog::getCreateTime);
-
-            // 分页查询
-            Page<OrderAllocationLog> resultPage = allocationLogService.page(page, wrapper);
-
-            // 转换为VO列表
-            List<OrderAllocationResultVo> voList = resultPage.getRecords().stream()
-                    .map(log -> {
-                        // 转换为VO
-                        OrderAllocationResultVo vo = new OrderAllocationResultVo();
-                        BeanUtils.copyProperties(log, vo);
-                        //根据newTechnicianId查询新技师电话
-                        if (StringUtils.isNotBlank(vo.getNewTechnicianId())) {
-                            TJs technician = jsService.getById(log.getNewTechnicianId());
-                            if (technician != null) {
-                                vo.setNewTechnicianPhone(technician.getcPhone());
-                            }
-                        }
-                        return vo;
-                    }).collect(Collectors.toList());
-
-            // 创建新的分页对象，包装转换后的VO列表
-            Page<OrderAllocationResultVo> voPage = new Page<>(page.getCurrent(), page.getSize(), resultPage.getTotal());
-            voPage.setRecords(voList);
-            voPage.setPages(resultPage.getPages());
-
-            return R.ok(voPage);
-        } catch (Exception e) {
-            log.error("分页查询订单分配记录失败 - 错误信息：{}", e.getMessage(), e);
-            return R.fail("分页查询分配记录失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 获取技师当天可预约时间
-     *
-     * @param technicianId 技师ID
-     * @param date 查询日期（格式：yyyy-MM-dd），可选，不传则查询当天
-     * @return R
-     */
-    //@Log(title = "获取技师当天可预约时间", businessType = BusinessType.OTHER)
-    @ApiOperation("获取技师当天可预约时间")
-    @RequestMapping(value = "wx/getTechnicianAvailability", method = RequestMethod.GET)
-    public R<TechnicianAvailabilityVo> getTechnicianAvailability(@RequestParam String technicianId, @RequestParam(required = false) String date) {
-        try {
-            log.info("获取技师当天可预约时间，技师ID：{}，查询日期：{}", technicianId, date);
-            TechnicianAvailabilityVo availability = orderService.getTechnicianAvailability(technicianId, date);
-            return R.ok(availability);
-        } catch (ServiceException s) {
-            log.error(s.toString());
-            return R.fail(s.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.fail("系统异常");
-        }
-    }
-
-    @Log(title = "累计营业收入,平台佣金收入,累计商家收入", businessType = BusinessType.OTHER)
-    @ApiOperation("累计营业收入,平台佣金收入,累计商家收入")
-    @RequestMapping(value = "pc/totalData", method = RequestMethod.GET)
-    public R totalData() {
-        log.info("累计营业收入,平台佣金收入,累计商家收入,查询开始：{}", LocalDateTime.now());
-        LoginUser loginUser = this.getLoginUser();
-        log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
-        TOrder order = new TOrder();
-//        order.setDeptId(loginUser.getDeptId().toString());
-        return R.ok(orderService.totalData(order));
-    }
-
-    @ApiOperation("商户收益，总额，待结算，已结算")
-    @RequestMapping(value = "wx/myIncome", method = RequestMethod.GET)
-    public R<Map<String, String>> myIncome(TWxUser user){
-        log.info("商户收益，总额，待结算，已结算,查询开始：{}", LocalDateTime.now());
-        return R.ok(orderService.myIncome(user));
-    }
-
-    @ApiOperation("商户收入明细")
-    @RequestMapping(value = "wx/myIncomeDetail", method = RequestMethod.GET)
-    public R<List<Map<String, Object>>>
-    myIncomeDetail(TWxUser user, Integer wStatus){
-        log.info("商户收入明细,查询开始：{}", LocalDateTime.now());
-        return R.ok(orderService.myIncomeDetail(user, wStatus));
-    }
-
-}

nightFragrance-massage/src/main/java/com/ylx/massage/task/massageTask.java

@@ -142,7 +142,7 @@ public class massageTask {
             resPage.getRecords().forEach(order -> {
                 //调用拒绝接单
                 order.setRejectedReason("超时未接单");
-                orderService.jujue(order);
+//                orderService.jujue(order);
             });
         }
         return resPage.getTotal();
@@ -339,14 +339,14 @@ public class massageTask {
                     tJsDay.setName(js.getcName());
                     Integer onLine = signService.getOnLineTime(js.getId(), startDate, endDate);
                     tJsDay.setOnLine(onLine);
-                    Integer orderNum = orderService.getOrderNum(js.getId(), startDate, endDate);
-                    tJsDay.setOrderNum(orderNum);
-                    Integer addNum = orderService.getAddNum(js.getId(), startDate, endDate);
-                    tJsDay.setAddNum(addNum);
-                    Integer upgradeNum = orderService.getUpgradeNum(js.getId(), startDate, endDate);
-                    tJsDay.setUpgradeNum(upgradeNum);
-                    BigDecimal turnover = orderService.getTurnover(js.getId(), startDate, endDate);
-                    tJsDay.setTurnover(turnover);
+//                    Integer orderNum = orderService.getOrderNum(js.getId(), startDate, endDate);
+//                    tJsDay.setOrderNum(orderNum);
+//                    Integer addNum = orderService.getAddNum(js.getId(), startDate, endDate);
+//                    tJsDay.setAddNum(addNum);
+//                    Integer upgradeNum = orderService.getUpgradeNum(js.getId(), startDate, endDate);
+//                    tJsDay.setUpgradeNum(upgradeNum);
+//                    BigDecimal turnover = orderService.getTurnover(js.getId(), startDate, endDate);
+//                    tJsDay.setTurnover(turnover);
                     BigDecimal recharge = rechargeService.getRecharge(js.getId(), startDate, endDate);
                     tJsDay.setRecharge(recharge);
                     tJsDay.setCountDate(DateTimeUtils.formatDate(startDate, DateTimeUtils.DATE_FORMAT));
@@ -423,8 +423,8 @@ public class massageTask {
     public void autoAccount() {
         log.info("开始执行同步自动分账,{}", DateUtils.getNowDate());
         //执行存储过程
-        //>48小时 订单状态 [待结算] 更新为 [已结算]  自动分账  订单总金额划入用户余额
-        orderService.callAutoAccount(Integer.parseInt(hCount), new BigDecimal(percent));
+//        //>48小时 订单状态 [待结算] 更新为 [已结算]  自动分账  订单总金额划入用户余额
+//        orderService.callAutoAccount(Integer.parseInt(hCount), new BigDecimal(percent));
 
         log.info("执行同步自动分账结束,{}", DateUtils.getNowDate());
 

nightFragrance-massage/src/main/java/com/ylx/order/service/TOrderService.java

@@ -3,12 +3,8 @@ package com.ylx.order.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
-import com.ylx.common.core.domain.R;
-import com.ylx.order.domain.TOrder;
 import com.ylx.massage.domain.TWxUser;
-import com.ylx.massage.domain.vo.HomeBlock;
-import com.ylx.massage.domain.vo.OrderVerificationVo;
-import com.ylx.massage.domain.vo.TechnicianAvailabilityVo;
+import com.ylx.order.domain.TOrder;
 import com.ylx.order.domain.dto.*;
 import com.ylx.order.domain.vo.BookingSlotsVO;
 import com.ylx.order.domain.vo.OrderDateQueryVo;
@@ -19,8 +15,6 @@ import com.ylx.order.domain.vo.merchant.MerchantOrderDetailVO;
 import com.ylx.order.domain.vo.merchant.OrderCustomerPhoneVO;
 import com.ylx.order.domain.vo.merchant.OrderPageVO;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -29,136 +23,6 @@ import java.util.Map;
  * 订单表 服务类
  */
 public interface TOrderService extends IService<TOrder> {
-    /**
-     * 添加订单
-     */
-    public TOrder addOrder(TOrder order);
-
-    /**
-     * 支付订单
-     */
-    public R payOrder(TOrder order) throws Exception;
-
-    /**
-     * 拒绝订单
-     */
-    public Boolean jujue(TOrder order);
-
-    /**
-     * 确认服务完成
-     * @param order
-     * @return
-     */
-    public Boolean confirm(TOrder order);
-
-    /**
-     * 取消订单
-     * @param order
-     * @return
-     */
-    public Boolean cancle(TOrder order);
-
-
-    public TOrder getByNo(String orderNo);
-
-    /**
-     * 分页查询订单数据
-     * @param page
-     * @param param
-     * @return Page<TOrder>
-     */
-    public Page<TOrder> getAll(Page<TOrder>page, TOrder order);
-
-    void takingOrders(TOrder order);
-
-    void payNotifyOrder(String outTradeNo);
-
-    Object updateAddressById(TOrder borrow);
-
-    Object depart(TOrder order);
-
-    Integer getOrderNum(String jsid, Date startDate, Date endDate);
-
-    Integer getAddNum(String jsid, Date startDate, Date endDate);
-
-    Integer getUpgradeNum(String id, Date startDate, Date endDate);
-
-    BigDecimal getTurnover(String id, Date startDate, Date endDate);
-
-    TOrder transferOrder(TOrder order);
-
-    List<HomeBlock> getBlock(Date start, Date end, String deptId);
-
-    OrderVerificationVo verification(TOrder order);
-
-    /**
-     * 获取技师当天可预约时间
-     * @param technicianId 技师ID
-     * @param dateStr 查询日期（格式：yyyy-MM-dd），为null则查询当天
-     * @return 技师当天可预约时间VO
-     */
-    TechnicianAvailabilityVo getTechnicianAvailability(String technicianId, String dateStr);
-
-    /**
-     * 申请取消订单（退单申请）
-     * @param cId 订单ID
-     * @param cancelReason 退单原因
-     * @return 申请结果
-     */
-    Boolean applyCancle(String cId, String cancelReason);
-
-    /**
-     * 取消退单申请
-     * 用户主动取消退单申请，恢复订单状态
-     *
-     * 业务流程：
-     * 1. 参数校验（订单ID不能为空）
-     * 2. 查询订单和退单申请记录
-     * 3. 校验订单状态必须为"退单待审核"(6)
-     * 4. 校验退单申请状态必须为"待审核"(0)
-     * 5. 调用退单申请服务取消申请
-     * 6. 恢复订单状态到申请前的原始状态
-     *
-     * @param order 订单对象，需要包含cId（订单ID）
-     * @return 操作结果
-     */
-    Boolean cancelApplyCancle(TOrder order);
-
-    /**
-     * PC收入明细
-     * @param page
-     * @param order
-     * @return
-     */
-    Page<TOrder> getPcOrderIncome(Page<TOrder> page, TOrder order);
-
-    /**
-     * 累计营业收入  累计平台佣金收入  累计商家收入
-     * @return
-     */
-    public Map<String, String> totalData(TOrder order);
-
-    /**
-     * 执行存储过程 大于48小时 订单状态更新为 已结算  自动分账  订单总金额划入用户余额
-     * @param hCount
-     * @param percent
-     */
-    void callAutoAccount(int hCount, BigDecimal percent);
-
-    /**
-     * 商户收益，总额，待结算，已结算
-     * @param user
-     * @return
-     */
-    public Map<String, String> myIncome(TWxUser user);
-
-    /**
-     * 商户收入明细
-     * @param user
-     * @param wStatus
-     * @return
-     */
-    public List<Map<String, Object>> myIncomeDetail(TWxUser user, Integer wStatus);
 
     Map<String, Object> submitOrder(OrderSubmitDTO dto);
 

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/TOrderServiceImpl.java

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
 import com.ylx.address.domain.TAddress;
 import com.ylx.address.service.TAddressService;
-import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.entity.SysDictData;
 import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
@@ -24,9 +23,6 @@ import com.ylx.massage.domain.MaProject;
 import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.TGeoFence;
 import com.ylx.massage.domain.TWxUser;
-import com.ylx.massage.domain.vo.HomeBlock;
-import com.ylx.massage.domain.vo.OrderVerificationVo;
-import com.ylx.massage.domain.vo.TechnicianAvailabilityVo;
 import com.ylx.massage.mapper.MaProjectMapper;
 import com.ylx.massage.mapper.MaTechnicianMapper;
 import com.ylx.massage.service.CouponService;
@@ -87,10 +83,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("M月d日");
     private final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm");
 
-    /**
-     * 仅允许取消的状态：待付款(0)
-     */
-    private static final List<Integer> ALLOWED_CANCEL_STATUS = Collections.singletonList(0);
     @Resource
     private ProjectService projectService;
     @Resource
@@ -136,136 +128,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     @Resource
     private RedisTemplate<String, String> redisTemplate;
 
-    @Override
-    public TOrder addOrder(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public R payOrder(TOrder order) throws Exception {
-        return null;
-    }
-
-    @Override
-    public Boolean jujue(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public Boolean confirm(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public Boolean cancle(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public TOrder getByNo(String orderNo) {
-        return null;
-    }
-
-    @Override
-    public Page<TOrder> getAll(Page<TOrder> page, TOrder order) {
-        return null;
-    }
-
-    @Override
-    public void takingOrders(TOrder order) {
-
-    }
-
-    @Override
-    public void payNotifyOrder(String outTradeNo) {
-
-    }
-
-    @Override
-    public Object updateAddressById(TOrder borrow) {
-        return null;
-    }
-
-    @Override
-    public Object depart(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public Integer getOrderNum(String jsid, Date startDate, Date endDate) {
-        return 0;
-    }
-
-    @Override
-    public Integer getAddNum(String jsid, Date startDate, Date endDate) {
-        return 0;
-    }
-
-    @Override
-    public Integer getUpgradeNum(String id, Date startDate, Date endDate) {
-        return 0;
-    }
-
-    @Override
-    public BigDecimal getTurnover(String id, Date startDate, Date endDate) {
-        return null;
-    }
-
-    @Override
-    public TOrder transferOrder(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public List<HomeBlock> getBlock(Date start, Date end, String deptId) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public OrderVerificationVo verification(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public TechnicianAvailabilityVo getTechnicianAvailability(String technicianId, String dateStr) {
-        return null;
-    }
-
-    @Override
-    public Boolean applyCancle(String cId, String cancelReason) {
-        return null;
-    }
-
-    @Override
-    public Boolean cancelApplyCancle(TOrder order) {
-        return null;
-    }
-
-    @Override
-    public Page<TOrder> getPcOrderIncome(Page<TOrder> page, TOrder order) {
-        return null;
-    }
-
-    @Override
-    public Map<String, String> totalData(TOrder order) {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void callAutoAccount(int hCount, BigDecimal percent) {
-
-    }
-
-    @Override
-    public Map<String, String> myIncome(TWxUser user) {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public List<Map<String, Object>> myIncomeDetail(TWxUser user, Integer wStatus) {
-        return Collections.emptyList();
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> submitOrder(OrderSubmitDTO dto) {