refactor: 通用逻辑提到common模块

common/src/main/java/com/onsiteservice/common/order/dto/CancelServiceOrderDTO.java

-package com.onsiteservice.common.order.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * <P></P>
- *
- * @author 李宁
- * @version v1.0
- * @since 2022/7/7 15:20
- */
-@Data
-@ApiModel("取消订单请求模型")
-public class CancelServiceOrderDTO {
-
-    @ApiModelProperty(value = "订单id", required = true)
-    @NotNull(message = "请选择要取消的订单")
-    private Long id;
-
-}

common/src/main/java/com/onsiteservice/common/order/dto/PageServiceOrderDTO.java

-package com.onsiteservice.common.order.dto;
-
-import com.onsiteservice.dao.common.page.PageParams;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <P></P>
- *
- * @author 李宁
- * @version v1.0
- * @since 2022/7/7 14:38
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel("分页查询订单请求模型")
-public class PageServiceOrderDTO extends PageParams {
-
-    @ApiModelProperty(value = "订单状态: 0表示全部,1表示...", required = true)
-    private Integer orderStatus;
-
-}

common/src/main/java/com/onsiteservice/common/order/dto/ReserveServiceOrderDTO.java

-package com.onsiteservice.common.order.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Future;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel("订单预约请求模型")
-public class ReserveServiceOrderDTO {
-
-
-    @ApiModelProperty(value = "服务子类id", required = true)
-    @NotNull(message = "请选择服务类型")
-    private Integer subclassId;
-
-    /**
-     * 服务地址id
-     */
-    @ApiModelProperty(value = "服务地址id", required = true)
-    @NotNull(message = "请选择服务地址")
-    private Long addressId;
-
-    /**
-     * 期望上门时间
-     */
-    @ApiModelProperty(value = "期望上门时间", required = true)
-    @NotNull(message = "请选择上门时间")
-    @Future(message = "上门时间必须为将来的某个时间点")
-    private Date expectArrivalTime;
-
-    /**
-     * 服务数量
-     */
-    @ApiModelProperty(value = "服务数量", required = true)
-    @NotNull(message = "请选择服务数量")
-    @Min(value = 1, message = "服务数量最低为1")
-    private Integer num;
-
-    /**
-     * 服务需求图片
-     */
-    @ApiModelProperty("服务需求图片")
-    private String demandImg;
-
-    /**
-     * 服务需求说明
-     */
-    @ApiModelProperty("服务需求说明")
-    private String demandDesc;
-
-    /**
-     * 是否阅读协议：1已阅读，0未阅读
-     */
-    @ApiModelProperty("是否阅读协议：1已阅读，0未阅读")
-    @NotNull(message = "请确认是否阅读协议")
-    private Boolean readAgreement;
-
-    @ApiModelProperty("服务图片数组")
-    @Size(max = 8, message = "最多上传8张图片")
-    private List<String> urls;
-
-}
\ No newline at end of file

mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/ServiceOrderController.java

@@ -8,6 +8,7 @@ import com.onsiteservice.core.result.Result;
 import com.onsiteservice.dao.common.page.PageInfoVO;
 import com.onsiteservice.miniapp.controller.order.dto.CancelServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.PageServiceOrderDTO;
+import com.onsiteservice.miniapp.controller.order.dto.PayServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.ReserveServiceOrderDTO;
 import com.onsiteservice.miniapp.service.order.ServiceOrderBizService;
 import com.onsiteservice.service.ServiceOrderService;

common/src/main/java/com/onsiteservice/common/order/dto/PayServiceOrderDTO.java → mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/dto/PayServiceOrderDTO.java

-package com.onsiteservice.common.order.dto;
+package com.onsiteservice.miniapp.controller.order.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common/src/main/java/com/onsiteservice/common/order/dto/RefundServiceOrderDTO.java → mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/dto/RefundServiceOrderDTO.java

-package com.onsiteservice.common.order.dto;
+package com.onsiteservice.miniapp.controller.order.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java

 package com.onsiteservice.miniapp.service.order;
 
 import com.github.pagehelper.PageHelper;
-import com.onsiteservice.common.order.dto.PayServiceOrderDTO;
+import com.onsiteservice.miniapp.controller.order.dto.PayServiceOrderDTO;
 import com.onsiteservice.common.order.vo.ServiceOrderLogVO;
 import com.onsiteservice.common.order.vo.ServiceOrderVO;
 import com.onsiteservice.constant.constant.BizConstants;