RentalOrdersDao(upload)

src/main/java/com/mmc/pms/common/FlyerAccountType.java

+package com.mmc.pms.common;
+
+/**
+ * @Author small @Date 2023/5/25 9:58 @Version 1.0
+ */
+public enum FlyerAccountType {
+  YK(0, "游客"),
+  PT(1, "普通用户"),
+  GR(2, "个人飞手"),
+  JG(3, "飞手机构");
+
+  FlyerAccountType(Integer code, String status) {
+    this.code = code;
+    this.status = status;
+  }
+
+  private Integer code;
+  private String status;
+
+  public Integer getCode() {
+    return code;
+  }
+
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+}

src/main/java/com/mmc/pms/common/Page.java

+package com.mmc.pms.common;
+
+/**
+ * @Author small @Date 2023/5/25 9:52 @Version 1.0
+ */
+public interface Page {}

src/main/java/com/mmc/pms/controller/RentalOrdersController.java

+package com.mmc.pms.controller;
+
+import com.mmc.pms.common.ResultBody;
+import com.mmc.pms.model.dto.OrderInfoDTO;
+import com.mmc.pms.model.qo.OrderInfoQO;
+import com.mmc.pms.service.RentalOrdersService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author small @Date 2023/5/25 9:42 @Version 1.0
+ */
+@Api(tags = {"租赁相关-接口"})
+@RestController
+@RequestMapping("/RentalOrders")
+public class RentalOrdersController {
+
+  @Autowired private RentalOrdersService rentalOrdersService;
+
+  @ApiOperation(value = "租赁订单-分页-列表")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
+  @PostMapping("listPcWechatOrder")
+  public ResultBody listPcWechatOrder(HttpServletRequest request, @RequestBody OrderInfoQO param) {
+    return ResultBody.success(
+        // this.getCurrentAccount(request)
+        rentalOrdersService.listPcOrderInfo(param, null));
+  }
+
+  @ApiOperation(value = "小程序-云仓-订单-分页-列表")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
+  @PostMapping("listPageWechatOrder")
+  public ResultBody listPageWechatOrder(
+      HttpServletRequest request, @RequestBody OrderInfoQO param) {
+    return ResultBody.success(rentalOrdersService.listPageWechatOrder(null, param));
+  }
+}

src/main/java/com/mmc/pms/dao/RentalOrdersDao.java

+package com.mmc.pms.dao;
+
+import com.mmc.pms.entity.OrderInfoDO;
+import com.mmc.pms.model.qo.OrderInfoQO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 10:01 @Version 1.0
+ */
+@Mapper
+public interface RentalOrdersDao {
+  Integer countPcOrderInfo(OrderInfoQO param);
+
+  List<OrderInfoDO> listPcOrderInfo(OrderInfoQO param);
+
+  int countPageOrderInfo(OrderInfoQO param);
+
+  List<OrderInfoDO> listPageOrderInfo(OrderInfoQO param);
+}

src/main/java/com/mmc/pms/entity/OrderInfoDO.java

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.dto.OrderInfoDTO;
+import com.mmc.pms.model.vo.LeaseOrderVO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:05 @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderInfoDO implements Serializable {
+  private static final long serialVersionUID = 6544149196885009444L;
+  private Integer id;
+  private String orderNo;
+  private Integer wareInfoId;
+  private String wareNo;
+  private String wareTitle;
+  private String wareImg;
+  private Integer skuInfoId;
+  private String skuTitle;
+  private Integer repoAccountId;
+  private String uid;
+  private String buyerName;
+  private String buyerPhone;
+  private BigDecimal unitPrice;
+  private Integer wareNum;
+  private BigDecimal shouldPay;
+  private BigDecimal actualPay;
+  private Integer orderType;
+  private BigDecimal deposit;
+  private BigDecimal rentPrice;
+  private Date startDate;
+  private Date endDate;
+  private Integer payDay;
+  private String tranStatus;
+  private Integer exWare;
+  private String remark;
+  private String pfRemark;
+  private String shutReason;
+  private String payNo;
+  private Date payTime;
+  private Date sendWareTime;
+  private Integer rcdCompanyId;
+  private Date createTime;
+  private Date updateTime;
+
+  /**
+   * 辅助字段
+   *
+   * @return
+   */
+  private OrderReceiptDO receipt;
+
+  public OrderInfoDTO buildOrderInfoDTO() {
+    return OrderInfoDTO.builder()
+        .id(this.id)
+        .orderNo(this.orderNo)
+        .wareInfoId(this.wareInfoId)
+        .wareNo(this.wareNo)
+        .wareTitle(this.wareTitle)
+        .skuInfoId(this.skuInfoId)
+        .skuTitle(this.skuTitle)
+        .repoAccountId(this.repoAccountId)
+        .uid(this.uid)
+        .buyerName(this.buyerName)
+        .buyerPhone(this.buyerPhone)
+        .unitPrice(this.unitPrice)
+        .wareNum(this.wareNum)
+        .shouldPay(this.shouldPay)
+        .actualPay(this.actualPay)
+        .orderType(this.orderType)
+        .deposit(this.deposit)
+        .rentPrice(this.rentPrice)
+        .startDate(this.startDate)
+        .endDate(this.endDate)
+        .payDay(this.payDay)
+        .tranStatus(this.tranStatus)
+        .createTime(this.createTime)
+        .payTime(this.payTime)
+        .payNo(this.payNo)
+        .wareImg(this.wareImg)
+        .pfRemark(this.pfRemark)
+        .shutReason(this.shutReason)
+        .remark(this.remark)
+        .receipt(this.receipt == null ? null : receipt.buildOrderReceiptDTO())
+        .exWare(this.exWare)
+        .sendWareTime(this.sendWareTime)
+        .build();
+  }
+
+  public OrderInfoDO(LeaseOrderVO lease) {
+    this.orderNo = lease.getOrderNo();
+    this.wareInfoId = lease.getWareInfoId();
+    this.wareNo = lease.getWareNo();
+    this.wareTitle = lease.getWareTitle();
+    this.wareImg = lease.getMainImg();
+    this.skuInfoId = lease.getSkuInfoId();
+    this.skuTitle = lease.getSkuTitle();
+    this.repoAccountId = lease.getRepoAccountId();
+    this.uid = lease.getUid();
+    this.buyerName = lease.getBuyerName();
+    this.buyerPhone = lease.getBuyerPhone();
+    this.unitPrice = lease.getUnitPrice();
+    this.wareNum = lease.getWareNum();
+    this.shouldPay = lease.getShouldPay();
+    this.actualPay = lease.getActualPay();
+    this.orderType = lease.getOrderType();
+    this.deposit = lease.getDeposit();
+    this.rentPrice = lease.getRentPrice();
+    this.startDate = lease.getStartDate();
+    this.endDate = lease.getEndDate();
+    this.payDay = lease.getPayDay();
+    this.exWare = lease.getExWare();
+    this.tranStatus = lease.getTranStatus();
+    this.remark = lease.getRemark();
+    this.createTime = lease.getCreateTime();
+    this.rcdCompanyId = lease.getRcdCompanyId();
+  }
+}

src/main/java/com/mmc/pms/entity/OrderReceiptDO.java

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.dto.OrderReceiptDTO;
+import com.mmc.pms.model.vo.OrderReceiptVO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:05 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderReceiptDO implements Serializable {
+  private static final long serialVersionUID = 7590192330910329668L;
+  private Integer id;
+  private Integer orderInfoId;
+  private Integer receiptMethod;
+  private String takeName;
+  private String takePhone;
+  private String region;
+  private String detailAddress;
+  private String repoName;
+  private String repoAddress;
+  private String bookPhone;
+  private String sendExCode;
+  private String sendExNo;
+  private String sendAddress;
+  private Integer renMethod;
+  private String renPhone;
+  private String renName;
+  private String renExCode;
+  private String renExNo;
+  private String renAddress;
+  private String exName;
+
+  private String renRepoName;
+  private String renRepoAddr;
+  private String renRepoPhone;
+
+  private Date createTime;
+
+  public OrderReceiptDO(OrderReceiptVO d) {
+    this.orderInfoId = d.getOrderInfoId();
+    this.receiptMethod = d.getReceiptMethod();
+    this.takeName = d.getTakeName();
+    this.takePhone = d.getTakePhone();
+    this.region = d.getRegion();
+    this.detailAddress = d.getDetailAddress();
+    this.repoName = d.getRepoName();
+    this.repoAddress = d.getRepoAddress();
+    this.bookPhone = d.getBookPhone();
+  }
+
+  public OrderReceiptDTO buildOrderReceiptDTO() {
+    return OrderReceiptDTO.builder()
+        .id(this.id)
+        .receiptMethod(this.receiptMethod)
+        .takeName(this.takeName)
+        .takePhone(this.takePhone)
+        .region(this.region)
+        .detailAddress(this.detailAddress)
+        .repoName(this.repoName)
+        .repoAddress(this.repoAddress)
+        .bookPhone(this.bookPhone)
+        .sendExCode(this.sendExCode)
+        .sendExNo(this.sendExNo)
+        .sendAddress(this.sendAddress)
+        .renMethod(this.renMethod)
+        .renPhone(this.renPhone)
+        .renName(this.renName)
+        .renExCode(this.renExCode)
+        .renExNo(this.renExNo)
+        .renAddress(this.renAddress)
+        .renRepoName(this.renRepoName)
+        .renRepoAddr(this.renRepoAddr)
+        .renRepoPhone(this.renRepoPhone)
+        .build();
+  }
+}

src/main/java/com/mmc/pms/entity/RepoCashDO.java

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.dto.RepoCashDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 9:48 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RepoCashDO implements Serializable {
+  private static final long serialVersionUID = -7930603317037474755L;
+  private Integer id;
+  private Integer repoAccountId;
+  private String uid;
+  private String accountName;
+  private Integer orderInfoId;
+  private String orderNo;
+  private Integer skuInfoId;
+  private String skuTitle;
+  private Integer wareInfoId;
+  private String wareNo;
+  private String wareTitle;
+  private String payNo;
+  private Integer payMethod;
+  private BigDecimal amtPaid;
+  private BigDecimal cashAmt;
+  private Date payTime;
+  private String refundNo;
+  private String voucher;
+  private String remark;
+  private Integer createUser;
+  private Date createTime;
+  private Integer updateUser;
+  private Date updateTime;
+
+  public RepoCashDTO buildRepoCashDTO() {
+    return RepoCashDTO.builder()
+        .id(this.id)
+        .repoAccountId(this.repoAccountId)
+        .uid(this.uid)
+        .accountName(this.accountName)
+        .orderInfoId(this.orderInfoId)
+        .orderNo(this.orderNo)
+        .skuInfoId(this.skuInfoId)
+        .skuTitle(this.skuTitle)
+        .wareInfoId(this.wareInfoId)
+        .wareNo(this.wareNo)
+        .wareTitle(this.wareTitle)
+        .payNo(this.payNo)
+        .payMethod(this.payMethod)
+        .amtPaid(this.amtPaid)
+        .refundNo(this.refundNo)
+        .createUser(this.createUser)
+        .voucher(StringUtils.isBlank(this.voucher) ? null : Arrays.asList(this.voucher.split(",")))
+        .cashAmt(this.cashAmt)
+        .payTime(this.payTime)
+        .remark(this.remark)
+        .build();
+  }
+}

src/main/java/com/mmc/pms/model/dto/BaseAccountDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:55 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.BaseAccountDTO", description = "登录信息DTO")
+public class BaseAccountDTO implements Serializable {
+  private static final long serialVersionUID = -2979712090903806216L;
+  private Integer id;
+  private String uid;
+  private String accountPhone;
+  private String accountNo;
+  private String accountName;
+  private String tokenPort;
+
+  @ApiModelProperty(value = "角色ID")
+  private Integer roleId;
+
+  @ApiModelProperty(value = "是否为管理角色:0否 1是")
+  private Integer admin; // 是否为管理角色
+
+  @ApiModelProperty(value = "是否为运营角色:0否 1是")
+  private Integer operate;
+
+  @ApiModelProperty(value = "是否PMC发货专员:0否 1是")
+  private Integer pmc;
+
+  @ApiModelProperty(value = "单位信息")
+  private CompanyCacheDTO companyInfo; // 单位信息
+
+  public BaseAccountDTO(UserAccountDTO user) {
+    this.id = user.getId();
+    this.accountNo = user.getAccountNo();
+    this.accountName = user.getUserName();
+    this.roleId = user.getRoleInfo() == null ? null : user.getRoleInfo().getId();
+    this.admin = user.getRoleInfo() == null ? null : user.getRoleInfo().getAdmin();
+    this.operate = user.getRoleInfo() == null ? null : user.getRoleInfo().getOperate();
+    this.pmc = user.getRoleInfo() == null ? null : user.getRoleInfo().getPmc();
+  }
+
+  public BaseAccountDTO(RepoAccountDTO account) {
+    this.id = account.getId();
+    this.accountName = account.getAccountName();
+    this.uid = account.getUid();
+    this.accountPhone = account.getPhoneNum();
+  }
+
+  public BaseAccountDTO(MallUserDTO account) {
+    this.id = account.getId();
+    this.accountName = account.getNickName();
+    this.uid = account.getUid();
+    this.accountPhone = account.getPhoneNum();
+  }
+
+  public BaseAccountDTO(FlyerAccountDTO account) {
+    this.id = account.getId();
+    this.accountName = account.getAccountName();
+    this.uid = account.getUid();
+    this.accountPhone = account.getPhoneNum();
+  }
+
+  /**
+   * 是否为科比特超级管理员单位(是:无单位资源限制 否:只能看当前和下级单位的资源)
+   *
+   * @return
+   */
+  public boolean isManage() {
+    if (this.getCompanyInfo() == null) {
+      return false;
+    }
+    if (this.getCompanyInfo().getManage() == null) {
+      return false;
+    }
+    return this.getCompanyInfo().getManage() == 1;
+  }
+
+  /**
+   * 判断是否已授权
+   *
+   * @return
+   */
+  //	public boolean authorized() {
+  //		if (StringUtils.isBlank(this.accountName) || StringUtils.isBlank(this.accountPhone)) {
+  //			return false;
+  //		}
+  //		return true;
+  //	}
+}

src/main/java/com/mmc/pms/model/dto/CompanyCacheDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:56 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyCacheDTO implements Serializable {
+  @ApiModelProperty(value = "单位ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "单位名称")
+  private String company;
+
+  @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
+  private Integer manage;
+
+  @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
+  private List<Integer> companys;
+}

src/main/java/com/mmc/pms/model/dto/CompanySimpleDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:56 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.sharefly.dto.CompanySimpleDTO", description = "单位信息DTO")
+public class CompanySimpleDTO implements Serializable {
+  private static final long serialVersionUID = 2541404541696571857L;
+
+  @ApiModelProperty(value = "单位ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "单位名称")
+  private String company;
+
+  @ApiModelProperty(value = "账号类型:0合伙人 1员工")
+  private Integer userType;
+
+  @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
+  private Integer manage;
+
+  @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
+  private List<Integer> companys;
+}

src/main/java/com/mmc/pms/model/dto/ExpStationsDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:47 @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.ExpStationsDTO", description = "物流信息DTO")
+public class ExpStationsDTO implements Serializable {
+  private static final long serialVersionUID = 8737447241343561076L;
+
+  @ApiModelProperty(value = "物流状态：查字典")
+  private String Action;
+
+  @ApiModelProperty(value = "描述")
+  private String AcceptStation;
+
+  @ApiModelProperty(value = "时间")
+  private String AcceptTime;
+
+  @ApiModelProperty(value = "所在城市")
+  private String Location;
+}

src/main/java/com/mmc/pms/model/dto/FlyerAccountDTO.java

+package com.mmc.pms.model.dto;
+
+import com.mmc.pms.common.FlyerAccountType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @Author small @Date 2023/5/25 9:58 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.FlyerAccountDTO", description = "飞手端用户DTO")
+public class FlyerAccountDTO implements Serializable {
+  private static final long serialVersionUID = -5663270547201316327L;
+
+  @ApiModelProperty(value = "飞手端用户id")
+  private Integer id;
+
+  @ApiModelProperty(value = "飞手端用户uid")
+  private String uid;
+
+  @ApiModelProperty(value = "飞手端用户名称")
+  private String accountName;
+
+  @ApiModelProperty(value = "联系电话")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "飞手端用户类型，（个人飞手，机构）")
+  private Integer accountType;
+
+  @ApiModelProperty(value = "实名认证状态")
+  private Integer realAuthStatus;
+
+  @ApiModelProperty(value = "企业认证状态")
+  private Integer entAuthStatus;
+
+  @ApiModelProperty(value = "工作状态")
+  private Integer workStatus;
+
+  @ApiModelProperty(value = "常驻城市")
+  private String resAddress;
+
+  @ApiModelProperty(value = "openId")
+  private String openId;
+
+  @ApiModelProperty(value = "unionId")
+  private String unionId;
+
+  @ApiModelProperty(value = "昵称")
+  private String nickName;
+
+  @ApiModelProperty(value = "头像url")
+  private String headerImg;
+
+  @ApiModelProperty(value = "经度")
+  private Double lon;
+
+  @ApiModelProperty(value = "纬度")
+  private Double lat;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+
+  @ApiModelProperty(value = "删除状态，0未删除，1删除")
+  private Integer deleted;
+
+  @ApiModelProperty(value = "企业名称")
+  private String entName;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "有无订单：0无,1有")
+  private Integer serviceStatus;
+
+  @ApiModelProperty(value = "距离订单距离-单位km")
+  private Double orderDist;
+
+  @ApiModelProperty(value = "服务中的订单名称")
+  private List<String> orderNames;
+
+  @ApiModelProperty(value = "飞手认证状态")
+  private Integer licStatus;
+
+  @ApiModelProperty(value = "机构信息")
+  private FlyerEntInfoDTO entInfo;
+
+  @ApiModelProperty(value = "抢单状态-0否-1是")
+  private Integer applyOrder;
+
+  @ApiModelProperty(value = "多端用户，USER_PORT(云享飞)-FLYER_PORT(云飞手)-REPO_PORT(云仓)")
+  private Set<String> ports;
+
+  @ApiModelProperty(value = "推荐人ID")
+  private Integer rcdFlyerAccountId;
+
+  @ApiModelProperty(value = "推荐人昵称")
+  private String rcdNickName;
+
+  @ApiModelProperty(value = "推荐人uid")
+  private String rcdUid;
+
+  @ApiModelProperty(value = "推荐人账号名称")
+  private String rcdAccountName;
+
+  @ApiModelProperty(value = "已推荐用户数")
+  private Integer rcdUserNumber;
+
+  @ApiModelProperty(value = "是否销售")
+  private Integer sale;
+
+  @ApiModelProperty(value = "是否白名单")
+  private Integer white;
+
+  @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
+  private Integer source;
+
+  @ApiModelProperty(value = "订单信息")
+  private FlyerOrderTaskDTO flyerOrderTask;
+
+  @ApiModelProperty(value = "场景认证信息")
+  private FlyerScenesAuthDTO flyerScenesAuth;
+
+  /**
+   * 是否为飞手机构用户
+   *
+   * @return
+   */
+  public boolean checkFlyerEnt() {
+    return (FlyerAccountType.JG.getCode().toString().equals(this.accountType.toString()));
+  }
+
+  /**
+   * 是否为飞手个人用户
+   *
+   * @return
+   */
+  public boolean checkFlyer() {
+    return (FlyerAccountType.GR.getCode().toString().equals(this.accountType.toString()));
+  }
+}

src/main/java/com/mmc/pms/model/dto/FlyerEntInfoDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:00 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.FlyerEntInfoDTO", description = "飞手机构DTO")
+public class FlyerEntInfoDTO implements Serializable {
+  private static final long serialVersionUID = -3064900348178903673L;
+
+  @ApiModelProperty(value = "机构id")
+  private Integer id;
+
+  @ApiModelProperty(value = "飞手端用户id")
+  private Integer flyerAccountId;
+
+  @ApiModelProperty(value = "机构名称")
+  private String entName;
+
+  @ApiModelProperty(value = "机构认证审批状态")
+  private Integer entCheckStatus;
+
+  @ApiModelProperty(value = "机构法人名称")
+  private String entLegalPerson;
+
+  @ApiModelProperty(value = "社会统一信用码")
+  private String uscCode;
+
+  @ApiModelProperty(value = "营业执照url")
+  private String unLicImg;
+
+  @ApiModelProperty(value = "开户银行")
+  private String bankName;
+
+  @ApiModelProperty(value = "账户名称")
+  private String accountHolder;
+
+  @ApiModelProperty(value = "银行账号")
+  private String bankAccount;
+
+  @ApiModelProperty(value = "法人身份证号")
+  private String idNumber;
+
+  @ApiModelProperty(value = "机构备注")
+  private String remark;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "飞手总数")
+  private Integer sumOfFlyer;
+
+  @ApiModelProperty(value = "认证飞手数")
+  private Integer countOfAuthFlyer;
+
+  @ApiModelProperty(value = "用户uid")
+  private String uid;
+
+  @ApiModelProperty(value = "用户手机号")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "常驻城市")
+  private String resAddress;
+
+  @ApiModelProperty(value = "昵称")
+  private String nickName;
+}

src/main/java/com/mmc/pms/model/dto/FlyerOrderTaskDTO.java

+package com.mmc.pms.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:59 @Version 1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FlyerOrderTaskDTO implements Serializable {
+  private static final long serialVersionUID = 4288411060058354326L;
+  private Integer id;
+  private Integer orderId;
+  private Integer flyerAccountId;
+  private Integer orderType;
+  private Integer virtualTeamId;
+  private String orderName;
+  private String orderNo;
+
+  public FlyerOrderTaskDTO(OrderTaskDTO d) {
+    this.orderId = d.getId();
+    this.orderName = d.getOrderName();
+    this.orderNo = d.getOrderNo();
+  }
+}

src/main/java/com/mmc/pms/model/dto/FlyerScenesAuthDTO.java

+package com.mmc.pms.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:59 @Version 1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FlyerScenesAuthDTO implements Serializable {
+  private static final long serialVersionUID = 66032902942031710L;
+
+  @ApiModelProperty("飞手id")
+  private Integer id;
+
+  @ApiModelProperty(value = "商务礼仪认证")
+  private Integer protocolAuth;
+
+  @ApiModelProperty(value = "电力巡检认证状态，0未认证，1通过，2未通过")
+  private Integer electricAuth;
+
+  @ApiModelProperty(value = "航空测绘认证状态，0未认证，1通过，2未通过", hidden = true)
+  @JsonIgnore
+  private Integer aviationAuth;
+
+  @ApiModelProperty(value = "应急保障认证状态，0未认证，1通过，2未通过", hidden = true)
+  @JsonIgnore
+  private Integer emergencyAuth;
+
+  @ApiModelProperty(value = "value = 监察巡检认证状态，0未认证，1通过，2未通过", hidden = true)
+  @JsonIgnore
+  private Integer superviseAuth;
+
+  @ApiModelProperty(value = "通用认证状态，0未认证，1通过，2未通过")
+  private Integer universalAuth;
+
+  @ApiModelProperty(value = "油气巡检认证状态，0未认证，1通过，2未通过")
+  private Integer oilGasAuth;
+
+  @ApiModelProperty(value = "演示认证状态，0未认证，1通过，2未通过")
+  private Integer demoAuth;
+
+  @ApiModelProperty(value = "航空测绘外业状态，0未认证，1通过，2未通过")
+  private Integer aviationOutAuth;
+
+  @ApiModelProperty(value = "航空测绘内业状态，0未认证，1通过，2未通过")
+  private Integer aviationInAuth;
+
+  @ApiModelProperty(value = "指挥车认证状态，0未认证，1通过，2未通过")
+  private Integer commandAuth;
+
+  @ApiModelProperty(value = "天目将软件认证状态，0未认证，1通过，2未通过")
+  private Integer tmjAuth;
+}

src/main/java/com/mmc/pms/model/dto/KdnExpDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:47 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.KdnExpDTO", description = "物流信息DTO")
+public class KdnExpDTO implements Serializable {
+  private static final long serialVersionUID = 4129710329541565557L;
+
+  @ApiModelProperty(value = "物流状态：查字典")
+  private String StateEx;
+
+  @ApiModelProperty(value = "快递公司编码：查字典")
+  private String ShipperCode;
+
+  @ApiModelProperty(value = "物流单号")
+  private String LogisticCode;
+
+  @ApiModelProperty(value = "快递流转信息")
+  private List<ExpStationsDTO> Traces;
+}

src/main/java/com/mmc/pms/model/dto/MallUserDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 9:58 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.mall.dto.MallUserDTO", description = "用户信息DTO")
+public class MallUserDTO implements Serializable {
+  private static final long serialVersionUID = -2968237190830435082L;
+
+  @ApiModelProperty("id")
+  private Integer id;
+
+  @ApiModelProperty("uid")
+  private String uid;
+
+  @ApiModelProperty("个人认证名字")
+  private String userName;
+
+  @ApiModelProperty("联系电话")
+  private String phoneNum;
+
+  @ApiModelProperty("小程序openid")
+  private String openId;
+
+  @ApiModelProperty("微信unionid")
+  private String unionId;
+
+  @ApiModelProperty("微信昵称")
+  private String nickName;
+
+  @ApiModelProperty("头像")
+  private String headerImg;
+
+  @ApiModelProperty("经度")
+  private Double lon;
+
+  @ApiModelProperty("纬度")
+  private Double lat;
+
+  @ApiModelProperty("注册端口")
+  private String ports;
+
+  @ApiModelProperty("备注")
+  private String remark;
+
+  @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
+  private Integer source;
+
+  @ApiModelProperty("渠道等级状态")
+  private Integer channelAuthStatus;
+
+  @ApiModelProperty("渠道等级标签")
+  private Integer channelClass;
+
+  @ApiModelProperty("渠道等级名称")
+  private String tagName;
+
+  @ApiModelProperty("注册时间")
+  private Date createTime;
+
+  @ApiModelProperty("更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "实名认证状态（0未通过，1通过）")
+  private Integer realAuthStatus;
+
+  @ApiModelProperty(value = "企业认证状态（0未通过，1通过）")
+  private Integer entAuthStatus;
+
+  @ApiModelProperty("企业名称")
+  private String entName;
+
+  @ApiModelProperty("法大大电子签章认证状态(0未通过，1通过)")
+  private Integer entVerifyStatus;
+
+  @ApiModelProperty("实名认证时间")
+  private Date realAuthTime;
+
+  @ApiModelProperty("企业认证时间")
+  private Date entAuthTime;
+
+  @ApiModelProperty("电子签章认证时间")
+  private Date entVerifyTime;
+
+  @ApiModelProperty(value = "上级推荐人id")
+  private Integer upReferralId;
+
+  @ApiModelProperty(value = "上级推荐人的uid(name)")
+  private String upReferralUidAndName;
+
+  @ApiModelProperty(value = "推荐伙伴数量")
+  private Integer lowerReferralCount;
+
+  @ApiModelProperty("相关运营id")
+  private Integer operateId;
+
+  @ApiModelProperty("相关运营Name")
+  private String operateName;
+
+  @ApiModelProperty("相关销售id")
+  private Integer saleId;
+
+  @ApiModelProperty("相关销售Name")
+  private String saleName;
+
+  @ApiModelProperty("小程序相关运营id")
+  private Integer mallOperator;
+
+  @ApiModelProperty("小程序相关运营名字")
+  private String mallOperatorName;
+
+  @ApiModelProperty("小程序相关运营uid")
+  private String mallOperatorUID;
+
+  @ApiModelProperty("小程序相关销售id")
+  private Integer mallSaleManager;
+
+  @ApiModelProperty("小程序相关销售uid")
+  private String mallSaleManagerUID;
+
+  @ApiModelProperty("小程序相关销售名字")
+  private String mallSaleManagerName;
+
+  @ApiModelProperty("上级渠道名称")
+  private String superiorChannelName;
+
+  @ApiModelProperty(value = "开户银行")
+  private String accountBank;
+
+  @ApiModelProperty(value = "开户姓名")
+  private String accountName;
+
+  @ApiModelProperty(value = "银行卡号")
+  private String bankCardNumber;
+
+  @ApiModelProperty(value = "支行")
+  private String branch;
+}

src/main/java/com/mmc/pms/model/dto/OrderInfoDTO.java

+package com.mmc.pms.model.dto;
+
+import com.mmc.pms.entity.RepoCashDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:45 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.OrderInfoDTO", description = "云仓订单DTO")
+public class OrderInfoDTO implements Serializable {
+  private static final long serialVersionUID = 1572467108563651846L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "订单编号")
+  private String orderNo;
+
+  @ApiModelProperty(value = "商品ID")
+  private Integer wareInfoId;
+
+  @ApiModelProperty(value = "商品编号")
+  private String wareNo;
+
+  @ApiModelProperty(value = "商品标题")
+  private String wareTitle;
+
+  @ApiModelProperty(value = "商品图片")
+  private String wareImg;
+
+  @ApiModelProperty(value = "套餐（sku）ID")
+  private Integer skuInfoId;
+
+  @ApiModelProperty(value = "套餐（sku）名称")
+  private String skuTitle;
+
+  @ApiModelProperty(value = "购买用户ID")
+  private Integer repoAccountId;
+
+  @ApiModelProperty(value = "用户UID")
+  private String uid;
+
+  @ApiModelProperty(value = "买家name")
+  private String buyerName;
+
+  @ApiModelProperty(value = "买家电话")
+  private String buyerPhone;
+
+  @ApiModelProperty(value = "单价")
+  private BigDecimal unitPrice;
+
+  @ApiModelProperty(value = "购买的商品数量")
+  private Integer wareNum;
+
+  @ApiModelProperty(value = "应付款金额")
+  private BigDecimal shouldPay;
+
+  @ApiModelProperty(value = "实收款金额")
+  private BigDecimal actualPay;
+
+  @ApiModelProperty(value = "订单类型：0租赁 100购买")
+  private Integer orderType;
+
+  @ApiModelProperty(value = "押金")
+  private BigDecimal deposit;
+
+  @ApiModelProperty(value = "租金总金额")
+  private BigDecimal rentPrice;
+
+  @ApiModelProperty(value = "租约开始日")
+  private Date startDate;
+
+  @ApiModelProperty(value = "租约结束日")
+  private Date endDate;
+
+  @ApiModelProperty(value = "付款天数")
+  private Integer payDay;
+
+  @ApiModelProperty(value = "交易状态：查订单状态字典")
+  private String tranStatus;
+
+  @ApiModelProperty(value = "减库方式 0:买家拍下减库存 1:卖家付款减库存")
+  private Integer exWare;
+
+  @ApiModelProperty(value = "用户备注")
+  private String remark;
+
+  @ApiModelProperty(value = "平台人员备注")
+  private String pfRemark;
+
+  @ApiModelProperty(value = "关闭原因")
+  private String shutReason;
+
+  @ApiModelProperty(value = "交易编号")
+  private String payNo;
+
+  @ApiModelProperty(value = "支付时间")
+  private Date payTime;
+
+  @ApiModelProperty(value = "发货时间")
+  private Date sendWareTime;
+
+  @ApiModelProperty(value = "创建时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "物流信息/收货地址信息")
+  private OrderReceiptDTO receipt;
+
+  @ApiModelProperty(value = "退款单详情信息,无则为null")
+  private OrderRefundDTO orderRefund;
+
+  @ApiModelProperty(value = "发货-物流动态,无则为null")
+  private KdnExpDTO express;
+
+  @ApiModelProperty(value = "退货-物流动态,无则为null")
+  private KdnExpDTO refundExpress;
+
+  @ApiModelProperty(value = "质检详情,无则为null")
+  private List<OrderVcuDTO> vcus;
+
+  public RepoCashDO buildRepoCashDO() {
+    return RepoCashDO.builder()
+        .uid(this.uid)
+        .accountName(this.buyerName)
+        .orderInfoId(this.id)
+        .orderNo(this.orderNo)
+        .skuInfoId(this.skuInfoId)
+        .skuTitle(this.skuTitle)
+        .wareInfoId(this.wareInfoId)
+        .wareTitle(this.wareTitle)
+        .wareNo(this.wareNo)
+        .build();
+  }
+}

src/main/java/com/mmc/pms/model/dto/OrderReceiptDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:45 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.OrderReceiptDTO", description = "订单收货信息DTO")
+public class OrderReceiptDTO implements Serializable {
+  private static final long serialVersionUID = -6212026509857770276L;
+
+  @ApiModelProperty(value = "地址ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "收货方式：0邮寄 1门店地址")
+  private Integer receiptMethod;
+
+  @ApiModelProperty(value = "0-收货人姓名")
+  private String takeName;
+
+  @ApiModelProperty(value = "0-收货人电话")
+  private String takePhone;
+
+  @ApiModelProperty(value = "0-收货区域")
+  private String region;
+
+  @ApiModelProperty(value = "0-收获详细地址")
+  private String detailAddress;
+
+  @ApiModelProperty(value = "1-门店名称")
+  private String repoName;
+
+  @ApiModelProperty(value = "1-门店详细地址")
+  private String repoAddress;
+
+  @ApiModelProperty(value = "1-预留手机号")
+  private String bookPhone;
+
+  @ApiModelProperty(value = "发货-物流公司码")
+  private String sendExCode;
+
+  @ApiModelProperty(value = "发货-物流单号")
+  private String sendExNo;
+
+  @ApiModelProperty(value = "发货地址")
+  private String sendAddress;
+
+  @ApiModelProperty(value = "退还货方式：0邮寄 1门店地址")
+  private Integer renMethod;
+
+  @ApiModelProperty(value = "退还货-收货电话")
+  private String renPhone;
+
+  @ApiModelProperty(value = "退还货-收货人")
+  private String renName;
+
+  @ApiModelProperty(value = "退还货-物流公司码")
+  private String renExCode;
+
+  @ApiModelProperty(value = "退还货-物流单号")
+  private String renExNo;
+
+  @ApiModelProperty(value = "退还货-地址")
+  private String renAddress;
+
+  @ApiModelProperty(value = "退还货-门店名称")
+  private String renRepoName;
+
+  @ApiModelProperty(value = "退还货-门店地址")
+  private String renRepoAddr;
+
+  @ApiModelProperty(value = "退还货-门店联系电话")
+  private String renRepoPhone;
+}

src/main/java/com/mmc/pms/model/dto/OrderRefundDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:46 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.OrderRefundDTO", description = "退款单DTO")
+public class OrderRefundDTO implements Serializable {
+  private static final long serialVersionUID = -6124933008580173589L;
+
+  @ApiModelProperty(value = "退款单ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "订单ID")
+  private Integer orderInfoId;
+
+  @ApiModelProperty(value = "退款单号")
+  private String refundNo;
+
+  @ApiModelProperty(value = "退款单状态：查字典")
+  private Integer refundStatus;
+
+  @ApiModelProperty(value = "应退款金额")
+  private BigDecimal shouldRefund;
+
+  @ApiModelProperty(value = "实际退款金额")
+  private BigDecimal actualRefund;
+
+  @ApiModelProperty(value = "退款理由")
+  private String reason;
+
+  @ApiModelProperty(value = "创建时间/申请时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "退款-设备情况(图片&视频)")
+  private OrderVcuDTO orderVcu;
+
+  @ApiModelProperty(value = "订单信息")
+  private OrderInfoDTO orderInfo;
+
+  @ApiModelProperty(value = "退款协商历史")
+  private List<RefundLogDTO> rlogs;
+
+  @ApiModelProperty(value = "退款流水信息")
+  private RepoCashDTO refundCash;
+
+  @ApiModelProperty(value = "平台备注")
+  private String pfRemark;
+}

src/main/java/com/mmc/pms/model/dto/OrderTaskDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:59 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderTaskDTO implements Serializable {
+  private static final long serialVersionUID = 6732943573766573605L;
+
+  @ApiModelProperty(value = "订单id")
+  private Integer id;
+
+  @ApiModelProperty(value = "主任务id")
+  private Integer parentId;
+
+  @ApiModelProperty(value = "用户id")
+  private Integer userAccountId;
+
+  @ApiModelProperty(value = "订单专属运营id")
+  private Integer userOperateId;
+
+  @ApiModelProperty(value = "用户订单uid")
+  private String uid;
+
+  @ApiModelProperty(value = "订单编号")
+  private String orderNo; // 单号
+
+  @ApiModelProperty(value = "订单名称")
+  private String orderName; // 名称
+
+  @ApiModelProperty(value = "账单金额")
+  private BigDecimal orderAmt; // 账单金额
+
+  @ApiModelProperty(value = "订单现金金额")
+  private BigDecimal orderCashAmt;
+
+  @ApiModelProperty(value = "订单信用金额")
+  private BigDecimal orderCreditAmt;
+
+  @ApiModelProperty(value = "任务状态")
+  private Integer orderStatus; // 任务状态
+
+  @ApiModelProperty(value = "评价状态")
+  private Integer evaluateStatus; // 评价状态
+
+  private String lastMsg1; // 消息
+  private String lastMag2;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "备注")
+  private String basicInfo; // 基本信息
+
+  @ApiModelProperty(value = "预计开始时间")
+  private String startTime; // 开始时间
+
+  @ApiModelProperty(value = "预计结束时间")
+  private String endTime; // 结束时间
+
+  @ApiModelProperty(value = "实际开始时间")
+  private String acStartTime; // 实际开始时间
+
+  @ApiModelProperty(value = "实际结束时间")
+  private String acEndTime; // 实际结束时间
+
+  @ApiModelProperty(value = "订单地址")
+  private String taskAddress;
+
+  private String image;
+
+  @ApiModelProperty(value = "服务id")
+  private Integer inspectionId;
+
+  @ApiModelProperty(value = "服务名称")
+  private String inspectionName;
+
+  @ApiModelProperty(value = "运营联系电话")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "专属运营名称")
+  private String operateName;
+
+  @ApiModelProperty(value = "经度")
+  private BigDecimal lon;
+
+  @ApiModelProperty(value = "纬度")
+  private BigDecimal lat;
+
+  @ApiModelProperty(value = "用户名称")
+  private String userName;
+
+  @ApiModelProperty(value = "是否企业")
+  private Integer entUser;
+
+  @ApiModelProperty(value = "企业名称")
+  private String entName;
+
+  @ApiModelProperty(value = "是否实名")
+  private Integer realAuthStatus;
+
+  @ApiModelProperty(value = "昵称")
+  private String nickName;
+
+  @ApiModelProperty(value = "订单关闭原因")
+  private String shutReason;
+
+  @ApiModelProperty(value = "用户联系电话")
+  private String userPhoneNum;
+
+  @ApiModelProperty(value = "飞手Id")
+  private Integer flyerAccountId;
+
+  @ApiModelProperty(value = "平台工作人员设置的备注")
+  private String pfRemark;
+
+  @ApiModelProperty(value = "飞手端-推送-数据-0否-1是")
+  private Integer dummy;
+
+  @ApiModelProperty(value = "飞手UID")
+  private String flyerUid;
+
+  @ApiModelProperty(value = "飞手账号名")
+  private String flyerAccountName;
+
+  @ApiModelProperty(value = "抢单状态：0待接单,1抢单中")
+  private Integer applyStatus;
+
+  @ApiModelProperty(value = "预付款总金额")
+  private BigDecimal totalFreeze;
+
+  @ApiModelProperty(value = "结算总金额")
+  private BigDecimal totalPay;
+
+  @ApiModelProperty(value = "倒计时")
+  private Long countSconds;
+
+  @ApiModelProperty(value = "飞手基本信息")
+  private FlyerAccountDTO flyerAccount;
+
+  @ApiModelProperty(value = "飞手类型")
+  private Integer flyerType;
+
+  @ApiModelProperty(value = "飞手个数")
+  private Integer flyerNum;
+
+  @ApiModelProperty(value = "0:隐藏 1:显示")
+  private Integer display;
+
+  @ApiModelProperty(value = "飞手-结算-信息", hidden = true)
+  private TaskFlyerCostDTO taskFlyerCost;
+
+  @ApiModelProperty(value = "下期飞手入账时间")
+  private String nextFlyerIncomeDate;
+
+  @ApiModelProperty(value = "是否进行过催付款 0：未催 1：已催")
+  private Integer urge;
+
+  @ApiModelProperty(value = "订单类型")
+  private Integer orderType;
+
+  @ApiModelProperty(value = "确认需求备注")
+  private String cmdRemark;
+
+  @ApiModelProperty(value = "飞手可抢单开始时间")
+  private Date flyerStartTime;
+
+  @ApiModelProperty(value = "飞手可抢单结束时间")
+  private Date flyerEndTime;
+
+  @ApiModelProperty(value = "预估金额")
+  private BigDecimal estimatedAmount;
+
+  @ApiModelProperty(value = "申请id")
+  private Integer orderApplyId;
+
+  @ApiModelProperty(value = "用户下单附件预览效果")
+  private String userPreview;
+
+  @ApiModelProperty(value = "平台上传附件预览效果")
+  private String platformPreview;
+
+  @ApiModelProperty(value = "文案描述")
+  private String copywriting;
+
+  @ApiModelProperty(value = "子任务列表")
+  private List<OrderTaskDTO> children;
+
+  @ApiModelProperty(value = "子订单信息")
+  private List<OrderTaskSonDTO> son;
+
+  public void buildOperateUser(UserAccountDTO op) {
+    this.phoneNum = op.getPhoneNum();
+    this.operateName = op.getUserName();
+    this.userOperateId = op.getId();
+  }
+
+  public void buildWxUser(UserAccountDTO wx) {
+    this.userAccountId = wx.getId();
+    this.uid = wx.getUid();
+    this.nickName = wx.getNickName();
+    this.userName = wx.getUserName();
+    this.userPhoneNum = wx.getPhoneNum();
+  }
+
+  public FlyerOrderTaskDTO buildFlyerOrderTaskDTO() {
+    return FlyerOrderTaskDTO.builder()
+        .orderId(this.id)
+        .orderNo(this.orderNo)
+        .orderName(this.orderName)
+        .build();
+  }
+}

src/main/java/com/mmc/pms/model/dto/OrderTaskSonDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @Author small @Date 2023/5/25 10:13 @Version 1.0
+ */
+@Data
+// @ApiModel(value = "OrderTaskSonDTO", description = "云享飞订单-子任务表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderTaskSonDTO implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private Integer id;
+
+  @ApiModelProperty(value = "0为主任务")
+  private Integer parentId;
+
+  @ApiModelProperty(value = "客户ID")
+  private Integer userAccountId;
+
+  @ApiModelProperty(value = "运营人员ID（负责这个order的运营人员id")
+  private Integer userOperateId;
+
+  @ApiModelProperty(value = "订单编号")
+  private String orderNo;
+
+  @ApiModelProperty(value = "订单名称")
+  private String orderName;
+
+  @ApiModelProperty(value = "订单总金额")
+  private BigDecimal orderAmt;
+
+  @ApiModelProperty(value = "订单金额中的现金金额")
+  private BigDecimal cashAmt;
+
+  @ApiModelProperty(value = "订单金额中的信用金额")
+  private BigDecimal creditAmt;
+
+  @ApiModelProperty(value = "任务飞行地址")
+  private String taskAddress;
+
+  @ApiModelProperty(value = "基本信息")
+  private String basicInfo;
+
+  @ApiModelProperty(value = "服务开始时间")
+  private LocalDateTime startTime;
+
+  @ApiModelProperty(value = "服务结束时间")
+  private LocalDateTime endTime;
+
+  @ApiModelProperty(value = "实际服务开始时间")
+  private LocalDateTime acStartTime;
+
+  @ApiModelProperty(value = "实际服务结束时间")
+  private LocalDateTime acEndTime;
+
+  @ApiModelProperty(
+      value =
+          "0下单初始化(待分配运营）->	100已分配运营（待需求确认）->	200已经需求确认(待订单确认)->	300已订单确认（待预支付）->	400已预支付(调度中)->	500飞手已接单(待抵达现场)->	525飞手已抵达(待开始作业)->	550已开始作业(作业中)->	575飞手已完成作业(待平台确认作业完成)->	600平台已确认作业完成(待验收结算)->	700验收通过->	900订单关闭")
+  private Integer orderStatus;
+
+  @ApiModelProperty(value = "评价状态：0未评价 1已评价")
+  private Integer evaluateStatus;
+
+  private LocalDateTime createTime;
+
+  private LocalDateTime updateTime;
+
+  @ApiModelProperty(value = "服务项ID")
+  private Integer inspectionId;
+
+  @ApiModelProperty(value = "服务名称")
+  private String inspectionName;
+
+  @ApiModelProperty(value = "最近一次操作信息")
+  private String lastMsg;
+
+  @ApiModelProperty(value = "任务地址经度")
+  private BigDecimal lon;
+
+  @ApiModelProperty(value = "任务地址纬度")
+  private BigDecimal lat;
+
+  @ApiModelProperty(value = "订单关闭原因")
+  private String shutReason;
+
+  @ApiModelProperty(value = "是否营销数据（假数据）：0:否 1:是")
+  private Boolean isDummy;
+
+  @ApiModelProperty(value = "平台备注")
+  private String pfRemark;
+
+  @ApiModelProperty(value = "飞手类型（0个人飞手 1飞手机构）")
+  private Integer flyerType;
+
+  @ApiModelProperty(value = "任务飞手人数")
+  private Integer flyerNum;
+
+  @ApiModelProperty(value = "0:隐藏 1:显示(隐藏后飞手端不显示，不参与抢单)")
+  private Integer display;
+
+  @ApiModelProperty(value = "飞手评价：0未评价 1已评价")
+  private Integer flyerEval;
+
+  @ApiModelProperty(value = "是否进行过催单 0：未通知 1：已通知")
+  private Integer isUrge;
+
+  @ApiModelProperty(value = "订单类型：0普通订单，1推荐订单，2加急单")
+  private Integer orderType;
+
+  @ApiModelProperty(value = "需求确认备注")
+  private String cmdRemark;
+
+  @ApiModelProperty(value = "飞手抢单开始时间")
+  private LocalDateTime flyerStartTime;
+
+  @ApiModelProperty(value = "飞手抢单结束时间")
+  private LocalDateTime flyerEndTime;
+
+  @ApiModelProperty(value = "推荐机构")
+  private Integer rcdCompanyId;
+}

src/main/java/com/mmc/pms/model/dto/OrderVcuDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:46 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.OrderVcuDTO", description = "订单凭证DTO")
+public class OrderVcuDTO implements Serializable {
+  private static final long serialVersionUID = -7101242524092899210L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "订单ID")
+  private Integer orderInfoId;
+
+  @ApiModelProperty(value = "0:发货 1:收货 2:归还 3:平台收货")
+  private Integer vcuType;
+
+  @ApiModelProperty(value = "设备状况:0无问题 1有问题")
+  private Integer vcuSatus;
+
+  @ApiModelProperty(value = "描述-备注")
+  private String remark;
+
+  @ApiModelProperty(value = "图片集合")
+  private List<String> imgs;
+
+  @ApiModelProperty(value = "视频")
+  private String videoUrl;
+}

src/main/java/com/mmc/pms/model/dto/RefundLogDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.RefundLogDTO", description = "退款logDTO")
+public class RefundLogDTO implements Serializable {
+  private static final long serialVersionUID = 6524395508534109389L;
+
+  @ApiModelProperty(value = "内容")
+  private String msg;
+
+  @ApiModelProperty(value = "账号")
+  private String opAccount;
+
+  @ApiModelProperty(value = "名称")
+  private String opName;
+
+  @ApiModelProperty(value = "创建/发送时间")
+  private Date createTime;
+}

src/main/java/com/mmc/pms/model/dto/RepoAccountDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * @Author small @Date 2023/5/25 9:57 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RepoAccountDTO", description = "云仓账号信息DTO")
+public class RepoAccountDTO implements Serializable {
+  private static final long serialVersionUID = 1433562781546856233L;
+
+  @ApiModelProperty(value = "用户id")
+  private Integer id;
+
+  @ApiModelProperty(value = "用户uid")
+  private String uid;
+
+  @ApiModelProperty(value = "账号名称")
+  private String accountName;
+
+  @ApiModelProperty(value = "账号类型")
+  private Integer accountType;
+
+  @ApiModelProperty(value = "联系电话")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "实名认证状态")
+  private Integer realAuthStatus;
+
+  @ApiModelProperty(value = "企业认证状态")
+  private Integer entAuthStatus;
+
+  @ApiModelProperty(value = "渠道认证状态")
+  private Integer channelAuthStatus;
+
+  @ApiModelProperty(value = "渠道等级")
+  private Integer channelClass;
+
+  @ApiModelProperty(value = "常驻城市")
+  private String resAddress;
+
+  @ApiModelProperty(value = "昵称")
+  private String nickName;
+
+  @ApiModelProperty(value = "头像url")
+  private String headerImg;
+
+  @ApiModelProperty(value = "经度")
+  private BigDecimal lon;
+
+  @ApiModelProperty(value = "纬度")
+  private BigDecimal lat;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+
+  @ApiModelProperty(value = "删除状态，0未删除，1删除")
+  private Integer deleted;
+
+  @ApiModelProperty(value = "企业名称")
+  private String entName;
+
+  @ApiModelProperty(value = "用户名称")
+  private String userName;
+
+  @ApiModelProperty(value = "企业认证时间")
+  private Date entAuthTime;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "现金余额")
+  private BigDecimal cashAmt;
+
+  private String unionId;
+  private String openId;
+
+  @ApiModelProperty(value = "多端用户，USER_PORT(云享飞)-FLYER_PORT(云飞手)-REPO_PORT(云仓)")
+  private Set<String> ports;
+
+  @ApiModelProperty(value = "用户推荐人数量")
+  private Integer rcdRepoTeamNum;
+
+  @ApiModelProperty(value = "推荐人Uid")
+  private String rcdUid;
+
+  @ApiModelProperty(value = "推荐人账户名称")
+  private String rcdAccountName;
+
+  @ApiModelProperty(value = "推荐人昵称")
+  private String rcdNickName;
+
+  @ApiModelProperty(value = "推荐人id")
+  private Integer rcdAccountId;
+
+  @ApiModelProperty(value = "是否销售")
+  private Integer sale;
+
+  @ApiModelProperty(value = "是否白名单")
+  private Integer white;
+
+  @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
+  private Integer source;
+
+  @ApiModelProperty(value = "推荐单位")
+  private String company;
+
+  @ApiModelProperty(value = "推荐单位ID", hidden = true)
+  private Integer rcdCompanyId;
+}

src/main/java/com/mmc/pms/model/dto/RepoAddressDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:06 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RepoAddressDTO", description = "云仓地址信息DTO")
+public class RepoAddressDTO implements Serializable {
+  private static final long serialVersionUID = 610413683850745833L;
+
+  @ApiModelProperty(value = "id")
+  private Integer id;
+
+  @ApiModelProperty(value = "用户id")
+  private Integer repoAccountId;
+
+  @ApiModelProperty(value = "姓名")
+  private String realName;
+
+  @ApiModelProperty(value = "电话")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "地区")
+  private String region;
+
+  @ApiModelProperty(value = "详细地址")
+  private String detailAddress;
+
+  @ApiModelProperty(value = "使用类型")
+  private Integer type;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+}

src/main/java/com/mmc/pms/model/dto/RepoCashDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:49 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.RepoBannerDTO", description = "现金流水DTO")
+public class RepoCashDTO implements Serializable {
+  private static final long serialVersionUID = 4569221850373256579L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "用户ID", hidden = true)
+  private Integer repoAccountId;
+
+  @ApiModelProperty(value = "用户UID", hidden = true)
+  private String uid;
+
+  @ApiModelProperty(value = "用户名", hidden = true)
+  private String accountName;
+
+  @ApiModelProperty(value = "订单ID", hidden = true)
+  private Integer orderInfoId;
+
+  @ApiModelProperty(value = "订单编号")
+  private String orderNo;
+
+  @ApiModelProperty(value = "skuID", hidden = true)
+  private Integer skuInfoId;
+
+  @ApiModelProperty(value = "sku标题", hidden = true)
+  private String skuTitle;
+
+  @ApiModelProperty(value = "商品ID", hidden = true)
+  private Integer wareInfoId;
+
+  @ApiModelProperty(value = "商品编号", hidden = true)
+  private String wareNo;
+
+  @ApiModelProperty(value = "商品标题")
+  private String wareTitle;
+
+  @ApiModelProperty(value = "流水编号")
+  private String payNo;
+
+  @ApiModelProperty(value = "流水类型:查字典")
+  private Integer payMethod;
+
+  @ApiModelProperty(value = "变动金额")
+  private BigDecimal amtPaid;
+
+  @ApiModelProperty(value = "当前余额")
+  private BigDecimal cashAmt;
+
+  @ApiModelProperty(value = "支付时间")
+  private Date payTime;
+
+  @ApiModelProperty(value = "退款流水编号")
+  private String refundNo;
+
+  @ApiModelProperty(value = "凭证")
+  private List<String> voucher;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+
+  @ApiModelProperty(value = "操作人账号")
+  private String opNo;
+
+  @ApiModelProperty(value = "操作人姓名")
+  private String opName;
+
+  private Integer createUser;
+}

src/main/java/com/mmc/pms/model/dto/RepoInfoDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:07 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RepoInfoDTO", description = "仓库/门店DTO")
+public class RepoInfoDTO implements Serializable {
+  private static final long serialVersionUID = 8002261035352227237L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "仓库名称")
+  private String repoName;
+
+  @ApiModelProperty(value = "仓库编号")
+  private String repoNo;
+
+  @ApiModelProperty(value = "仓库地址")
+  private String repoAddress;
+
+  @ApiModelProperty(value = "经度")
+  private BigDecimal lon;
+
+  @ApiModelProperty(value = "纬度")
+  private BigDecimal lat;
+
+  @ApiModelProperty(value = "仓库营业时间")
+  private String repoBusinessHours;
+
+  @ApiModelProperty(value = "管理员Id")
+  private Integer userAccountId;
+
+  @ApiModelProperty(value = "管理员账号")
+  private String accountNo;
+
+  @ApiModelProperty(value = "管理员姓名")
+  private String userName;
+
+  @ApiModelProperty(value = "管理员手机号")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "仓库库存")
+  private Integer repoInventory;
+
+  @ApiModelProperty(value = "是否删除")
+  private Integer deleted;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "设备个数")
+  private Integer deviceNum;
+}

src/main/java/com/mmc/pms/model/dto/RoleInfoDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:57 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RoleInfoDTO", description = "角色信息DTO")
+public class RoleInfoDTO implements Serializable {
+  private static final long serialVersionUID = -4791023169682602298L;
+
+  @ApiModelProperty(value = "角色ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "角色编号")
+  private String roleNo;
+
+  @ApiModelProperty(value = "角色名称")
+  private String roleName;
+
+  @ApiModelProperty(value = "是否为管理角色:0否 1是")
+  private Integer admin; // 是否为管理角色
+
+  @ApiModelProperty(value = "是否为运营角色:0否 1是")
+  private Integer operate;
+
+  @ApiModelProperty(value = "是否为系统角色:0否 1是")
+  private Integer system;
+
+  @ApiModelProperty(value = "是否为PMC发货角色:0否 1是")
+  private Integer pmc; // PMC发货角色
+
+  @ApiModelProperty(value = "是否可用:0否 1是")
+  private Integer roleStatus;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+}

src/main/java/com/mmc/pms/model/dto/TaskFlyerCostDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 10:12 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.TaskFlyerCostDTO", description = "飞手工资DTO")
+public class TaskFlyerCostDTO implements Serializable {
+  private static final long serialVersionUID = 4411028098471010440L;
+
+  @ApiModelProperty(value = "飞手工资id")
+  private Integer id;
+
+  @ApiModelProperty(value = "订单id")
+  private Integer orderTaskId;
+
+  @ApiModelProperty(value = "飞手日薪")
+  private BigDecimal flyerWag;
+
+  @ApiModelProperty(value = "飞手每日补贴")
+  private BigDecimal flyerSudy;
+
+  @ApiModelProperty(value = "每月工资结算日")
+  private Integer payDay;
+
+  @ApiModelProperty(value = "租房补贴")
+  private BigDecimal rentHouseSudy;
+
+  @ApiModelProperty(value = "交通补贴")
+  private BigDecimal trafficSudy;
+
+  @ApiModelProperty(value = "支付比例(例如0.95)")
+  private BigDecimal payPersent;
+
+  @ApiModelProperty(value = "设备信息")
+  private String deviceInfo;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "任务编号")
+  private String orderNo;
+
+  @ApiModelProperty(value = "任务名称")
+  private String orderName;
+
+  @ApiModelProperty(value = "飞手数量")
+  private Integer flyerNum;
+
+  @ApiModelProperty(value = "服务类型")
+  private String inspectionName;
+
+  @ApiModelProperty(value = "飞手类型（0个人飞手 1飞手机构）")
+  private Integer flyerType;
+
+  @ApiModelProperty(value = "任务工资信息列表")
+  private List<WagTermDetailDTO> details;
+
+  @ApiModelProperty(value = "任务开始日")
+  private Date startTime;
+
+  @ApiModelProperty(value = "任务结束日")
+  private Date endTime;
+
+  @ApiModelProperty(value = "高温补贴")
+  private BigDecimal hotSudy;
+
+  @ApiModelProperty(value = "预估金额")
+  private BigDecimal estimateWag;
+
+  @ApiModelProperty(value = "补助标签")
+  private String sudyTag;
+
+  public void defaultValue() {
+    if (this.flyerWag == null) {
+      this.flyerWag = BigDecimal.ZERO;
+    }
+
+    if (this.flyerSudy == null) {
+      this.flyerSudy = BigDecimal.ZERO;
+    }
+
+    if (this.rentHouseSudy == null) {
+      this.rentHouseSudy = BigDecimal.ZERO;
+    }
+
+    if (this.trafficSudy == null) {
+      this.trafficSudy = BigDecimal.ZERO;
+    }
+
+    if (this.payPersent == null) {
+      this.payPersent = BigDecimal.ZERO;
+    }
+
+    if (this.hotSudy == null) {
+      this.hotSudy = BigDecimal.ZERO;
+    }
+  }
+}

src/main/java/com/mmc/pms/model/dto/UserAccountDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 9:56 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.UserAccountDTO", description = "用户信息DTO")
+public class UserAccountDTO implements Serializable {
+  private static final long serialVersionUID = -3760693134872196985L;
+
+  @ApiModelProperty(value = "用户ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "UID")
+  private String uid;
+
+  @ApiModelProperty(value = "账号")
+  private String accountNo;
+
+  @ApiModelProperty(value = "密码")
+  private String passWord;
+
+  @ApiModelProperty(value = "昵称")
+  private String nickName;
+
+  @ApiModelProperty(value = "姓名")
+  private String userName;
+
+  @ApiModelProperty(value = "身份证号码")
+  private String idNumber;
+
+  @ApiModelProperty(value = "电话号码")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "性别：0未知 1男 2女 ")
+  private Integer userSex;
+
+  @ApiModelProperty(value = "常住地址")
+  private String resAddres;
+
+  private Integer realAuthStatus;
+
+  @ApiModelProperty(value = "常住地址-经度")
+  private String longitude;
+
+  @ApiModelProperty(value = "常住地址-纬度")
+  private String latitude;
+
+  @ApiModelProperty(value = "是否企业用户：0否 1是")
+  private Integer entUser;
+
+  @ApiModelProperty(value = "是否渠道用户：0否 1是")
+  private Integer channelUser;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+
+  @ApiModelProperty(value = "账号类型：0神行太保平台账号 ; 100云享飞-客户端; 101云享飞-飞手端; 102云享飞-云仓端")
+  private Integer accountType;
+
+  @ApiModelProperty(value = "账号状态：0禁用 1可用")
+  private Integer accountStatus;
+
+  @ApiModelProperty(value = "角色信息")
+  private RoleInfoDTO roleInfo;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "身份证正面照")
+  private String frontIdImg;
+
+  @ApiModelProperty(value = "身份证反面照")
+  private String backIdImg;
+
+  @ApiModelProperty(value = "邮箱")
+  private String email;
+
+  @ApiModelProperty(value = "单位信息")
+  private CompanySimpleDTO companyInfo;
+
+  private Integer rcdCompanyId;
+
+  @ApiModelProperty(value = "渠道等级")
+  private String channelLevel;
+
+  @ApiModelProperty(value = "法大大企业认证状态")
+  private Integer entVerifyStatus;
+
+  public UserAccountDTO(Integer id, String uid, String nickName) {
+    this.id = id;
+    this.uid = uid;
+    this.nickName = nickName;
+  }
+}

src/main/java/com/mmc/pms/model/dto/WagTermDetailDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:13 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.WagTermDetailDTO", description = "任务工资信息DTO")
+public class WagTermDetailDTO implements Serializable {
+  private static final long serialVersionUID = 6088946395006027466L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "工资日期")
+  private Date costDate;
+
+  @ApiModelProperty(value = "工资(元/日)")
+  private BigDecimal wagPrice;
+
+  @ApiModelProperty(value = "补贴(元/日)")
+  private BigDecimal sudyPrice;
+
+  @ApiModelProperty(value = "出差租房补贴(元/日)")
+  private BigDecimal rentHousePrice;
+
+  @ApiModelProperty(value = "出差交通补贴(元/日)")
+  private BigDecimal trafficPrice;
+
+  @ApiModelProperty(value = "高温补贴(元/日)")
+  private BigDecimal hotPrice;
+
+  @ApiModelProperty(value = "飞手人数")
+  private Integer flyerNum;
+
+  @ApiModelProperty(value = "支付比例")
+  private BigDecimal payPersent;
+
+  @ApiModelProperty(value = "应结工资")
+  private BigDecimal shouldPay;
+
+  @ApiModelProperty(value = "补贴合计-单价（不计算人数）")
+  private BigDecimal daySudyUnit;
+
+  public void defaultValue() {
+    if (this.wagPrice == null) {
+      this.wagPrice = BigDecimal.ZERO;
+    }
+
+    if (this.sudyPrice == null) {
+      this.sudyPrice = BigDecimal.ZERO;
+    }
+
+    if (this.rentHousePrice == null) {
+      this.rentHousePrice = BigDecimal.ZERO;
+    }
+
+    if (this.trafficPrice == null) {
+      this.trafficPrice = BigDecimal.ZERO;
+    }
+
+    if (this.wagPrice == null) {
+      this.wagPrice = BigDecimal.ZERO;
+    }
+
+    if (this.payPersent == null) {
+      this.payPersent = BigDecimal.ZERO;
+    }
+
+    if (this.flyerNum == null) {
+      this.flyerNum = 0;
+    }
+  }
+}

src/main/java/com/mmc/pms/model/qo/OrderInfoQO.java

+package com.mmc.pms.model.qo;
+
+import com.mmc.pms.common.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:52 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.qo.OrderInfoQO", description = "订单QO")
+public class OrderInfoQO implements Serializable {
+  private static final long serialVersionUID = -3503119623575892302L;
+
+  @ApiModelProperty(value = "用户ID", hidden = true)
+  private Integer repoAccountId;
+
+  @ApiModelProperty(value = "关键字")
+  private String keyword;
+
+  @ApiModelProperty(value = "pc-买家账号")
+  private String keyword1;
+
+  @ApiModelProperty(value = "pc-订单编号")
+  private String keyword2;
+
+  @ApiModelProperty(value = "pc-商品编号")
+  private String keyword3;
+
+  @ApiModelProperty(value = "pc-商品名称")
+  private String keyword4;
+
+  @ApiModelProperty(value = "订单状态：查字典")
+  private String tranStatus;
+
+  @ApiModelProperty(value = "pc-开始时间")
+  private String startTime;
+
+  @ApiModelProperty(value = "pc-结束时间")
+  private String endTime;
+
+  @ApiModelProperty(value = "用户ID", hidden = true)
+  private List<Integer> userIds;
+
+  @ApiModelProperty(value = "单位ID", hidden = true)
+  private List<Integer> companys;
+
+  @ApiModelProperty(value = "页码", required = true)
+  @NotNull(
+      message = "页码不能为空",
+      groups = {Page.class})
+  @Min(value = 1, groups = Page.class)
+  private Integer pageNo;
+
+  @ApiModelProperty(value = "每页显示数", required = true)
+  @NotNull(
+      message = "每页显示数不能为空",
+      groups = {Page.class})
+  @Min(value = 1, groups = Page.class)
+  private Integer pageSize;
+
+  public void buildCurrentPage() {
+    this.pageNo = (pageNo - 1) * pageSize;
+  }
+}

src/main/java/com/mmc/pms/model/vo/LeaseOrderVO.java

+package com.mmc.pms.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 10:08 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LeaseOrderVO implements Serializable {
+  private static final long serialVersionUID = 3876353091071918771L;
+  private String orderNo;
+  private Integer wareInfoId;
+  private String wareNo;
+  private String wareTitle;
+  private String mainImg;
+  private Integer skuInfoId;
+  private String skuTitle;
+  private Integer repoAccountId;
+  private String uid;
+  private String buyerName;
+  private String buyerPhone;
+  private BigDecimal unitPrice;
+  private Integer wareNum;
+  private BigDecimal shouldPay;
+  private BigDecimal actualPay;
+  private Integer orderType;
+  private BigDecimal deposit;
+  private BigDecimal rentPrice;
+  private Date startDate;
+  private Date endDate;
+  private Integer payDay;
+  private Integer exWare;
+  private String tranStatus;
+  private String remark;
+  private Integer rcdCompanyId;
+  private Date createTime;
+  private OrderReceiptVO orderReceipt;
+}

src/main/java/com/mmc/pms/model/vo/OrderReceiptVO.java

+package com.mmc.pms.model.vo;
+
+import com.mmc.pms.entity.OrderReceiptDO;
+import com.mmc.pms.model.dto.RepoAddressDTO;
+import com.mmc.pms.model.dto.RepoInfoDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 10:06 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.vo.OrderReceiptVO", description = "收货地址类")
+public class OrderReceiptVO implements Serializable {
+  private static final long serialVersionUID = -3695743775258866831L;
+
+  @ApiModelProperty(value = "", hidden = true)
+  private Integer id;
+
+  @ApiModelProperty(value = "订单id")
+  private Integer orderInfoId;
+
+  @ApiModelProperty(value = "", hidden = true)
+  private Integer receiptMethod;
+
+  @ApiModelProperty(value = "", hidden = true)
+  private String takeName;
+
+  @ApiModelProperty(value = "", hidden = true)
+  private String takePhone;
+
+  @ApiModelProperty(value = "", hidden = true)
+  private String region;
+
+  @ApiModelProperty(value = "", hidden = true)
+  private String detailAddress;
+
+  @ApiModelProperty(value = "门店名称")
+  private String repoName;
+
+  @ApiModelProperty(value = "门店地址")
+  private String repoAddress;
+
+  @ApiModelProperty(value = "预留手机号")
+  private String bookPhone;
+
+  @ApiModelProperty(value = "物流公司编码")
+  private String sendExCode;
+
+  @ApiModelProperty(value = "物流单号")
+  private String sendExNo;
+
+  public void buildAddress(RepoAddressDTO d) {
+    this.takeName = d.getRealName();
+    this.takePhone = d.getPhoneNum();
+    this.region = d.getRegion();
+    this.detailAddress = d.getDetailAddress();
+  }
+
+  public void buildAddress(RepoInfoDTO d, String bookPhone) {
+    this.repoName = d.getRepoName();
+    this.repoAddress = d.getRepoAddress();
+    this.bookPhone = bookPhone;
+  }
+
+  public OrderReceiptDO buildOrderReceiptDO() {
+    return OrderReceiptDO.builder()
+        .orderInfoId(this.orderInfoId)
+        .sendExCode(this.sendExCode)
+        .sendExNo(this.sendExNo)
+        .build();
+  }
+}

src/main/java/com/mmc/pms/service/Impl/RentalOrdersServiceImpl.java

+package com.mmc.pms.service.Impl;
+
+import com.mmc.pms.dao.RentalOrdersDao;
+import com.mmc.pms.model.dto.BaseAccountDTO;
+import com.mmc.pms.model.dto.OrderInfoDTO;
+import com.mmc.pms.model.qo.OrderInfoQO;
+import com.mmc.pms.page.PageResult;
+import com.mmc.pms.service.RentalOrdersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author small @Date 2023/5/25 9:44 @Version 1.0
+ */
+@Service
+public class RentalOrdersServiceImpl implements RentalOrdersService {
+  @Autowired private RentalOrdersDao rentalOrdersDao;
+
+  @Override
+  public PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser) {
+    if (!cuser.isManage()) {
+      param.setCompanys(cuser.getCompanyInfo().getCompanys());
+    }
+    Integer count = rentalOrdersDao.countPcOrderInfo(param);
+    if (count == 0) {
+      return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
+    }
+    Integer pageNo = param.getPageNo();
+    param.buildCurrentPage();
+    List<OrderInfoDTO> data =
+        rentalOrdersDao.listPcOrderInfo(param).stream()
+            .map(
+                d -> {
+                  return d.buildOrderInfoDTO();
+                })
+            .collect(Collectors.toList());
+    return PageResult.buildPage(pageNo, param.getPageSize(), count, data);
+  }
+
+  @Override
+  public PageResult listPageWechatOrder(BaseAccountDTO account, OrderInfoQO param) {
+    param.setRepoAccountId(account.getId());
+    int count = rentalOrdersDao.countPageOrderInfo(param);
+    if (count == 0) {
+      return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
+    }
+    Integer pageNo = param.getPageNo();
+    param.buildCurrentPage();
+    List<OrderInfoDTO> data =
+        rentalOrdersDao.listPageOrderInfo(param).stream()
+            .map(
+                d -> {
+                  return d.buildOrderInfoDTO();
+                })
+            .collect(Collectors.toList());
+    return PageResult.buildPage(pageNo, param.getPageSize(), count, data);
+  }
+}

src/main/java/com/mmc/pms/service/RentalOrdersService.java

+package com.mmc.pms.service;
+
+import com.mmc.pms.model.dto.BaseAccountDTO;
+import com.mmc.pms.model.qo.OrderInfoQO;
+import com.mmc.pms.page.PageResult;
+
+/**
+ * @Author small @Date 2023/5/25 9:44 @Version 1.0
+ */
+public interface RentalOrdersService {
+  PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser);
+
+  PageResult listPageWechatOrder(BaseAccountDTO account, OrderInfoQO param);
+}