PackageName(update)

src/main/java/com/mmc/oms/common/AuthHandler.java

 package com.mmc.oms.common;
 
 import com.alibaba.fastjson.JSONArray;
+import com.mmc.oms.common.json.JsonUtil;
 import com.mmc.oms.jwt.JwtConstant;
-
-import com.mmc.oms.model.dto.BaseAccountDTO;
+import com.mmc.oms.model.dto.user.BaseAccountDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -73,7 +75,7 @@ public class AuthHandler {
         String key = RedisConstant.getCompanyChildKey(companyId);
         if (stringRedisTemplate.hasKey(key)) {
             String json = stringRedisTemplate.opsForValue().get(key);
-            if(!StringUtils.isEmpty(json)) {
+            if (!StringUtils.isEmpty(json)) {
                 List<Integer> list = JSONArray.parseArray(json, Integer.class);
                 return list;
             }

src/main/java/com/mmc/oms/common/CouponConstants.java

-package com.mmc.oms.common;
-
-/**
- * @Author small
- * @Date 2023/5/24 14:03
- * @Version 1.0
- */
-public class CouponConstants {
-
-    /**
-     * --------优惠券常量------------
-     */
-
-
-    /** 优惠券类型—打折券 */
-    public static final Integer COUPON_TYPE_DISCOUNT = 1;
-
-    /** 优惠券类型—减免券 */
-    public static final Integer COUPON_TYPE_REDUCED = 2;
-
-    /** 优惠券类型—无门槛 */
-    public static final Integer COUPON_TYPE_NO_THRESHOLD = 3;
-
-
-    /** 优惠券使用类型—vip */
-    public static final Integer COUPON_USR_TYPE_VIP = 1;
-
-    /** 优惠券使用类型—品牌券 */
-    public static final Integer COUPON_USR_TYPE_BRAND = 2;
-
-
-    /** 优惠券有效期时间方式-固定时间 */
-    public static final Integer COUPON_USE_TIME_FIXED = 0;
-
-    /** 优惠券有效期时间方式-领取当日起 */
-    public static final Integer COUPON_USE_TIME_THE_DAY = 1;
-
-    /** 优惠券有效期时间方式-领取次日起 */
-    public static final Integer COUPON_USE_TIME_NEXT_DAY = 2;
-
-
-    /** 优惠券发放方式—手动领取 */
-    public static final Integer COUPON_ISSUE_TYPE_RECEIVE = 1;
-
-    /** 优惠券发放方式—系统发放 */
-    public static final Integer COUPON_ISSUE_TYPE_INITIATIVE =2;
-
-    /** 优惠券发放方式—批量导入用户 */
-    public static final Integer COUPON_ISSUE_TYPE_IMPORT = 3;
-
-    /** 优惠券使用类型—活动裂变券 */
-    public static final Integer COUPON_USR_TYPE_ACTIVITY = 4;
-
-
-    /** 用户标签-新人 */
-    public static final Integer USER_LABEL_NEW_PEOPLE = 1;
-
-    /** 用户标签-实名认证 */
-    public static final Integer USER_LABEL_REAL_NAME_AUTHENTICATION = 2;
-
-    /** 用户标签-企业认证 */
-    public static final Integer USER_LABEL_ENTERPRISE_CERTIFICATION = 3;
-
-
-    /**
-     * --------用户优惠券常量----------------
-     */
-
-    /** 用户优惠券获取方式—用户领取 */
-    public static final String STORE_COUPON_USER_TYPE_GET = "receive";
-
-    /** 用户优惠券获取方式—后台发放 */
-    public static final String STORE_COUPON_USER_TYPE_SEND = "send";
-
-    /** 用户优惠券获取方式—赠送 */
-    public static final String STORE_COUPON_USER_TYPE_PRESENTED = "presented";
-
-    /** 用户优惠券获取方式—获赠 */
-    public static final String STORE_COUPON_USER_TYPE_ACQUIRE = "acquire";
-
-    /** 用户优惠券获取方式—兑换 */
-    public static final String STORE_COUPON_USER_TYPE_EXCHANGE = "exchange";
-
-    /** 用户优惠券获取方式—活动领取 */
-    public static final String STORE_COUPON_USER_TYPE_ACTIVITY = "activity";
-
-    /** 用户优惠券状态—未使用 */
-    public static final Integer STORE_COUPON_USER_STATUS_USABLE = 0;
-
-    /** 用户优惠券状态—已使用 */
-    public static final Integer STORE_COUPON_USER_STATUS_USED = 1;
-
-    /** 用户优惠券状态—已失效 */
-    public static final Integer STORE_COUPON_USER_STATUS_LAPSED = 2;
-
-    /** 用户优惠券状态—已转赠 */
-    public static final Integer STORE_COUPON_USER_STATUS_PRESENTED = 3;
-
-    /** 用户优惠券状态—使用中 */
-    public static final Integer STORE_COUPON_USER_STATUS_IN_USE = 4;
-
-
-}

src/main/java/com/mmc/oms/common/ResultEnum.java

@@ -401,7 +401,8 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     REFUND_FAILED("2015", "退款失败，请联系客服"),
     NO_PERMISSION_TEMPORARILY("2016", "当前账号没有权限，只有后台账号拥有权限"),
     THERE_IS_NO_SUCH_ORDER("2017", "没有当前订单,请输入正确的订单编号"),
-    THE_TOKEN_CANNOT_BE_NULL("2018", "token不能为null");
+    THE_TOKEN_CANNOT_BE_NULL("2018", "token不能为null"),
+    THE_CURRENT_ACCOUNT_CANNOT_PLACE_ORDERS("2019", "后台管理账号不能下单");
 
     /**
      * 错误码

src/main/java/com/mmc/oms/common/coupon/CouponConstants.java

+package com.mmc.oms.common.coupon;
+
+/**
+ * @Author small
+ * @Date 2023/5/24 14:03
+ * @Version 1.0
+ */
+public class CouponConstants {
+
+    /**
+     * --------优惠券常量------------
+     */
+
+
+    /**
+     * 优惠券类型—打折券
+     */
+    public static final Integer COUPON_TYPE_DISCOUNT = 1;
+
+    /**
+     * 优惠券类型—减免券
+     */
+    public static final Integer COUPON_TYPE_REDUCED = 2;
+
+    /**
+     * 优惠券类型—无门槛
+     */
+    public static final Integer COUPON_TYPE_NO_THRESHOLD = 3;
+
+
+    /**
+     * 优惠券使用类型—vip
+     */
+    public static final Integer COUPON_USR_TYPE_VIP = 1;
+
+    /**
+     * 优惠券使用类型—品牌券
+     */
+    public static final Integer COUPON_USR_TYPE_BRAND = 2;
+
+
+    /**
+     * 优惠券有效期时间方式-固定时间
+     */
+    public static final Integer COUPON_USE_TIME_FIXED = 0;
+
+    /**
+     * 优惠券有效期时间方式-领取当日起
+     */
+    public static final Integer COUPON_USE_TIME_THE_DAY = 1;
+
+    /**
+     * 优惠券有效期时间方式-领取次日起
+     */
+    public static final Integer COUPON_USE_TIME_NEXT_DAY = 2;
+
+
+    /**
+     * 优惠券发放方式—手动领取
+     */
+    public static final Integer COUPON_ISSUE_TYPE_RECEIVE = 1;
+
+    /**
+     * 优惠券发放方式—系统发放
+     */
+    public static final Integer COUPON_ISSUE_TYPE_INITIATIVE = 2;
+
+    /**
+     * 优惠券发放方式—批量导入用户
+     */
+    public static final Integer COUPON_ISSUE_TYPE_IMPORT = 3;
+
+    /**
+     * 优惠券使用类型—活动裂变券
+     */
+    public static final Integer COUPON_USR_TYPE_ACTIVITY = 4;
+
+
+    /**
+     * 用户标签-新人
+     */
+    public static final Integer USER_LABEL_NEW_PEOPLE = 1;
+
+    /**
+     * 用户标签-实名认证
+     */
+    public static final Integer USER_LABEL_REAL_NAME_AUTHENTICATION = 2;
+
+    /**
+     * 用户标签-企业认证
+     */
+    public static final Integer USER_LABEL_ENTERPRISE_CERTIFICATION = 3;
+
+
+    /**
+     * --------用户优惠券常量----------------
+     */
+
+    /**
+     * 用户优惠券获取方式—用户领取
+     */
+    public static final String STORE_COUPON_USER_TYPE_GET = "receive";
+
+    /**
+     * 用户优惠券获取方式—后台发放
+     */
+    public static final String STORE_COUPON_USER_TYPE_SEND = "send";
+
+    /**
+     * 用户优惠券获取方式—赠送
+     */
+    public static final String STORE_COUPON_USER_TYPE_PRESENTED = "presented";
+
+    /**
+     * 用户优惠券获取方式—获赠
+     */
+    public static final String STORE_COUPON_USER_TYPE_ACQUIRE = "acquire";
+
+    /**
+     * 用户优惠券获取方式—兑换
+     */
+    public static final String STORE_COUPON_USER_TYPE_EXCHANGE = "exchange";
+
+    /**
+     * 用户优惠券获取方式—活动领取
+     */
+    public static final String STORE_COUPON_USER_TYPE_ACTIVITY = "activity";
+
+    /**
+     * 用户优惠券状态—未使用
+     */
+    public static final Integer STORE_COUPON_USER_STATUS_USABLE = 0;
+
+    /**
+     * 用户优惠券状态—已使用
+     */
+    public static final Integer STORE_COUPON_USER_STATUS_USED = 1;
+
+    /**
+     * 用户优惠券状态—已失效
+     */
+    public static final Integer STORE_COUPON_USER_STATUS_LAPSED = 2;
+
+    /**
+     * 用户优惠券状态—已转赠
+     */
+    public static final Integer STORE_COUPON_USER_STATUS_PRESENTED = 3;
+
+    /**
+     * 用户优惠券状态—使用中
+     */
+    public static final Integer STORE_COUPON_USER_STATUS_IN_USE = 4;
+
+
+}

src/main/java/com/mmc/oms/common/CouponType.java → src/main/java/com/mmc/oms/common/coupon/CouponType.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.coupon;
 
 /**
  * @Author small
@@ -7,9 +7,9 @@ package com.mmc.oms.common;
  */
 public interface CouponType {
     //打折券
-    public static final Integer DISCOUNT_COUPONS=1;
+    public static final Integer DISCOUNT_COUPONS = 1;
     //减免卷
-    public static final Integer REDUCTION_ROLLS=2;
+    public static final Integer REDUCTION_ROLLS = 2;
     //无门槛
-    public static final Integer NO_THRESHOLD=3;
+    public static final Integer NO_THRESHOLD = 3;
 }

src/main/java/com/mmc/oms/common/CouponUserExcel.java → src/main/java/com/mmc/oms/common/coupon/CouponUserExcel.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.coupon;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,7 +22,7 @@ import java.util.Date;
 @ExcelTarget("couponUserExcel")
 public class CouponUserExcel implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @Excel(name = "优惠券id", orderNum = "1", width = 25)
     private Integer couponId;

src/main/java/com/mmc/oms/common/JsonUtil.java → src/main/java/com/mmc/oms/common/json/JsonUtil.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.json;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

src/main/java/com/mmc/oms/common/Auto.java → src/main/java/com/mmc/oms/common/publicinterface/Auto.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Confirm.java → src/main/java/com/mmc/oms/common/publicinterface/Confirm.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Create.java → src/main/java/com/mmc/oms/common/publicinterface/Create.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Freeze.java → src/main/java/com/mmc/oms/common/publicinterface/Freeze.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Insert.java → src/main/java/com/mmc/oms/common/publicinterface/Insert.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Others.java → src/main/java/com/mmc/oms/common/publicinterface/Others.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Page.java → src/main/java/com/mmc/oms/common/publicinterface/Page.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Publicsher.java → src/main/java/com/mmc/oms/common/publicinterface/Publicsher.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
-import com.mmc.oms.model.dto.OrderInfoDTO;
+import com.mmc.oms.model.dto.order.OrderInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Query.java → src/main/java/com/mmc/oms/common/publicinterface/Query.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Refund.java → src/main/java/com/mmc/oms/common/publicinterface/Refund.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/RepeatSubmit.java → src/main/java/com/mmc/oms/common/publicinterface/RepeatSubmit.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/mmc/oms/common/Send.java → src/main/java/com/mmc/oms/common/publicinterface/Send.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Share.java → src/main/java/com/mmc/oms/common/publicinterface/Share.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Take.java → src/main/java/com/mmc/oms/common/publicinterface/Take.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/Update.java → src/main/java/com/mmc/oms/common/publicinterface/Update.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.publicinterface;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/PageResult.java → src/main/java/com/mmc/oms/common/result/PageResult.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.result;
 
 import com.mmc.oms.model.qo.BaseInfoQO;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/oms/common/ResultBody.java → src/main/java/com/mmc/oms/common/result/ResultBody.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.result;
 
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiModel;
+import com.mmc.oms.common.BaseErrorInfoInterface;
+import com.mmc.oms.common.ResultEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -71,9 +72,8 @@ public class ResultBody<T> implements Serializable {
 
     /**
      * 成功
-     *
-     * **/
-    public static ResultBody success1(ResultEnum enums){
+     **/
+    public static ResultBody success1(ResultEnum enums) {
         ResultBody rb = new ResultBody();
         rb.setCode("200");
         rb.setMessage(enums.getResultMsg());

src/main/java/com/mmc/oms/common/ChannelAuthStatus.java → src/main/java/com/mmc/oms/common/status/ChannelAuthStatus.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.status;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/EntAuthStatus.java → src/main/java/com/mmc/oms/common/status/EntAuthStatus.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.status;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/RealAuthStatus.java → src/main/java/com/mmc/oms/common/status/RealAuthStatus.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.status;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/RefundStatus.java → src/main/java/com/mmc/oms/common/status/RefundStatus.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.status;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/TranStatusDic.java → src/main/java/com/mmc/oms/common/status/TranStatusDic.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.status;
 
 /**
  * @Author small
@@ -21,9 +21,7 @@ public enum TranStatusDic {
 
     TKSQ("700", "退款申请中", "待退款完成"),
 
-    CLOSE("999", "订单关闭", "订单关闭")
-
-    ;
+    CLOSE("999", "订单关闭", "订单关闭");
 
     private String status;
     private String waiting;

src/main/java/com/mmc/oms/common/WarePayStatus.java → src/main/java/com/mmc/oms/common/status/WarePayStatus.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.status;
 
 /**
  * @Author small

src/main/java/com/mmc/oms/common/CodeUtil.java → src/main/java/com/mmc/oms/common/util/CodeUtil.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.util;
 
 import java.util.Random;
 

src/main/java/com/mmc/oms/common/KdnExpressUtil.java → src/main/java/com/mmc/oms/common/util/KdnExpressUtil.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.util;
 
 import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 
@@ -25,7 +25,7 @@ public class KdnExpressUtil {
     // 请求url, 正式环境地址
     private static String ReqURL = "https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx";
     //订阅推送请求url, 正式环境地址
-    private static String KdApiSearchMonitorPushReqURL="https://api.kdniao.com/api/dist";
+    private static String KdApiSearchMonitorPushReqURL = "https://api.kdniao.com/api/dist";
 
     public static void main(String[] args) {
         try {
@@ -104,6 +104,7 @@ public class KdnExpressUtil {
 
     /**
      * 物流跟踪接口(增值版)
+     *
      * @param callbackTag-表示端口及订单：端口/订单号
      * @param shipperCode-快递公司编码
      * @param logisticCode-快递编号
@@ -111,24 +112,24 @@ public class KdnExpressUtil {
      * @return
      * @throws Exception
      */
-    public static String kdApiSearchMonitorPush(String callbackTag, String shipperCode, String logisticCode, String customerName) throws Exception{
+    public static String kdApiSearchMonitorPush(String callbackTag, String shipperCode, String logisticCode, String customerName) throws Exception {
         // 组装应用级参数
-        String RequestData= "{"+
-                "'Callback':'"+callbackTag+"',"+
-                "'ShipperCode':'"+shipperCode+"',"+
-                "'LogisticCode':'"+logisticCode+"',"+
-                "'CustomerName':'"+customerName+"',"+
+        String RequestData = "{" +
+                "'Callback':'" + callbackTag + "'," +
+                "'ShipperCode':'" + shipperCode + "'," +
+                "'LogisticCode':'" + logisticCode + "'," +
+                "'CustomerName':'" + customerName + "'," +
                 "}";
         // 组装系统级参数
-        Map<String,String> params = new HashMap<String,String>();
+        Map<String, String> params = new HashMap<String, String>();
         params.put("RequestData", urlEncoder(RequestData, "UTF-8"));
         params.put("EBusinessID", EBusinessID);
         params.put("RequestType", "8005");//在途监控订阅接口指令8008/地图版订阅接口指令8005
-        String dataSign=encrypt(RequestData, ApiKey, "UTF-8");
+        String dataSign = encrypt(RequestData, ApiKey, "UTF-8");
         params.put("DataSign", urlEncoder(dataSign, "UTF-8"));
         params.put("DataType", "2");
         // 以form表单形式提交post请求，post请求体中包含了应用级参数和系统级参数
-        String result=sendPost(KdApiSearchMonitorPushReqURL, params);
+        String result = sendPost(KdApiSearchMonitorPushReqURL, params);
 
         //根据公司业务处理返回的信息......
         return result;
@@ -174,8 +175,8 @@ public class KdnExpressUtil {
     /**
      * 电商Sign签名生成 content 内容 keyValue ApiKey charset 编码方式
      *
-     * @throws UnsupportedEncodingException ,Exception
      * @return DataSign签名
+     * @throws UnsupportedEncodingException ,Exception
      */
     @SuppressWarnings("unused")
     private static String encrypt(String content, String keyValue, String charset)

src/main/java/com/mmc/oms/common/TDateUtil.java → src/main/java/com/mmc/oms/common/util/TDateUtil.java

-package com.mmc.oms.common;
+package com.mmc.oms.common.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -160,17 +160,18 @@ public class TDateUtil {
 
     /**
      * 某天个时间加 N 小时
+     *
      * @param now
      * @param num
      * @return
      */
-    public static Date addHourTime(Date now,int num){
+    public static Date addHourTime(Date now, int num) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = null;
         try {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(now);
-            calendar.add(Calendar.HOUR,num);
+            calendar.add(Calendar.HOUR, num);
             String last = format.format(calendar.getTime());
             date = getDate(last, "yyyy-MM-dd HH:mm:ss");
         } catch (Exception e) {
@@ -480,7 +481,7 @@ public class TDateUtil {
      */
     public static Date getLastYearTodayDate() {
         Calendar instance = Calendar.getInstance();
-        instance.add(Calendar.YEAR,-1);
+        instance.add(Calendar.YEAR, -1);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String s = format.format(instance.getTime());
         return getDate(s, "yyyy-MM-dd");
@@ -488,12 +489,13 @@ public class TDateUtil {
 
     /**
      * 获取昨天的日期
+     *
      * @param type
      * @return
      */
-    public static String getYesterdayDateByType(String type){
+    public static String getYesterdayDateByType(String type) {
         Calendar instance = Calendar.getInstance();
-        instance.add(Calendar.DAY_OF_MONTH,-1);
+        instance.add(Calendar.DAY_OF_MONTH, -1);
         Date time = instance.getTime();
         SimpleDateFormat format = new SimpleDateFormat(type);
         return format.format(time);
@@ -517,49 +519,51 @@ public class TDateUtil {
 
     /**
      * 间隔天数
+     *
      * @param startTime
      * @param endTime
      * @return
      */
-    public static int isolateDayNum(String startTime, String endTime){
+    public static int isolateDayNum(String startTime, String endTime) {
         Date startDate = getDate(startTime, "yyyy-MM-dd");
         Date endDate = getDate(endTime, "yyyy-MM-dd");
         long differentMillis = endDate.getTime() - startDate.getTime();
-        long dayNum = differentMillis/(1000*60*60*24);
-        return (int)dayNum;
+        long dayNum = differentMillis / (1000 * 60 * 60 * 24);
+        return (int) dayNum;
     }
 
     /**
      * 获取某月最后一天的时间
+     *
      * @param yearMonth
      * @return
      */
-    public static String getLastDateTimeOfMonth(String yearMonth){
+    public static String getLastDateTimeOfMonth(String yearMonth) {
         SimpleDateFormat format0 = new SimpleDateFormat("yyyy-MM");
         SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar instance = Calendar.getInstance();
         try {
             Date parse = format0.parse(yearMonth);
             instance.setTime(parse);
-            instance.set(Calendar.DAY_OF_MONTH,  instance.getActualMaximum(Calendar.DAY_OF_MONTH));
+            instance.set(Calendar.DAY_OF_MONTH, instance.getActualMaximum(Calendar.DAY_OF_MONTH));
             instance.set(Calendar.HOUR_OF_DAY, 23);
             instance.set(Calendar.MINUTE, 59);
             instance.set(Calendar.SECOND, 59);
             String format = format1.format(instance.getTime());
             return format;
-        } catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
     }
 
-    public static Date getStrToDate(String str){
+    public static Date getStrToDate(String str) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
         Date date = null;
         try {
-            if (str==null){
+            if (str == null) {
                 date = null;
-            }else {
+            } else {
                 date = dateFormat.parse(str);
             }
         } catch (ParseException e) {
@@ -568,7 +572,7 @@ public class TDateUtil {
         return date;
     }
 
-    public static int getStageByDate(Date date){
+    public static int getStageByDate(Date date) {
         Calendar instance = Calendar.getInstance();
         instance.setTime(date);
         //当前时间
@@ -584,22 +588,22 @@ public class TDateUtil {
             Date parse4 = dateFormat.parse("00:00:00");
 
             //A:05:00-11:00 | B:11:00-17:00 | C:00:00-05:00,17:00-00:00
-            if (currentTime.after(parse4) && currentTime.before(parse1) ) {
+            if (currentTime.after(parse4) && currentTime.before(parse1)) {
                 return 3;
-            }else if (currentTime.after(parse1) && currentTime.before(parse2)) {
+            } else if (currentTime.after(parse1) && currentTime.before(parse2)) {
                 return 1;
-            }else if(currentTime.after(parse2) && currentTime.before(parse3)){
+            } else if (currentTime.after(parse2) && currentTime.before(parse3)) {
                 return 2;
-            }else if(currentTime.after(parse3) && currentTime.after(parse4)){
+            } else if (currentTime.after(parse3) && currentTime.after(parse4)) {
                 return 4;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return 0;
     }
 
-    public static String getCurrentYear(){
+    public static String getCurrentYear() {
         Calendar date = Calendar.getInstance();
         String year = String.valueOf(date.get(Calendar.YEAR));
         return year;

src/main/java/com/mmc/oms/controller/BaseController.java

@@ -5,8 +5,8 @@ import com.mmc.oms.common.AuthHandler;
 import com.mmc.oms.common.BizException;
 import com.mmc.oms.common.ResultEnum;
 import com.mmc.oms.jwt.JwtConstant;
-import com.mmc.oms.model.dto.BaseAccountDTO;
-import com.mmc.oms.model.dto.CurrentUserDTO;
+import com.mmc.oms.model.dto.user.BaseAccountDTO;
+import com.mmc.oms.model.dto.user.CurrentUserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -25,6 +25,7 @@ public abstract class BaseController {
 
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
+
     /**
      * 获取当前用户
      *
@@ -44,10 +45,10 @@ public abstract class BaseController {
     public BaseAccountDTO getCurrentAccount(HttpServletRequest request) {
         String token = request.getHeader("token");
         String json = stringRedisTemplate.opsForValue().get(token);
-        if (StringUtils.isBlank(json)){
+        if (StringUtils.isBlank(json)) {
             throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
         }
-        BaseAccountDTO baseAccountDTO= JSONObject.parseObject(json, BaseAccountDTO.class);
+        BaseAccountDTO baseAccountDTO = JSONObject.parseObject(json, BaseAccountDTO.class);
         return baseAccountDTO;
     }
 

src/main/java/com/mmc/oms/controller/CouponBackController.java

 package com.mmc.oms.controller;
 
-import com.mmc.oms.common.*;
-import com.mmc.oms.model.dto.CouponActivityDTO;
-import com.mmc.oms.model.dto.CouponDTO;
-import com.mmc.oms.model.dto.CouponUserDTO;
-import com.mmc.oms.model.dto.CouponViewDTO;
+import com.mmc.oms.common.publicinterface.*;
+import com.mmc.oms.common.result.PageResult;
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.dto.coupon.CouponActivityDTO;
+import com.mmc.oms.model.dto.coupon.CouponDTO;
+import com.mmc.oms.model.dto.coupon.CouponUserDTO;
+import com.mmc.oms.model.dto.coupon.CouponViewDTO;
 import com.mmc.oms.model.qo.CouponInfoQO;
 import com.mmc.oms.model.qo.CouponUserInfoQO;
 import com.mmc.oms.model.qo.ProductCouponQO;
-import com.mmc.oms.model.vo.CouponInfoActivityVO;
-import com.mmc.oms.model.vo.CouponInfoVO;
+import com.mmc.oms.model.vo.coupon.CouponInfoActivityVO;
+import com.mmc.oms.model.vo.coupon.CouponInfoVO;
 import com.mmc.oms.service.CouponBackService;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;
@@ -36,17 +38,17 @@ public class CouponBackController {
 
 
     @ApiOperation(value = "V1.0.1--新增优惠券")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/save")
-    public ResultBody<CouponDTO> saveCouponInfo(@RequestParam(value = "file",required = false) MultipartFile file
-            , @RequestBody CouponInfoVO couponInfoVO){
-        return couponBackService.saveCouponBackInfo(couponInfoVO,file);
+    public ResultBody<CouponDTO> saveCouponInfo(@RequestParam(value = "file", required = false) MultipartFile file
+            , @RequestBody CouponInfoVO couponInfoVO) {
+        return couponBackService.saveCouponBackInfo(couponInfoVO, file);
     }
 
     @ApiOperation(value = "V1.0.1--新增裂变优惠券")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK")})
+    @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @PostMapping("/saveActivity")
-    public ResultBody saveActivityCouponInfo(@Validated(Insert.class) @RequestBody CouponInfoActivityVO couponInfoActivityVO){
+    public ResultBody saveActivityCouponInfo(@Validated(Insert.class) @RequestBody CouponInfoActivityVO couponInfoActivityVO) {
         return couponBackService.saveActivityCouponInfo(couponInfoActivityVO);
     }
 
@@ -70,7 +72,7 @@ public class CouponBackController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
     @GetMapping("/getActivityCouponPullDown")
     public ResultBody<CouponActivityDTO> getActivityCouponPullDown(@ApiParam(value = "活动类型: 1裂变活动 2普通活动", required = true)
-                                                @RequestParam(required = true, value = "type") Integer type) {
+                                                                   @RequestParam(required = true, value = "type") Integer type) {
         return couponBackService.getActivityCouponPullDown(type);
     }
 
@@ -81,7 +83,7 @@ public class CouponBackController {
                                      @ApiParam(value = "id", required = true)
                                      @RequestParam(required = true, value = "id") Integer id,
                                      @ApiParam(value = "数量", required = true)
-                                     @RequestParam(required = true, value = "count") Integer count){
+                                     @RequestParam(required = true, value = "count") Integer count) {
         return couponBackService.increaseCouponCount(id, count);
     }
 
@@ -90,24 +92,24 @@ public class CouponBackController {
     @PostMapping("/shutDown")
     public ResultBody shutDown(@Validated(Update.class)
                                @ApiParam(value = "id", required = true)
-                               @RequestParam(required = true, value = "id") Integer id){
+                               @RequestParam(required = true, value = "id") Integer id) {
         return couponBackService.shutDown(id);
     }
 
 
     @ApiOperation(value = "V1.0.1--获取优惠券使用数据")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK",response = CouponViewDTO.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponViewDTO.class)})
     @GetMapping("/getData")
     public ResultBody<CouponViewDTO> getViewData(@Validated(Query.class)
-                                  @ApiParam(value = "id", required = true)
-                                  @RequestParam(required = true, value = "id") Integer id){
+                                                 @ApiParam(value = "id", required = true)
+                                                 @RequestParam(required = true, value = "id") Integer id) {
         return couponBackService.couponViewData(id);
     }
 
     @ApiOperation(value = "V1.0.1--获取优惠券明细列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)})
     @PostMapping("/getUserCouponList")
-    public ResultBody<CouponUserDTO> getCouponUserList(@Validated(Page.class) @RequestBody CouponUserInfoQO couponUserInfoQO){
+    public ResultBody<CouponUserDTO> getCouponUserList(@Validated(Page.class) @RequestBody CouponUserInfoQO couponUserInfoQO) {
         return couponBackService.getCouponUserList(couponUserInfoQO);
     }
 
@@ -115,59 +117,60 @@ public class CouponBackController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @PostMapping("/downloadCouponUserList")
     public void downloadCouponUserList(@Validated(value = {Others.class}) @RequestBody CouponUserInfoQO couponUserInfoQO,
-                                       HttpServletResponse response){
+                                       HttpServletResponse response) {
         try {
-            couponBackService.downloadCouponUserList(response,couponUserInfoQO);
+            couponBackService.downloadCouponUserList(response, couponUserInfoQO);
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    @ApiOperation(value = "feign-获取优惠券详情",hidden = true)
+    @ApiOperation(value = "feign-获取优惠券详情", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @GetMapping("/feignByIds")
-    public List<CouponDTO> feignByIds(@RequestParam List<Integer> ids){
+    public List<CouponDTO> feignByIds(@RequestParam List<Integer> ids) {
         return couponBackService.feignByIds(ids);
     }
 
-    @ApiOperation(value = "feign-获取裂变优惠券详情",hidden = true)
+    @ApiOperation(value = "feign-获取裂变优惠券详情", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
     @GetMapping("/feignGetActivity")
     public CouponActivityDTO feignGetCouponActivityById(@RequestParam Integer id) {
         return couponBackService.getCouponActivityById(id);
     }
 
-    @ApiOperation(value = "feign-获取裂变优惠券详情-批量",hidden = true)
+    @ApiOperation(value = "feign-获取裂变优惠券详情-批量", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponActivityDTO.class)})
     @PostMapping("/feignGetActivityList")
     public List<CouponActivityDTO> feignGetCouponActivityByList(@RequestBody List<Integer> id) {
         return couponBackService.getCouponActivityList(id);
     }
 
-    @ApiOperation(value = "feign-优惠券定时修改状态",hidden = true)
+    @ApiOperation(value = "feign-优惠券定时修改状态", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @GetMapping("/feignExpireCoupon")
     public void feignExpireCoupon() {
         couponBackService.overdueCouponTask();
     }
 
-    @ApiOperation(value = "feign-根据用户标签获取对应优惠券",hidden = true)
+    @ApiOperation(value = "feign-根据用户标签获取对应优惠券", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @GetMapping("/feignGetCouponType")
-    public List<CouponDTO>  feignGetCouponType(@RequestParam Integer type) {
+    public List<CouponDTO> feignGetCouponType(@RequestParam Integer type) {
         return couponBackService.feignGetCouponType(type);
     }
 
     @ApiOperation(value = "V2.3.2——商品优惠券普通活动列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/ordinaryActivities")
-    public ResultBody<PageResult<CouponDTO>>  ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
+    public ResultBody<PageResult<CouponDTO>> ordinaryActivities(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
         return couponBackService.ordinaryActivities(productCouponQO);
     }
+
     @ApiOperation(value = "V2.3.2——商品优惠券裂变活动列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponDTO.class)})
     @PostMapping("/fissionActivity")
-    public ResultBody<PageResult<PageResult>>  fissionActivity(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
+    public ResultBody<PageResult<PageResult>> fissionActivity(@Validated(Page.class) @RequestBody ProductCouponQO productCouponQO) {
         return couponBackService.fissionActivity(productCouponQO);
     }
 }

src/main/java/com/mmc/oms/controller/CouponUserController.java

 package com.mmc.oms.controller;
 
-import com.mmc.oms.common.ResultBody;
-import com.mmc.oms.common.Update;
-import com.mmc.oms.model.dto.*;
-import com.mmc.oms.model.vo.CouponUserExchangeVO;
-import com.mmc.oms.model.vo.CouponUserVO;
+import com.mmc.oms.common.publicinterface.Update;
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.dto.coupon.CouponListDTO;
+import com.mmc.oms.model.dto.coupon.CouponUsageDetailsDTO;
+import com.mmc.oms.model.dto.coupon.CouponUserDTO;
+import com.mmc.oms.model.dto.coupon.CouponUserOrderDTO;
+import com.mmc.oms.model.dto.goods.AppGoodsInfoDTO;
+import com.mmc.oms.model.dto.order.OrderCouponDTO;
+import com.mmc.oms.model.dto.user.BaseAccountDTO;
+import com.mmc.oms.model.vo.coupon.CouponUserExchangeVO;
+import com.mmc.oms.model.vo.coupon.CouponUserVO;
 import com.mmc.oms.service.CouponUserService;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;
@@ -33,7 +39,7 @@ public class CouponUserController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserDTO.class)})
     @GetMapping("/checkMyCoupon")
     public ResultBody getMyCoupon(@ApiParam(value = "状态 1：已使用, 2:已失效，3:已转赠")
-                                  @RequestParam(value = "status",required = false) Integer status,
+                                  @RequestParam(value = "status", required = false) Integer status,
                                   @ApiParam(value = "页码", required = true)
                                   @RequestParam(value = "pageNo") Integer pageNo,
                                   @ApiParam(value = "每页显示数", required = true)
@@ -62,7 +68,7 @@ public class CouponUserController extends BaseController {
                                 @ApiParam(value = "用户uid", required = true)
                                 @RequestParam(value = "uid") String uid,
                                 HttpServletRequest request) {
-        return couponUserService.presentedCoupon(id, uid,this.getCurrentAccount(request));
+        return couponUserService.presentedCoupon(id, uid, this.getCurrentAccount(request));
     }
 
 
@@ -80,14 +86,14 @@ public class CouponUserController extends BaseController {
     }
 
 
-    @ApiOperation(value = "feign-根据订单品牌获取可用优惠券",hidden = true)
+    @ApiOperation(value = "feign-根据订单品牌获取可用优惠券", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUserOrderDTO.class)})
     @GetMapping("/feignCoupons")
     public List<CouponUserOrderDTO> couponByOrder(@ApiParam(value = "品牌id 搜索品牌指定优惠卷", required = true)
                                                   @RequestParam(value = "primaryKey") List<Integer> primaryKey,
                                                   @ApiParam(value = "用户id", required = true)
                                                   @RequestParam Integer uid) {
-        return couponUserService.getUsableCoupon(primaryKey,uid);
+        return couponUserService.getUsableCoupon(primaryKey, uid);
     }
 
 
@@ -113,7 +119,7 @@ public class CouponUserController extends BaseController {
         return couponUserService.feignExchangeCoupon(couponUserExchangeVO);
     }
 
-    @ApiOperation(value = "feign-领取优惠券",hidden = true)
+    @ApiOperation(value = "feign-领取优惠券", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @GetMapping("/feignReceive")
     public ResultBody feignReceive(@ApiParam(value = "优惠券id", required = true)
@@ -128,7 +134,7 @@ public class CouponUserController extends BaseController {
         return couponUserService.receiveCoupon(id, countDTO);
     }
 
-    @ApiOperation(value = "feign-根据优惠券id查询优惠券",hidden = true)
+    @ApiOperation(value = "feign-根据优惠券id查询优惠券", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @PostMapping("/feignListUserCouponsByIds")
     @ApiIgnore
@@ -144,14 +150,14 @@ public class CouponUserController extends BaseController {
         return couponUserService.feignOrderCoupon(orderId);
     }
 
-    @ApiOperation(value = "feign-优惠券定时过期",hidden = true)
+    @ApiOperation(value = "feign-优惠券定时过期", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @GetMapping("/feignExpire")
     public void feignExpire() {
         couponUserService.overdueTask();
     }
 
-    @ApiOperation(value = "feign-优惠券回退",hidden = true)
+    @ApiOperation(value = "feign-优惠券回退", hidden = true)
     @ApiResponses({@ApiResponse(code = 200, message = "OK")})
     @PostMapping("/feignRollbackCoupons")
     public Boolean feignRollbackCoupons(@RequestBody List<OrderCouponDTO> orderCouponDTOS) {
@@ -181,10 +187,10 @@ public class CouponUserController extends BaseController {
             @ApiImplicitParam(name = "useType", required = false, value = "1vip券, 2品牌券"),
     })
     @GetMapping("/couponMerchandise")
-    public ResultBody couponMerchandise(@RequestParam(value = "couponId",required = false) Integer couponId,
-                                        @RequestParam(value = "productName",required = false) String productName,
-                                        @RequestParam(value = "useType",required = false) Integer useType) {
-        return couponUserService.couponMerchandise(couponId,productName,useType);
+    public ResultBody couponMerchandise(@RequestParam(value = "couponId", required = false) Integer couponId,
+                                        @RequestParam(value = "productName", required = false) String productName,
+                                        @RequestParam(value = "useType", required = false) Integer useType) {
+        return couponUserService.couponMerchandise(couponId, productName, useType);
     }
 
     @ApiOperation(value = "V2.3.2-优惠券使用明细 ")
@@ -193,7 +199,7 @@ public class CouponUserController extends BaseController {
     })
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CouponUsageDetailsDTO.class)})
     @GetMapping("/couponUsageDetails")
-    public ResultBody couponUsageDetails(@RequestParam(value = "uid",required = true) Integer uid) {
+    public ResultBody couponUsageDetails(@RequestParam(value = "uid", required = true) Integer uid) {
         return couponUserService.couponUsageDetails(uid);
     }
 

src/main/java/com/mmc/oms/controller/OrderLogisticsController.java

 package com.mmc.oms.controller;
 
-import com.mmc.oms.common.ResultBody;
-import com.mmc.oms.model.dto.*;
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.dto.kdn.KdnDicDTO;
+import com.mmc.oms.model.dto.order.ExpressInfoDTO;
+import com.mmc.oms.model.dto.order.OrderInfoDTO;
+import com.mmc.oms.model.dto.order.OrderReceiptDTO;
+import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import com.mmc.oms.service.OrderLogisticsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/mmc/oms/controller/OrderRefundController.java

 package com.mmc.oms.controller;
 
-import com.mmc.oms.common.ResultBody;
-import com.mmc.oms.model.vo.OrderRefundVO;
-import com.mmc.oms.model.vo.RefundYesOrNoVO;
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.vo.order.OrderRefundVO;
+import com.mmc.oms.model.vo.order.RefundYesOrNoVO;
 import com.mmc.oms.service.OrderRefundService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

 package com.mmc.oms.controller;
 
-import com.mmc.oms.common.ResultBody;
-import com.mmc.oms.common.Send;
-import com.mmc.oms.common.Take;
-import com.mmc.oms.model.dto.OrderInfoDTO;
+import com.mmc.oms.common.publicinterface.Send;
+import com.mmc.oms.common.publicinterface.Take;
+import com.mmc.oms.common.result.ResultBody;
+import com.mmc.oms.model.dto.order.OrderInfoDTO;
 import com.mmc.oms.model.qo.OrderInfoQO;
-import com.mmc.oms.model.vo.LeaseOrderVO;
-import com.mmc.oms.model.vo.OrderStatusVO;
-import com.mmc.oms.model.vo.OrderVcuVO;
-import com.mmc.oms.model.vo.ReturnWareVO;
+import com.mmc.oms.model.vo.order.LeaseOrderVO;
+import com.mmc.oms.model.vo.order.OrderStatusVO;
+import com.mmc.oms.model.vo.order.OrderVcuVO;
+import com.mmc.oms.model.vo.order.ReturnWareVO;
 import com.mmc.oms.service.RentalOrdersService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +31,7 @@ public class RentalOrdersController extends BaseController {
     @ApiOperation(value = "租赁-下单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
     @PostMapping("feignAddLease")
-    public OrderInfoDTO feignAddLease(HttpServletRequest request, @RequestBody LeaseOrderVO param) {
+    public ResultBody<OrderInfoDTO> feignAddLease(HttpServletRequest request, @RequestBody LeaseOrderVO param) {
         return rentalOrdersService.feignAddLease(this.getCurrentAccount(request), param);
     }
 

src/main/java/com/mmc/oms/dao/CouponBackDao.java

 package com.mmc.oms.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mmc.oms.entity.CouponDO;
-import com.mmc.oms.entity.ProductInformationDo;
+import com.mmc.oms.entity.coupon.CouponDO;
+import com.mmc.oms.entity.order.ProductInformationDo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/mmc/oms/dao/CouponUserDao.java

 package com.mmc.oms.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mmc.oms.entity.CouponUsageDetailsDO;
-import com.mmc.oms.entity.CouponUserDO;
-import com.mmc.oms.entity.GoodsInfoDO;
-import com.mmc.oms.model.dto.CouponUserDTO;
+import com.mmc.oms.entity.coupon.CouponUsageDetailsDO;
+import com.mmc.oms.entity.coupon.CouponUserDO;
+import com.mmc.oms.entity.goods.GoodsInfoDO;
+import com.mmc.oms.model.dto.coupon.CouponUserDTO;
 import com.mmc.oms.model.qo.CouponUserInfoQO;
-import com.mmc.oms.model.vo.CouponUserVO;
+import com.mmc.oms.model.vo.coupon.CouponUserVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,7 +35,7 @@ public interface CouponUserDao extends BaseMapper<CouponUserDO> {
 
     List<Integer> merchandise(Integer couponId);
 
-    List<GoodsInfoDO> couponMerchandise(List<Integer> merchandise,String productName);
+    List<GoodsInfoDO> couponMerchandise(List<Integer> merchandise, String productName);
 
     List<CouponUsageDetailsDO> couponUsageDetails(Integer uid);
 

src/main/java/com/mmc/oms/dao/OrderLogisticsDao.java

 package com.mmc.oms.dao;
 
-import com.mmc.oms.entity.*;
+import com.mmc.oms.entity.order.*;
+import com.mmc.oms.entity.transtatus.TranStatusDicDO;
 import com.mmc.oms.model.qo.OrderInfoQO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,7 +47,7 @@ public interface OrderLogisticsDao {
 
     List<OrderInfoDO> listPcOrderInfo(OrderInfoQO param);
 
-    int countOrderInfo(String tranStatus,List<Integer> companys);
+    int countOrderInfo(String tranStatus, List<Integer> companys);
 
     List<ExpressInfoDO> listExpressInfo();
 
@@ -68,5 +69,5 @@ public interface OrderLogisticsDao {
 
     Integer getOrderInfoCountToYesterday(@Param("day") Integer day, @Param("date") Date date);
 
-    Integer getOrderInfoCount(@Param("day") Integer day,@Param("date")Date date);
+    Integer getOrderInfoCount(@Param("day") Integer day, @Param("date") Date date);
 }

src/main/java/com/mmc/oms/dao/OrderRefundDao.java

 package com.mmc.oms.dao;
 
-import com.mmc.oms.entity.OrderRefundDO;
-import com.mmc.oms.entity.OrderVcuDO;
+import com.mmc.oms.entity.order.OrderRefundDO;
+import com.mmc.oms.entity.order.OrderVcuDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

 package com.mmc.oms.dao;
 
-import com.mmc.oms.entity.*;
+import com.mmc.oms.entity.coupon.CouponDO;
+import com.mmc.oms.entity.coupon.CouponUserDO;
+import com.mmc.oms.entity.order.*;
 import com.mmc.oms.model.qo.OrderInfoQO;
-import com.mmc.oms.model.vo.OrderStatusVO;
+import com.mmc.oms.model.vo.order.OrderStatusVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/mmc/oms/entity/ChannelCouponDO.java → src/main/java/com/mmc/oms/entity/coupon/ChannelCouponDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.coupon;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/com/mmc/oms/entity/CouponDO.java → src/main/java/com/mmc/oms/entity/coupon/CouponDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.coupon;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.mmc.oms.common.CouponConstants;
-import com.mmc.oms.model.dto.CouponActivityDTO;
-import com.mmc.oms.model.dto.CouponDTO;
-import com.mmc.oms.model.dto.CouponListDTO;
-import com.mmc.oms.model.vo.CouponInfoActivityVO;
-import com.mmc.oms.model.vo.CouponInfoVO;
+import com.mmc.oms.common.coupon.CouponConstants;
+import com.mmc.oms.model.dto.coupon.CouponActivityDTO;
+import com.mmc.oms.model.dto.coupon.CouponDTO;
+import com.mmc.oms.model.dto.coupon.CouponListDTO;
+import com.mmc.oms.model.vo.coupon.CouponInfoActivityVO;
+import com.mmc.oms.model.vo.coupon.CouponInfoVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,13 +27,13 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("coupon")
-@ApiModel(value="Coupon对象", description="优惠券表")
+@ApiModel(value = "Coupon对象", description = "优惠券表")
 public class CouponDO implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "优惠券ID")
-    @TableId(value = "id",type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty(value = "优惠券名称")
@@ -109,7 +109,7 @@ public class CouponDO implements Serializable {
     @ApiModelProperty(value = "是否多次核销 0单次核销 1多次核销")
     private Boolean verificationType;
 
-    @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "create_time", fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -120,15 +120,14 @@ public class CouponDO implements Serializable {
     private Integer parentId;
 
     @ApiModelProperty(value = "分享者-分享人数")
-    private Integer peopleNumber ;
+    private Integer peopleNumber;
 
     @ApiModelProperty(value = "批量导入文件url")
-    private String fileUrl ;
+    private String fileUrl;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "已领取的数量")
-    private String quantityClaimed ;
-
+    private String quantityClaimed;
 
 
     public CouponDTO bilIdCouponDTO() {
@@ -190,7 +189,7 @@ public class CouponDO implements Serializable {
     }
 
     @Tolerate
-    public CouponDO(CouponInfoActivityVO couponInfoActivityVO){
+    public CouponDO(CouponInfoActivityVO couponInfoActivityVO) {
         this.couponName = couponInfoActivityVO.getCouponName();
         this.useType = couponInfoActivityVO.getUseType();
         this.primaryKey = couponInfoActivityVO.getPrimaryKey();
@@ -212,7 +211,7 @@ public class CouponDO implements Serializable {
     }
 
     @Tolerate
-    public CouponDO(CouponInfoActivityVO couponInfoActivityVO, Integer type){
+    public CouponDO(CouponInfoActivityVO couponInfoActivityVO, Integer type) {
         this.couponName = couponInfoActivityVO.getCouponName();
         this.useType = couponInfoActivityVO.getBeSharedUseType();
         this.primaryKey = couponInfoActivityVO.getBeSharedPrimaryKey();

src/main/java/com/mmc/oms/entity/CouponUsageDetailsDO.java → src/main/java/com/mmc/oms/entity/coupon/CouponUsageDetailsDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.coupon;
 
-import com.mmc.oms.model.dto.CouponUsageDetailsDTO;
+import com.mmc.oms.model.dto.coupon.CouponUsageDetailsDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/mmc/oms/entity/CouponUserDO.java → src/main/java/com/mmc/oms/entity/coupon/CouponUserDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.coupon;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.mmc.oms.common.CouponConstants;
-import com.mmc.oms.model.dto.CouponUserDTO;
-import com.mmc.oms.model.dto.CouponUserOrderDTO;
-import com.mmc.oms.model.vo.CouponUserExchangeVO;
-import com.mmc.oms.model.vo.CouponUserVO;
-import io.swagger.annotations.ApiModel;
+import com.mmc.oms.common.coupon.CouponConstants;
+import com.mmc.oms.model.dto.coupon.CouponUserDTO;
+import com.mmc.oms.model.dto.coupon.CouponUserOrderDTO;
+import com.mmc.oms.model.vo.coupon.CouponUserExchangeVO;
+import com.mmc.oms.model.vo.coupon.CouponUserVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/mmc/oms/entity/GoodsInfoDO.java → src/main/java/com/mmc/oms/entity/goods/GoodsInfoDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.goods;
 
-import com.mmc.oms.model.dto.AppGoodsInfoDTO;
-import com.mmc.oms.model.dto.GoodsInfoListDTO;
-import com.mmc.oms.model.dto.GoodsRcdDTO;
-import com.mmc.oms.model.dto.TypeGoodsInfoDTO;
-import com.mmc.oms.model.vo.CategoryParamAndValueVO;
-import com.mmc.oms.model.vo.GoodsAddVO;
-import com.mmc.oms.model.vo.MallGoodsAddVO;
+import com.mmc.oms.model.dto.goods.AppGoodsInfoDTO;
+import com.mmc.oms.model.dto.goods.GoodsInfoListDTO;
+import com.mmc.oms.model.dto.goods.GoodsRcdDTO;
+import com.mmc.oms.model.dto.goods.TypeGoodsInfoDTO;
+import com.mmc.oms.model.vo.category.CategoryParamAndValueVO;
+import com.mmc.oms.model.vo.goods.GoodsAddVO;
+import com.mmc.oms.model.vo.goods.MallGoodsAddVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -68,6 +68,7 @@ public class GoodsInfoDO implements Serializable {
     // private GoodsConfigExportDO goodsConfigExport;// 功能清单
     private Integer buyNum;// 购买数量
     private String directoryName;
+
     /**
      * 辅助字段-end
      */

src/main/java/com/mmc/oms/entity/ExpressInfoDO.java → src/main/java/com/mmc/oms/entity/order/ExpressInfoDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.ExpressInfoDTO;
+import com.mmc.oms.model.dto.order.ExpressInfoDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/oms/entity/KdnDicDO.java → src/main/java/com/mmc/oms/entity/order/KdnDicDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.KdnDicDTO;
+import com.mmc.oms.model.dto.kdn.KdnDicDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/oms/entity/OrderReceiptDO.java → src/main/java/com/mmc/oms/entity/order/OrderReceiptDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.OrderReceiptDTO;
-import com.mmc.oms.model.vo.OrderReceiptVO;
+import com.mmc.oms.model.dto.order.OrderReceiptDTO;
+import com.mmc.oms.model.vo.order.OrderReceiptVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,69 +18,69 @@ import java.util.Date;
 @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 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 String renRepoName;
+    private String renRepoAddr;
+    private String renRepoPhone;
 
-  private Date createTime;
+    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 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();
-  }
+    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/oms/entity/OrderRefundDO.java → src/main/java/com/mmc/oms/entity/order/OrderRefundDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.OrderRefundDTO;
+import com.mmc.oms.model.dto.order.OrderRefundDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/oms/entity/OrderStatusDO.java → src/main/java/com/mmc/oms/entity/order/OrderStatusDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.OrderStatusDTO;
+import com.mmc.oms.model.dto.order.OrderStatusDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/oms/entity/OrderVcuDO.java → src/main/java/com/mmc/oms/entity/order/OrderVcuDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.OrderVcuDTO;
+import com.mmc.oms.model.dto.order.OrderVcuDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/oms/entity/ProductInformationDo.java → src/main/java/com/mmc/oms/entity/order/ProductInformationDo.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

src/main/java/com/mmc/oms/entity/RepoCashDO.java → src/main/java/com/mmc/oms/entity/order/RepoCashDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.order;
 
-import com.mmc.oms.model.dto.RepoCashDTO;
+import com.mmc.oms.model.dto.repo.RepoCashDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,53 +20,53 @@ import java.util.Date;
 @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;
+    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();
-  }
+    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/oms/entity/TranStatusDicDO.java → src/main/java/com/mmc/oms/entity/transtatus/TranStatusDicDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.transtatus;
 
-import com.mmc.oms.model.dto.TranStatusDicDTO;
+import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/oms/entity/WareImgDO.java → src/main/java/com/mmc/oms/entity/ware/WareImgDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.ware;
 
-import com.mmc.oms.model.dto.WareImgDTO;
-import com.mmc.oms.model.vo.WareImgVO;
+import com.mmc.oms.model.dto.ware.WareImgDTO;
+import com.mmc.oms.model.vo.ware.WareImgVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,26 +16,26 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class WareImgDO implements Serializable {
-  private static final long serialVersionUID = -1711990559893951800L;
-  private Integer id;
-  private Integer wareInfoId;
-  private String imgUrl;
-  private Integer imgType;
-  private Integer deleted;
-  private Date createTime;
+    private static final long serialVersionUID = -1711990559893951800L;
+    private Integer id;
+    private Integer wareInfoId;
+    private String imgUrl;
+    private Integer imgType;
+    private Integer deleted;
+    private Date createTime;
 
-  public WareImgDTO buildWareImgDTO() {
-    return WareImgDTO.builder()
-        .id(this.id)
-        .wareInfoId(this.wareInfoId)
-        .imgType(this.imgType)
-        .imgUrl(this.imgUrl)
-        .build();
-  }
+    public WareImgDTO buildWareImgDTO() {
+        return WareImgDTO.builder()
+                .id(this.id)
+                .wareInfoId(this.wareInfoId)
+                .imgType(this.imgType)
+                .imgUrl(this.imgUrl)
+                .build();
+    }
 
-  public WareImgDO(WareImgVO d) {
-    this.id = d.getId();
-    this.imgUrl = d.getImgUrl();
-    this.imgType = d.getImgType();
-  }
+    public WareImgDO(WareImgVO d) {
+        this.id = d.getId();
+        this.imgUrl = d.getImgUrl();
+        this.imgType = d.getImgType();
+    }
 }

src/main/java/com/mmc/oms/entity/WarePropDO.java → src/main/java/com/mmc/oms/entity/ware/WarePropDO.java

-package com.mmc.oms.entity;
+package com.mmc.oms.entity.ware;
 
-import com.mmc.oms.model.dto.WarePropDTO;
+import com.mmc.oms.model.dto.ware.WarePropDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,7 +24,7 @@ public class WarePropDO implements Serializable {
     private String propPoster;
     private Date createTime;
 
-    public WarePropDTO buildWarePropDTO(){
+    public WarePropDTO buildWarePropDTO() {
         return WarePropDTO.builder().id(this.id).wareInfoId(this.wareInfoId).propInfoId(this.propInfoId).propPoster(this.propPoster).createTime(this.createTime).build();
     }
 }

src/main/java/com/mmc/oms/filter/AuthSignatureFilter.java

 package com.mmc.oms.filter;
 
 import com.alibaba.fastjson2.JSON;
-import com.mmc.oms.common.ResultBody;
 import com.mmc.oms.common.ResultEnum;
 import com.mmc.oms.common.Tenant;
+import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.config.Audience;
 import com.mmc.oms.config.TenantContext;
-import com.mmc.oms.model.dto.UserAccountDTO;
+import com.mmc.oms.model.dto.user.UserAccountDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mmc/oms/model/dto/CompanyCacheDTO.java → src/main/java/com/mmc/oms/model/dto/company/CompanyCacheDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.company;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -23,8 +23,8 @@ public class CompanyCacheDTO implements Serializable {
     private Integer id;
     @ApiModelProperty(value = "单位名称")
     private String company;
-    @ApiModelProperty(value = "是否为管理单位：0否 1是",hidden = true)
+    @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
     private Integer manage;
-    @ApiModelProperty(value = "当前单位ID+子级单位ID的集合",hidden = true)
+    @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
     private List<Integer> companys;
 }

src/main/java/com/mmc/oms/model/dto/CompanyInfoDTO.java → src/main/java/com/mmc/oms/model/dto/company/CompanyInfoDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.company;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/oms/model/dto/CompanySimpleDTO.java → src/main/java/com/mmc/oms/model/dto/company/CompanySimpleDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.company;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -28,8 +27,8 @@ public class CompanySimpleDTO implements Serializable {
     private String company;
     @ApiModelProperty(value = "账号类型:0合伙人 1员工")
     private Integer userType;
-    @ApiModelProperty(value = "是否为管理单位：0否 1是",hidden = true)
+    @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
     private Integer manage;
-    @ApiModelProperty(value = "当前单位ID+子级单位ID的集合",hidden = true)
+    @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
     private List<Integer> companys;
 }

src/main/java/com/mmc/oms/model/dto/CouponActivityDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponActivityDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import lombok.experimental.Accessors;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -24,7 +25,7 @@ import java.util.Date;
 public class CouponActivityDTO implements Serializable {
 
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "优惠券ID")
     private Integer id;

src/main/java/com/mmc/oms/model/dto/CouponDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -24,7 +23,7 @@ import java.util.Date;
 public class CouponDTO implements Serializable {
 
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "优惠券ID")
     private Integer id;
@@ -102,5 +101,5 @@ public class CouponDTO implements Serializable {
     private String fileUrl;
 
     @ApiModelProperty(value = "已领取的数量")
-    private String quantityClaimed ;
+    private String quantityClaimed;
 }

src/main/java/com/mmc/oms/model/dto/CouponListDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponListDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -23,7 +22,7 @@ import java.util.Date;
 //@ApiModel(value="CouponList对象", description="小程序优惠券表")
 public class CouponListDTO implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "优惠券ID")
     private Integer id;

src/main/java/com/mmc/oms/model/dto/CouponUsageDetailsDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponUsageDetailsDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/CouponUserDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponUserDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
 import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-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;
@@ -36,7 +34,7 @@ public class CouponUserDTO implements Serializable {
     @ApiModelProperty(value = "优惠券id")
     private Integer couponId;
 
-    @JsonSerialize(using= ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "订单id")
     private Long cid;
 

src/main/java/com/mmc/oms/model/dto/CouponUserOrderDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponUserOrderDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -24,7 +23,7 @@ import java.util.List;
 @AllArgsConstructor
 public class CouponUserOrderDTO implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "id")
     private Integer id;

src/main/java/com/mmc/oms/model/dto/CouponViewDTO.java → src/main/java/com/mmc/oms/model/dto/coupon/CouponViewDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.coupon;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,7 +14,7 @@ import java.io.Serializable;
 //@ApiModel(value="用户优惠券使用数据", description="用户优惠券使用数据DTO")
 public class CouponViewDTO implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "总发行量")
     private Integer couponTotal;

src/main/java/com/mmc/oms/model/dto/FlyerAccountDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerAccountDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.flyer;
 
 import com.mmc.oms.common.FlyerAccountType;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/FlyerEntInfoDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerEntInfoDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.flyer;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/FlyerOrderTaskDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerOrderTaskDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.flyer;
 
+import com.mmc.oms.model.dto.order.OrderTaskDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/oms/model/dto/FlyerScenesAuthDTO.java → src/main/java/com/mmc/oms/model/dto/flyer/FlyerScenesAuthDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.flyer;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/oms/model/dto/AppGoodsInfoDTO.java → src/main/java/com/mmc/oms/model/dto/goods/AppGoodsInfoDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.goods;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/GoodsInfoListDTO.java → src/main/java/com/mmc/oms/model/dto/goods/GoodsInfoListDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.goods;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/GoodsRcdDTO.java → src/main/java/com/mmc/oms/model/dto/goods/GoodsRcdDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.goods;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/TypeGoodsInfoDTO.java → src/main/java/com/mmc/oms/model/dto/goods/TypeGoodsInfoDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.goods;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/KdnDicDTO.java → src/main/java/com/mmc/oms/model/dto/kdn/KdnDicDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.kdn;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/KdnExpDTO.java → src/main/java/com/mmc/oms/model/dto/kdn/KdnExpDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.kdn;
 
-import io.swagger.annotations.ApiModel;
+import com.mmc.oms.model.dto.order.ExpStationsDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/CountOrderDTO.java → src/main/java/com/mmc/oms/model/dto/order/CountOrderDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/ExpStationsDTO.java → src/main/java/com/mmc/oms/model/dto/order/ExpStationsDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/oms/model/dto/ExpressInfoDTO.java → src/main/java/com/mmc/oms/model/dto/order/ExpressInfoDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/OrderCouponDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderCouponDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/OrderInfoDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderInfoDTO.java

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

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

src/main/java/com/mmc/oms/model/dto/OrderRefundDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderRefundDTO.java

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

src/main/java/com/mmc/oms/model/dto/OrderStatusDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderStatusDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/oms/model/dto/OrderTaskDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderTaskDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
+import com.mmc.oms.model.dto.flyer.FlyerAccountDTO;
+import com.mmc.oms.model.dto.flyer.FlyerOrderTaskDTO;
+import com.mmc.oms.model.dto.user.UserAccountDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -140,7 +143,7 @@ public class OrderTaskDTO implements Serializable {
     @ApiModelProperty(value = "平台上传附件预览效果")
     private String platformPreview;
     @ApiModelProperty(value = "文案描述")
-    private String  copywriting;
+    private String copywriting;
     @ApiModelProperty(value = "子任务列表")
     private List<OrderTaskDTO> children;
     @ApiModelProperty(value = "子订单信息")
@@ -160,7 +163,7 @@ public class OrderTaskDTO implements Serializable {
         this.userPhoneNum = wx.getPhoneNum();
     }
 
-    public FlyerOrderTaskDTO buildFlyerOrderTaskDTO(){
+    public FlyerOrderTaskDTO buildFlyerOrderTaskDTO() {
         return FlyerOrderTaskDTO.builder().orderId(this.id).orderNo(this.orderNo).orderName(this.orderName).build();
     }
 }

src/main/java/com/mmc/oms/model/dto/OrderTaskSonDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderTaskSonDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/oms/model/dto/OrderVcuDTO.java → src/main/java/com/mmc/oms/model/dto/order/OrderVcuDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/PayCashResultDTO.java → src/main/java/com/mmc/oms/model/dto/order/PayCashResultDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/RefundLogDTO.java → src/main/java/com/mmc/oms/model/dto/order/RefundLogDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/ShareOrderDTO.java → src/main/java/com/mmc/oms/model/dto/order/ShareOrderDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/oms/model/dto/SkuOrderDTO.java → src/main/java/com/mmc/oms/model/dto/order/SkuOrderDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/oms/model/dto/TaskFlyerCostDTO.java → src/main/java/com/mmc/oms/model/dto/order/TaskFlyerCostDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.order;
 
-import io.swagger.annotations.ApiModel;
+import com.mmc.oms.model.dto.ware.WagTermDetailDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -92,7 +92,7 @@ public class TaskFlyerCostDTO implements Serializable {
             this.payPersent = BigDecimal.ZERO;
         }
 
-        if(this.hotSudy == null) {
+        if (this.hotSudy == null) {
             this.hotSudy = BigDecimal.ZERO;
         }
     }

src/main/java/com/mmc/oms/model/dto/RepoAccountDTO.java → src/main/java/com/mmc/oms/model/dto/repo/RepoAccountDTO.java

-package com.mmc.oms.model.dto;
+package com.mmc.oms.model.dto.repo;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;