调整订单相关目录结构

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

@@ -11,12 +11,12 @@ import com.ylx.common.utils.SecurityUtils;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.CancelOrderApplication;
 import com.ylx.massage.domain.TJs;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.domain.vo.CancelOrderApplicationDetailVo;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.service.CancelOrderApplicationService;
 import com.ylx.massage.service.TJsService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -8,7 +8,7 @@ import com.ylx.massage.domain.TJsDay;
 import com.ylx.massage.domain.vo.HomeBlock;
 import com.ylx.massage.domain.vo.HomeBlocks;
 import com.ylx.massage.mapper.*;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.utils.DateTimeUtils;
 import com.ylx.massage.utils.WeChatUtil;
 import com.ylx.system.service.ISysOperLogService;

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

@@ -6,14 +6,13 @@ 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.WxLoginUser;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.utils.StringUtils;
 
 import com.ylx.massage.domain.TComment;
 
 import com.ylx.massage.service.TCommentService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,42 +1,22 @@
 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.OrderAllocationLog;
-import com.ylx.massage.domain.TJs;
-import com.ylx.massage.domain.TOrder;
-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.service.OrderAllocationLogService;
-import com.ylx.massage.service.TJsService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.domain.TOrder;
+import com.ylx.order.service.TOrderService;
 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.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * 订单表 前端控制器

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

@@ -13,7 +13,7 @@ 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.massage.domain.TOrder;
+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;
@@ -23,11 +23,10 @@ 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.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.service.OrderAllocationLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
@@ -37,7 +36,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.YearMonth;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

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

@@ -10,7 +10,6 @@ import com.ylx.common.core.domain.R;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.poi.ExcelUtil;
-import com.ylx.massage.domain.TOrder;
 import com.ylx.massage.domain.TTxRecord;
 import com.ylx.massage.enums.TTxRecordEnum;
 import com.ylx.massage.service.TTxRecordService;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/CancelOrderApplicationDetailVo.java

@@ -1,7 +1,7 @@
 package com.ylx.massage.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import lombok.Data;
 
 import java.math.BigDecimal;

nightFragrance-massage/src/main/java/com/ylx/massage/service/OrderNotificationService.java

@@ -1,6 +1,6 @@
 package com.ylx.massage.service;
 
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 
 /**
  * 订单消息通知服务接口

nightFragrance-massage/src/main/java/com/ylx/massage/service/OrderValidationService.java

@@ -1,6 +1,6 @@
 package com.ylx.massage.service;
 
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 
 /**
  * 订单校验服务接口

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

@@ -1,6 +1,5 @@
 package com.ylx.massage.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,12 +7,11 @@ import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.CancelOrderApplication;
 import com.ylx.massage.domain.TJs;
-import com.ylx.massage.domain.TOrder;
-import com.ylx.massage.domain.TWxUser;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.service.CancelOrderApplicationService;
 import com.ylx.massage.service.TJsService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.service.TWxUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 /**
  * 退单申请服务实现类

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

@@ -4,7 +4,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ylx.common.config.WechatAccountConfig;
 import com.ylx.massage.domain.TJs;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.domain.TXiangmu;
 import com.ylx.massage.service.OrderNotificationService;
 import com.ylx.massage.service.TJsService;

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

@@ -3,10 +3,10 @@ package com.ylx.massage.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ylx.common.exception.ServiceException;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.service.OrderValidationService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.utils.OrderTimeRangeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -5,11 +5,11 @@ import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.TComment;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.mapper.TCommentMapper;
 import com.ylx.massage.service.TCommentService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -13,13 +13,13 @@ import com.ylx.lottery.service.LotteryCountLogService;
 import com.ylx.lottery.service.LotteryCountService;
 import com.ylx.massage.domain.CommentUserAudit;
 import com.ylx.massage.domain.TCommentUser;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.domain.TWxUser;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.mapper.TCommentUserMapper;
 import com.ylx.massage.service.TCommentUserAuditService;
 import com.ylx.massage.service.TCommentUserService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.service.TWxUserService;
 import com.ylx.point.domain.dto.ApiAddPointsDTO;
 import com.ylx.point.service.IPointAccountService;

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 
 import cn.hutool.json.JSONException;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,6 +22,7 @@ import com.ylx.massage.utils.DateTimeUtils;
 import com.ylx.massage.utils.LocationUtil;
 import com.ylx.massage.utils.VirtualTechnicianNicknameGenerator;
 import com.ylx.massage.utils.WeChatUtil;
+import com.ylx.order.service.TOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;

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

@@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.TJs;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.domain.YlxAlarm;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.mapper.YlxAlarmMapper;
 import com.ylx.massage.service.TJsService;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.service.YlxAlarmService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -11,15 +11,15 @@ import com.ylx.massage.domain.*;
 import com.ylx.massage.enums.BillTypeEnum;
 import com.ylx.massage.enums.JsStatusEnum;
 import com.ylx.massage.enums.OrderStatusEnum;
-import com.ylx.massage.enums.OrderWStateEnum;
 import com.ylx.massage.mapper.TConsumptionLogMapper;
 import com.ylx.massage.service.*;
 import com.ylx.massage.utils.DateTimeUtils;
 import com.ylx.massage.utils.LocationUtil;
 import com.ylx.massage.utils.WeChatUtil;
+import com.ylx.order.domain.TOrder;
+import com.ylx.order.service.TOrderService;
 import com.ylx.system.service.ISysDeptService;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

nightFragrance-massage/src/main/java/com/ylx/massage/utils/OrderTimeRangeUtils.java

@@ -2,7 +2,7 @@ package com.ylx.massage.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 import com.ylx.massage.enums.OrderStatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java → nightFragrance-massage/src/main/java/com/ylx/order/domain/TOrder.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.domain;
+package com.ylx.order.domain;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ylx.common.annotation.Excel;
+import com.ylx.massage.domain.TJs;
+import com.ylx.massage.domain.TWxUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TOrderMapper.java → nightFragrance-massage/src/main/java/com/ylx/order/mapper/TOrderMapper.java

@@ -1,11 +1,11 @@
-package com.ylx.massage.mapper;
+package com.ylx.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.massage.domain.vo.HomeBlock;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ylx.massage.domain.TOrder;
+import com.ylx.order.domain.TOrder;
 
 import java.math.BigDecimal;
 import java.util.Date;

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

@@ -1,16 +1,15 @@
-package com.ylx.massage.service;
+package com.ylx.order.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.common.core.domain.R;
-import com.ylx.massage.domain.TOrder;
+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 java.math.BigDecimal;
-import java.time.YearMonth;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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

@@ -1,8 +1,9 @@
-package com.ylx.order.service;
+package com.ylx.order.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.order.domain.OrderStatusFlow;
 import com.ylx.order.mapper.OrderStatusFlowMapper;
+import com.ylx.order.service.OrderStatusFlowService;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,4 +1,4 @@
-package com.ylx.massage.service.impl;
+package com.ylx.order.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
@@ -17,11 +17,12 @@ import com.ylx.common.utils.SecurityUtils;
 import com.ylx.massage.domain.*;
 import com.ylx.massage.domain.vo.*;
 import com.ylx.massage.enums.*;
-import com.ylx.massage.mapper.TOrderMapper;
+import com.ylx.order.mapper.TOrderMapper;
 import com.ylx.massage.service.*;
 import com.ylx.massage.utils.*;
+import com.ylx.order.domain.TOrder;
+import com.ylx.order.service.TOrderService;
 import lombok.extern.slf4j.Slf4j;
-import lombok.var;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

nightFragrance-massage/src/main/java/com/ylx/point/service/impl/PointUserActivityTaskCompletionServiceImpl.java

@@ -12,7 +12,7 @@ import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.DateUtils;
 import com.ylx.common.utils.SecurityUtils;
-import com.ylx.massage.service.TOrderService;
+import com.ylx.order.service.TOrderService;
 import com.ylx.massage.service.TRechargeService;
 import com.ylx.point.domain.PointActivity;
 import com.ylx.point.domain.PointActivityTask;
@@ -32,7 +32,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml → nightFragrance-massage/src/main/resources/mapper/order/TOrderMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ylx.massage.mapper.TOrderMapper">
-    <resultMap id="getAllMap" type="com.ylx.massage.domain.TOrder">
+<mapper namespace="com.ylx.order.mapper.TOrderMapper">
+    <resultMap id="getAllMap" type="com.ylx.order.domain.TOrder">
         <id column="c_id" property="cId"/>
         <result column="order_no" property="orderNo"/>
         <result column="atlas_add" property="atlasAdd"/>