交换单

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/ItemController.java

@@ -102,11 +102,11 @@ public class ItemController {
         return result;
     }
 
-
+/*
 //    @GetMapping("/updateUrl")
-    public void syn() {
+  //  public void syn() {
         synCoinJob.updateImageUrlOfsSize();
-    }
+    }*/
 
 
     @GetMapping("/synToEs")

ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynCoinJob.java

@@ -7,11 +7,14 @@ import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.db.dao.CategoryDao;
 import com.wwdz.ch.db.dao.CoinsDao;
 import com.wwdz.ch.db.dao.ItemDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.Coins;
 import com.wwdz.ch.db.domain.Item;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.CategorySearchRequestDto;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.wwdz.ch.db.es.ItemEsDao;
 import com.xxdxxs.utils.CommonUtils;
 import com.xxdxxs.utils.StringUtils;
@@ -43,7 +46,7 @@ public class SynCoinJob {
     private String SYN_NEPHRITE_TO_ES_TASK_KEY = "SYN_NEPHRITE_TO_ES_TASK_KEY";
 
     @Autowired
-    ItemDao itemDao;
+    SupplierItemDao supplierItemDao;
 
     @Autowired
     CoinsDao coinsDao;
@@ -64,13 +67,13 @@ public class SynCoinJob {
     CategoryDao categoryDao;
 
 
-    public void execute() {
+    /*public void execute() {
         logger.info(">>>>>>>>>>>>>>>>>>>>>>> 同步coins表数据到item表, 开始执行 <<<<<<<<<<<<<<<<<<<<<");
         try {
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setPage(1);
             coinRequestDto.setLimit(100);
-            PageInfo<Item> pageInfo = itemDao.findPageExcludeFilter(coinRequestDto);
+            PageInfo<Item> pageInfo = supplierItemDao.findPageExcludeFilter(coinRequestDto);
             int totalPageNum = pageInfo.getPages();
             logger.info("total page : {}, total : {}", totalPageNum, pageInfo.getTotal());
                 IntStream.rangeClosed(1, totalPageNum).parallel().forEach(i -> {
@@ -171,13 +174,13 @@ public class SynCoinJob {
 
     }
 
-    /**
+    *//**
      * 将BufferedImage转换为InputStream
      *
      * @param image 数据源
      * @param type  图片格式
      * @return
-     */
+     *//*
     private static InputStream bufferedImageToInputStream(BufferedImage image, String type) {
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             ImageIO.write(image, type, os);
@@ -189,47 +192,12 @@ public class SynCoinJob {
     }
 
 
-    public void synItemToEs() {
-        RLock lock = redissonClient.getLock(SYN_NEPHRITE_TO_ES_TASK_KEY);
-        if (!lock.tryLock()) {
-            logger.warn("当前服务实例: {} 获取锁失败，锁被占用, 不允许执行同步和田玉数据到ES作业",  Thread.currentThread().getId());
-            return;
-        }
-        try {
-            ExecutorService executorService = Executors.newFixedThreadPool(10);
-            CoinRequestDto coinRequestDto = new CoinRequestDto();
-            coinRequestDto.setPage(1);
-            coinRequestDto.setLimit(100);
-        //    coinRequestDto.setKind(ItemKindEnum.NEPHRITE.getCode());
-            PageInfo<Item> pageInfo = itemDao.findPageExcludeFilter(coinRequestDto);
-            int totalPageNum = pageInfo.getPages();
-            logger.info("total page : {}, total : {}", totalPageNum, pageInfo.getTotal());
-            IntStream.rangeClosed(1, totalPageNum).forEach(i -> {
-                logger.info(">>>>>>>>>>>>>>>>> 当前同步数据的页码: {} 更新开始 <<<<<<<<<<<<<<<<<", i);
-                CoinRequestDto dto = new CoinRequestDto();
-                dto.setPage(i);
-                dto.setLimit(100);
-                List<Item> itemList = itemDao.findListByPage(dto);
-                executorService.submit(() -> {
-                    itemEsDao.create(itemList);
-                });
-                logger.info(">>>>>>>>>>>>>>>>> 页码 = {}, 同步es 成功 ！ <<<<<<<<<<<<<<<<<", i);
-            });
-            logger.info(">>>>>>>>>>>>>>>>>数据同步es 完成 SUCCESS!!!!! <<<<<<<<<<<<<<<<<");
-        } catch (Exception e) {
-            logger.error("同步数据到es error {}", e);
-        } finally {
-            if (lock != null && lock.isHeldByCurrentThread()) {
-                lock.unlock();
-                logger.info("======================== 线程id: {} , 同步和田玉数据到ES作业 释放锁成功 ========================", Thread.currentThread().getId());
-            }
-        }
-    }
 
 
-    /**
+
+    *//**
      * 类目图片加上尺寸
-     */
+     *//*
     public void addSizeForCategoryIcon() {
         logger.info(">>>>>>>>>>>>>>>>>>>>>>> 更新类目图片尺寸, 开始执行 <<<<<<<<<<<<<<<<<<<<<");
         try {
@@ -285,8 +253,43 @@ public class SynCoinJob {
         }
 
 
+    }*/
+    public void synItemToEs() {
+        RLock lock = redissonClient.getLock(SYN_NEPHRITE_TO_ES_TASK_KEY);
+        if (!lock.tryLock()) {
+            logger.warn("当前服务实例: {} 获取锁失败，锁被占用, 不允许执行同步和田玉数据到ES作业",  Thread.currentThread().getId());
+            return;
+        }
+        try {
+            ExecutorService executorService = Executors.newFixedThreadPool(10);
+            SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+            supplierItemRequestDto.setPage(1);
+            supplierItemRequestDto.setLimit(100);
+            List<SupplierItem> list = supplierItemDao.findListByPage(supplierItemRequestDto);
+            PageInfo<SupplierItem> pageInfo = new PageInfo<>(list);
+            int totalPageNum = pageInfo.getPages();
+            logger.info("total page : {}, total : {}", totalPageNum, pageInfo.getTotal());
+            IntStream.rangeClosed(1, totalPageNum).forEach(i -> {
+                logger.info(">>>>>>>>>>>>>>>>> 当前同步数据的页码: {} 更新开始 <<<<<<<<<<<<<<<<<", i);
+                SupplierItemRequestDto dto = new SupplierItemRequestDto();
+                dto.setPage(i);
+                dto.setLimit(100);
+                List<SupplierItem> supplierItemList = supplierItemDao.findListByPage(dto);
+                executorService.submit(() -> {
+                    itemEsDao.create(supplierItemList);
+                });
+                logger.info(">>>>>>>>>>>>>>>>> 页码 = {}, 同步es 成功 ！ <<<<<<<<<<<<<<<<<", i);
+            });
+            logger.info(">>>>>>>>>>>>>>>>>数据同步es 完成 SUCCESS!!!!! <<<<<<<<<<<<<<<<<");
+        } catch (Exception e) {
+            logger.error("同步数据到es error {}", e);
+        } finally {
+            if (lock != null && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+                logger.info("======================== 线程id: {} , 同步和田玉数据到ES作业 释放锁成功 ========================", Thread.currentThread().getId());
+            }
+        }
     }
-
 
 
     public void syn(){

ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynItemToEsJob.java

@@ -9,10 +9,13 @@ import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.db.dao.CoinsDao;
 import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.dao.SynDataRecordDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.Coins;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.SynDataRecord;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.wwdz.ch.db.es.ItemEsDao;
 import com.xxdxxs.utils.CommonUtils;
 import com.xxdxxs.utils.DateUtils;
@@ -53,7 +56,7 @@ public class SynItemToEsJob {
     ExecutorService executorService = Executors.newFixedThreadPool(10);
 
     @Autowired
-    ItemDao itemDao;
+    SupplierItemDao supplierItemDao;
 
     @Autowired
     ItemEsDao itemEsDao;
@@ -99,18 +102,18 @@ public class SynItemToEsJob {
                 logger.info("上次同步任务执行完毕，开始新一轮时间范围的数据同步， 时间范围 {} to {}", DateUtils.toString(startTime), DateUtils.toString(endTime));
             }
             logger.info("es中最新数据时间为 {}", DateUtils.toString(startTime));
-            CoinRequestDto coinRequestDto = new CoinRequestDto();
-            coinRequestDto.setPage(page);
-            coinRequestDto.setLimit(limit);
-            coinRequestDto.setStartUpdateTime(startTime);
-            coinRequestDto.setEndUpdateTime(endTime);
-            coinRequestDto.setSortColumn("update_time");
-            List<Item> itemList = itemDao.findListByPage(coinRequestDto);
-            PageInfo<Item> pageInfo = new PageInfo<>(itemList);
-            logger.info("待同步增量数据总量 : {}, 当前同步第 {} 页数据， 当前页共有 {} 条数据进行同步", pageInfo.getTotal(), page, itemList.size());
-            for (Item item : itemList) {
+            SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+            supplierItemRequestDto.setPage(page);
+            supplierItemRequestDto.setLimit(limit);
+            supplierItemRequestDto.setStartUpdateTime(startTime);
+            supplierItemRequestDto.setEndUpdateTime(endTime);
+            supplierItemRequestDto.setSortColumn("update_time");
+            List<SupplierItem> supplierItemList = supplierItemDao.findListByPage(supplierItemRequestDto);
+            PageInfo<SupplierItem> pageInfo = new PageInfo<>(supplierItemList);
+            logger.info("待同步增量数据总量 : {}, 当前同步第 {} 页数据， 当前页共有 {} 条数据进行同步", pageInfo.getTotal(), page, supplierItemList.size());
+            for (SupplierItem supplierItem : supplierItemList) {
                 executorService.submit(() -> {
-                    itemEsDao.upsert(item);
+                    itemEsDao.upsert(supplierItem);
                 });
             }
             //如果有下一页则记录下来，下一次任务执行接着同步该更新时间范围的
@@ -147,20 +150,21 @@ public class SynItemToEsJob {
 
     public void synItemToEs() {
         try {
-            CoinRequestDto coinRequestDto = new CoinRequestDto();
-            coinRequestDto.setPage(1);
-            coinRequestDto.setLimit(100);
-            PageInfo<Item> pageInfo = itemDao.findPageExcludeFilter(coinRequestDto);
+            SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+            supplierItemRequestDto.setPage(1);
+            supplierItemRequestDto.setLimit(100);
+            List<SupplierItem> list = supplierItemDao.findListByPage(supplierItemRequestDto);
+            PageInfo<SupplierItem> pageInfo = new PageInfo<>(list);
             int totalPageNum = pageInfo.getPages();
             logger.info("total page : {}, total : {}", totalPageNum, pageInfo.getTotal());
             IntStream.rangeClosed(1, totalPageNum).forEach(i -> {
                 logger.info(">>>>>>>>>>>>>>>>> 当前同步数据的页码: {} 更新开始 <<<<<<<<<<<<<<<<<", i);
-                CoinRequestDto dto = new CoinRequestDto();
+                SupplierItemRequestDto dto = new SupplierItemRequestDto();
                 dto.setPage(i);
                 dto.setLimit(100);
-                List<Item> itemList = itemDao.findListByPage(dto);
+                List<SupplierItem> supplierItemList = supplierItemDao.findListByPage(dto);
                 executorService.submit(() -> {
-                    itemEsDao.create(itemList);
+                    itemEsDao.create(supplierItemList);
                 });
                 logger.info(">>>>>>>>>>>>>>>>> 页码 = {}, 同步es 成功 ！ <<<<<<<<<<<<<<<<<", i);
             });

ch-admin-api/src/test/java/com/wwdz/ch/admin/impl/SynCoinJobTest.java

@@ -35,28 +35,12 @@ public class SynCoinJobTest {
     @Autowired
     SynCategoryInfo synCategoryInfo;
 
-    @Test
-    public void execute() {
-        synCoinJob.execute();
-    }
-
-    @Test
-    public void updateImage() throws Exception {
-        synCoinJob.updateImageUrlOfsSize();
-    }
-
-
 
     @Test
     public void createIndex() throws Exception {
         itemEsDao.createIndex();
     }
 
-    @Test
-    public void upsert() throws Exception {
-        Item item = itemDao.findById(767537L);
-        itemEsDao.upsert(item);
-    }
 
     @Test
     public void updateDocumnet() throws Exception {
@@ -83,11 +67,6 @@ public class SynCoinJobTest {
     }
 
 
-    @Test
-    public void addSizeForCategoryIcon() throws Exception {
-        synCoinJob.addSizeForCategoryIcon();
-    }
-
     @Test
     public void synCategoryInfo() throws Exception {
         synCategoryInfo.execute(123);
@@ -98,4 +77,10 @@ public class SynCoinJobTest {
         synCategoryInfo.repair(1003145);
     }*/
 
+
+
+    @Test
+    public void synSupplierItem() throws Exception {
+        synItemToEsJob.synItemToEs();
+    }
 }
\ No newline at end of file

ch-core/src/main/java/com/wwdz/ch/core/config/ElasticSearchConfig.java

@@ -65,7 +65,8 @@ public class ElasticSearchConfig {
         HttpHost httpHost;
         for (int i = 0; i < hostArray.length; i++) {
             String[] strings = hostArray[i].split(":");
-            httpHost = new HttpHost(strings[0], Integer.parseInt(strings[1]), "https");
+       //     httpHost = new HttpHost(strings[0], Integer.parseInt(strings[1]), "https");
+            httpHost = new HttpHost(strings[0]);
             httpHosts[i] = httpHost;
         }
         return httpHosts;

ch-core/src/main/java/com/wwdz/ch/core/consts/CommConsts.java

@@ -114,6 +114,11 @@ public interface CommConsts {
 	 */
 	public final static String DISTRIBUTION_ORDER_PREFIX = "DA";
 
+	/**
+	 * 交换申请订单号
+	 */
+	public final static String EXCHANGE_ORDER_PREFIX = "EX";
+
 	/**
 	 * 平台收货地址
 	 */

ch-core/src/main/java/com/wwdz/ch/core/consts/DistributionEnum.java

@@ -8,8 +8,8 @@ public class DistributionEnum {
     public enum  DistributionOrderStateEnum {
         PRE_PAY(1, "待付款"),
         PRE_SALE(5, "众筹中"),
-        PRE_EXCHANGE(6, "待换货"),
-        PRE_INSPECTION(8, "待验货"),
+        PRE_EXCHANGE(6, "待寄至平台"),
+        PRE_INSPECTION(8, "待平台验货"),
         PRE_SEND(10, "待发货"),
         PRE_SIGNED(20, "待收货"),
         AFTER_SALE(30, "售后中"),

ch-core/src/main/java/com/wwdz/ch/core/consts/ExchangeApplyOrderEnum.java

+package com.wwdz.ch.core.consts;
+
+public class ExchangeApplyOrderEnum {
+
+    public enum StateEnum {
+        PRE_HANDLE(0, "待处理"),
+        AGREE(1, "同意"),
+        DISAGREE(2, "拒绝"),
+        ;
+
+        private int code;
+        private String des;
+
+        StateEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+
+            for (ExchangeApplyOrderEnum.StateEnum stateEnum : ExchangeApplyOrderEnum.StateEnum.values()) {
+                if (code == stateEnum.getCode()) {
+                    return stateEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+
+
+    public enum TypeEnum {
+        RECEIVE(1, "我收到的"),
+        COMMIT(2, "我提交的"),
+        ;
+
+        private int code;
+        private String des;
+
+        TypeEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+
+            for (ExchangeApplyOrderEnum.TypeEnum typeEnum : ExchangeApplyOrderEnum.TypeEnum.values()) {
+                if (code == typeEnum.getCode()) {
+                    return typeEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+}

ch-core/src/main/java/com/wwdz/ch/core/entity/exchange/ExchangeApplyOrderVo.java

+package com.wwdz.ch.core.entity.exchange;
+
+import com.wwdz.ch.core.entity.SupplierItemVo;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ExchangeApplyOrderVo implements Entity {
+
+    /**
+     * 申请交换单
+     */
+    private String exchangeAppluOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用于交换的用户商品信息
+     */
+    private List<SupplierItemVo> userItemList;
+
+    /**
+     * 想要换的目标商品id
+     */
+    private SupplierItemVo targetItemInfo;
+
+    /**
+     * 目标用户id
+     */
+    private Long targetUserId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态0未处理1同意2拒绝
+     */
+    private Integer state;
+
+    private String stateName;
+
+    /**
+     * 处理截止时间
+     */
+    private Date expireTime;
+
+    /**
+     * 用户订单号
+     */
+    private String userOrderId;
+
+    /**
+     * 目标用户订单号
+     */
+    private String targetUserOrderId;
+
+    /**
+     * 我收到的，我提交的
+     */
+    private String orderType;
+}

ch-core/src/main/resources/application-dev.yml

@@ -220,9 +220,9 @@ spring:
 
   elasticsearch:
     rest:
-      uris: 172.16.190.247:9200
+      uris: es-cn-ot93wtaf300091bf7.elasticsearch.aliyuncs.com
       username: elastic
-      password: changeme
+      password: hP9gB7aM0oS9oS6k
       index: quanku_dev
 
   jackson:

ch-core/src/main/resources/application-prod.yml

@@ -214,9 +214,9 @@ spring:
 
   elasticsearch:
     rest:
-      uris: 172.16.190.247:9200
+      uris: es-cn-ot93wtaf300091bf7.elasticsearch.aliyuncs.com
       username: elastic
-      password: changeme
+      password: hP9gB7aM0oS9oS6k
       index: quanku_prod
 
 dubbo:

ch-dao/src/main/java/com/wwdz/ch/db/bean/ItemOfEs.java

@@ -4,13 +4,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ItemOfEs implements Entity {
 
-
     private Long id;
 
     /**
@@ -19,9 +19,9 @@ public class ItemOfEs implements Entity {
     private String name;
 
     /**
-     * 商品所属类目ID
+     * 供应商id
      */
-    private Integer cid;
+    private Long supplierId;
 
     /**
      * 是否上架
@@ -29,39 +29,39 @@ public class ItemOfEs implements Entity {
     private Boolean isOnSale;
 
     /**
-     * 是否标准件
+     * 排序
      */
-    private Boolean isStd;
+    private Integer sort;
 
     /**
-     * 排序
+     * 置顶图片
      */
-    private Integer sort;
+    private String topImage;
 
     /**
-     * 商品分享朋友圈图片
+     * 分销价格,要除以100
      */
-    private String shareImage;
+    private Long distributionPrice;
 
     /**
-     * 置顶图片
+     * 进货价格,要除以100
      */
-    private String topImage;
+    private Long supplyPrice;
 
     /**
-     * 价格, 要除以100
+     * 官方预估价,要除以100
      */
-    private Long price;
+    private Long officialEstimatedPrice;
 
     /**
-     * 创建时间
+     * 库存
      */
-    private Date createTime;
+    private Integer stock;
 
     /**
-     * 来源类型(1系统2用户上传)
+     * 创建时间
      */
-    private Integer sourceType;
+    private Date createTime;
 
     /**
      * 更新时间
@@ -74,39 +74,34 @@ public class ItemOfEs implements Entity {
     private Boolean isDeleted;
 
     /**
-     * 成交时间
-     */
-    private Date bidTime;
-
-    /**
-     * 备注说明
+     * 限购数量
      */
-    private String remark;
+    private Integer buyLimitNum;
 
     /**
-     * 商品状态
+     * 商品类型1一口价2竞拍3用户藏品
      */
-    private Integer state;
+    private Integer type;
 
     /**
-     * 原始的资源url
+     * 返佣比例
      */
-    private String originalSourceUrl;
+    private BigDecimal rebate;
 
     /**
-     * 来源7(1,2,3,,8,10,11):中国的
+     * 用户id,非用户id的为系统账号
      */
-    private Integer source;
+    private Long creatorId;
 
     /**
-     * 商品种类1钱币
+     * 状态0正常1违规
      */
-    private Integer kind;
+    private Integer status;
 
     /**
-     * 商品额外信息
+     * 是否可以售卖
      */
-    private String extra;
+    private Boolean isAbleSale;
 
     /**
      * 商品图片,分号分隔
@@ -114,22 +109,12 @@ public class ItemOfEs implements Entity {
     private String images;
 
     /**
-     * 商品视频, 分号分隔
+     * 商品视频,分号分隔
      */
     private String videos;
 
     /**
      * 商品详细介绍，是富文本格式
      */
-    private String detail;
-
-    /**
-     * 原始额外信息
-     */
-    private String originalExtra;
-
-    /**
-     * 查看权限(0所有人,1仅自己可见)
-     */
-    private Integer viewPermission;
+    private String description;
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/DistributionOrderDetailDao.java

+package com.wwdz.ch.db.dao.distribution;
+
+import com.wwdz.ch.db.domain.distribution.DistributionOrderDetail;
+
+import java.util.List;
+
+public interface DistributionOrderDetailDao {
+
+
+    /**
+     * 插入新记录
+     *
+     * @param distributionOrderDetail
+     * @return
+     */
+    int insert(DistributionOrderDetail distributionOrderDetail);
+
+
+    /**
+     * 根据订单id查询
+     * @param orderId
+     * @return
+     */
+    List<DistributionOrderDetail> findByOrderId(String orderId);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/SupplierItemDao.java

 package com.wwdz.ch.db.dao.distribution;
 
+import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.domain.Item;
+import com.wwdz.ch.db.domain.ItemExample;
 import com.wwdz.ch.db.domain.distribution.SupplierItem;
+import com.wwdz.ch.db.dto.request.CoinRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.xxdxxs.db.component.JdbcHelper;
+
 import java.util.List;
 
 /**
@@ -117,4 +123,11 @@ public interface SupplierItemDao {
      */
     List<SupplierItem> findAllItemId(SupplierItemRequestDto supplierItemRequestDto);
 
+    /**
+     * es同步数据查询
+     * @param dto
+     * @return
+     */
+    List<SupplierItem> findListByPage(SupplierItemRequestDto dto);
+
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/exchange/ExchangeApplyOrderDao.java

+package com.wwdz.ch.db.dao.exchange;
+
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+
+import java.util.List;
+
+public interface ExchangeApplyOrderDao {
+
+    /**
+     * 创建交换申请单
+     *
+     * @param exchangeApplyOrder
+     * @return
+     */
+    int insert(ExchangeApplyOrder exchangeApplyOrder);
+
+    List<ExchangeApplyOrder> findByPage(ExchangeApplyOrderRequestDto dto);
+
+
+    ExchangeApplyOrder findByOrderId(String orderId);
+
+    /**
+     * 更新记录
+     *
+     * @param exchangeApplyOrder
+     * @return
+     */
+    int update(ExchangeApplyOrder exchangeApplyOrder);
+
+
+    int updateState(String orderId, int state);
+
+
+    /**
+     * 统计待处理的申请单数量
+     * 我提交的交换单数量
+     * @param userId
+     * @return
+     */
+    long countPreHandleOrderOfCommit(long userId);
+
+    /**
+     * 统计待处理的申请单数量
+     * 我收到的交换数量
+     * @param targetUserId
+     * @return
+     */
+    long countPreHandleOrderOfReceive(long targetUserId);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/exchange/ExchangeApplyOrderDetailDao.java

+package com.wwdz.ch.db.dao.exchange;
+
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail;
+
+import java.util.List;
+
+public interface ExchangeApplyOrderDetailDao {
+
+    /**
+     * 交换申请单详情
+     *
+     * @param exchangeApplyOrderDetail
+     * @return
+     */
+    int insert(ExchangeApplyOrderDetail exchangeApplyOrderDetail);
+
+    List<ExchangeApplyOrderDetail> findByOrderId(String orderId);
+
+    boolean updateInValid(String orderId);
+}

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/DistributionOrder.java

@@ -11,7 +11,7 @@ import lombok.Data;
 
 /**
  * @author shiyu
- * @date   2024/08/02
+ * @date   2024/09/11
  */
 @Data
 public class DistributionOrder implements Entity {
@@ -177,7 +177,10 @@ public class DistributionOrder implements Entity {
      */
     private BigDecimal channelRebate;
 
-
+    /**
+     * 是否多商品
+     */
+    private Boolean isMultiple;
 
     private static final long serialVersionUID = 1L;
 
@@ -220,6 +223,7 @@ public class DistributionOrder implements Entity {
         sb.append(", introducerId=").append(introducerId);
         sb.append(", channelAmount=").append(channelAmount);
         sb.append(", channelRebate=").append(channelRebate);
+        sb.append(", isMultiple=").append(isMultiple);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
@@ -269,7 +273,8 @@ public class DistributionOrder implements Entity {
             && (this.getIntroduceRebate() == null ? other.getIntroduceRebate() == null : this.getIntroduceRebate().equals(other.getIntroduceRebate()))
             && (this.getIntroducerId() == null ? other.getIntroducerId() == null : this.getIntroducerId().equals(other.getIntroducerId()))
             && (this.getChannelAmount() == null ? other.getChannelAmount() == null : this.getChannelAmount().equals(other.getChannelAmount()))
-            && (this.getChannelRebate() == null ? other.getChannelRebate() == null : this.getChannelRebate().equals(other.getChannelRebate()));
+            && (this.getChannelRebate() == null ? other.getChannelRebate() == null : this.getChannelRebate().equals(other.getChannelRebate()))
+            && (this.getIsMultiple() == null ? other.getIsMultiple() == null : this.getIsMultiple().equals(other.getIsMultiple()));
     }
 
     @Override
@@ -309,6 +314,7 @@ public class DistributionOrder implements Entity {
         result = prime * result + ((getIntroducerId() == null) ? 0 : getIntroducerId().hashCode());
         result = prime * result + ((getChannelAmount() == null) ? 0 : getChannelAmount().hashCode());
         result = prime * result + ((getChannelRebate() == null) ? 0 : getChannelRebate().hashCode());
+        result = prime * result + ((getIsMultiple() == null) ? 0 : getIsMultiple().hashCode());
         return result;
     }
 
@@ -352,7 +358,8 @@ public class DistributionOrder implements Entity {
         introduceRebate("introduce_rebate", "introduceRebate", "DECIMAL", false),
         introducerId("introducer_id", "introducerId", "BIGINT", false),
         channelAmount("channel_amount", "channelAmount", "BIGINT", false),
-        channelRebate("channel_rebate", "channelRebate", "DECIMAL", false);
+        channelRebate("channel_rebate", "channelRebate", "DECIMAL", false),
+        isMultiple("is_multiple", "isMultiple", "BIT", false);
 
         /**
          * This field was generated by MyBatis Generator.

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/DistributionOrderDetail.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+/**
+ * @author shiyu
+ * @date   2024/09/11
+ */
+@Data
+public class DistributionOrderDetail implements Entity {
+    private Integer id;
+
+    /**
+     * 订单号
+     */
+    private String distributionOrderId;
+
+    /**
+     * 买家id
+     */
+    private Long buyerId;
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 商品数量
+     */
+    private Integer itemNum;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 卖家id
+     */
+    private Long sellerId;
+
+    /**
+     * 是否上架
+     */
+    private Boolean isOnSale;
+
+    /**
+     * 置顶图片
+     */
+    private String topImage;
+
+    /**
+     * 分销价格,要除以100
+     */
+    private Long distributionPrice;
+
+    /**
+     * 进货价格,要除以100
+     */
+    private Long supplyPrice;
+
+    /**
+     * 官方预估价,要除以100
+     */
+    private Long officialEstimatedPrice;
+
+    /**
+     * 库存
+     */
+    private Integer stock;
+
+    /**
+     * 限购数量
+     */
+    private Integer buyLimitNum;
+
+    /**
+     * 用户id,非用户id的为系统账号
+     */
+    private Long creatorId;
+
+    /**
+     * 商品名称
+     */
+    private String itemName;
+
+    /**
+     * 商品图片,分号分隔
+     */
+    private String images;
+
+    /**
+     * 商品视频,分号分隔
+     */
+    private String videos;
+
+    /**
+     * 商品详细介绍，是富文本格式
+     */
+    private String description;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", distributionOrderId=").append(distributionOrderId);
+        sb.append(", buyerId=").append(buyerId);
+        sb.append(", itemId=").append(itemId);
+        sb.append(", itemNum=").append(itemNum);
+        sb.append(", type=").append(type);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", sellerId=").append(sellerId);
+        sb.append(", isOnSale=").append(isOnSale);
+        sb.append(", topImage=").append(topImage);
+        sb.append(", distributionPrice=").append(distributionPrice);
+        sb.append(", supplyPrice=").append(supplyPrice);
+        sb.append(", officialEstimatedPrice=").append(officialEstimatedPrice);
+        sb.append(", stock=").append(stock);
+        sb.append(", buyLimitNum=").append(buyLimitNum);
+        sb.append(", creatorId=").append(creatorId);
+        sb.append(", itemName=").append(itemName);
+        sb.append(", images=").append(images);
+        sb.append(", videos=").append(videos);
+        sb.append(", description=").append(description);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        DistributionOrderDetail other = (DistributionOrderDetail) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getDistributionOrderId() == null ? other.getDistributionOrderId() == null : this.getDistributionOrderId().equals(other.getDistributionOrderId()))
+            && (this.getBuyerId() == null ? other.getBuyerId() == null : this.getBuyerId().equals(other.getBuyerId()))
+            && (this.getItemId() == null ? other.getItemId() == null : this.getItemId().equals(other.getItemId()))
+            && (this.getItemNum() == null ? other.getItemNum() == null : this.getItemNum().equals(other.getItemNum()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId()))
+            && (this.getIsOnSale() == null ? other.getIsOnSale() == null : this.getIsOnSale().equals(other.getIsOnSale()))
+            && (this.getTopImage() == null ? other.getTopImage() == null : this.getTopImage().equals(other.getTopImage()))
+            && (this.getDistributionPrice() == null ? other.getDistributionPrice() == null : this.getDistributionPrice().equals(other.getDistributionPrice()))
+            && (this.getSupplyPrice() == null ? other.getSupplyPrice() == null : this.getSupplyPrice().equals(other.getSupplyPrice()))
+            && (this.getOfficialEstimatedPrice() == null ? other.getOfficialEstimatedPrice() == null : this.getOfficialEstimatedPrice().equals(other.getOfficialEstimatedPrice()))
+            && (this.getStock() == null ? other.getStock() == null : this.getStock().equals(other.getStock()))
+            && (this.getBuyLimitNum() == null ? other.getBuyLimitNum() == null : this.getBuyLimitNum().equals(other.getBuyLimitNum()))
+            && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
+            && (this.getItemName() == null ? other.getItemName() == null : this.getItemName().equals(other.getItemName()))
+            && (this.getImages() == null ? other.getImages() == null : this.getImages().equals(other.getImages()))
+            && (this.getVideos() == null ? other.getVideos() == null : this.getVideos().equals(other.getVideos()))
+            && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getDistributionOrderId() == null) ? 0 : getDistributionOrderId().hashCode());
+        result = prime * result + ((getBuyerId() == null) ? 0 : getBuyerId().hashCode());
+        result = prime * result + ((getItemId() == null) ? 0 : getItemId().hashCode());
+        result = prime * result + ((getItemNum() == null) ? 0 : getItemNum().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getSellerId() == null) ? 0 : getSellerId().hashCode());
+        result = prime * result + ((getIsOnSale() == null) ? 0 : getIsOnSale().hashCode());
+        result = prime * result + ((getTopImage() == null) ? 0 : getTopImage().hashCode());
+        result = prime * result + ((getDistributionPrice() == null) ? 0 : getDistributionPrice().hashCode());
+        result = prime * result + ((getSupplyPrice() == null) ? 0 : getSupplyPrice().hashCode());
+        result = prime * result + ((getOfficialEstimatedPrice() == null) ? 0 : getOfficialEstimatedPrice().hashCode());
+        result = prime * result + ((getStock() == null) ? 0 : getStock().hashCode());
+        result = prime * result + ((getBuyLimitNum() == null) ? 0 : getBuyLimitNum().hashCode());
+        result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
+        result = prime * result + ((getItemName() == null) ? 0 : getItemName().hashCode());
+        result = prime * result + ((getImages() == null) ? 0 : getImages().hashCode());
+        result = prime * result + ((getVideos() == null) ? 0 : getVideos().hashCode());
+        result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
+        return result;
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public enum Column {
+        id("id", "id", "INTEGER", false),
+        distributionOrderId("distribution_order_id", "distributionOrderId", "VARCHAR", false),
+        buyerId("buyer_id", "buyerId", "BIGINT", false),
+        itemId("item_id", "itemId", "BIGINT", false),
+        itemNum("item_num", "itemNum", "INTEGER", false),
+        type("type", "type", "INTEGER", true),
+        createTime("create_time", "createTime", "TIMESTAMP", false),
+        sellerId("seller_id", "sellerId", "BIGINT", false),
+        isOnSale("is_on_sale", "isOnSale", "BIT", false),
+        topImage("top_image", "topImage", "VARCHAR", false),
+        distributionPrice("distribution_price", "distributionPrice", "BIGINT", false),
+        supplyPrice("supply_price", "supplyPrice", "BIGINT", false),
+        officialEstimatedPrice("official_estimated_price", "officialEstimatedPrice", "BIGINT", false),
+        stock("stock", "stock", "INTEGER", false),
+        buyLimitNum("buy_limit_num", "buyLimitNum", "INTEGER", false),
+        creatorId("creator_id", "creatorId", "BIGINT", false),
+        itemName("item_name", "itemName", "VARCHAR", false),
+        images("images", "images", "LONGVARCHAR", false),
+        videos("videos", "videos", "LONGVARCHAR", false),
+        description("description", "description", "LONGVARCHAR", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String BEGINNING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String ENDING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public static Column[] excludes(Column ... excludes) {
+            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+    }
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/DistributionOrderDetailExample.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DistributionOrderDetailExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DistributionOrderDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public DistributionOrderDetailExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public DistributionOrderDetailExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static Criteria newAndCreateCriteria() {
+        DistributionOrderDetailExample example = new DistributionOrderDetailExample();
+        return example.createCriteria();
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdIsNull() {
+            addCriterion("distribution_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdIsNotNull() {
+            addCriterion("distribution_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdEqualTo(String value) {
+            addCriterion("distribution_order_id =", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_order_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdNotEqualTo(String value) {
+            addCriterion("distribution_order_id <>", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_order_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdGreaterThan(String value) {
+            addCriterion("distribution_order_id >", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_order_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("distribution_order_id >=", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_order_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdLessThan(String value) {
+            addCriterion("distribution_order_id <", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_order_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("distribution_order_id <=", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_order_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdLike(String value) {
+            addCriterion("distribution_order_id like", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdNotLike(String value) {
+            addCriterion("distribution_order_id not like", value, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdIn(List<String> values) {
+            addCriterion("distribution_order_id in", values, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdNotIn(List<String> values) {
+            addCriterion("distribution_order_id not in", values, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdBetween(String value1, String value2) {
+            addCriterion("distribution_order_id between", value1, value2, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionOrderIdNotBetween(String value1, String value2) {
+            addCriterion("distribution_order_id not between", value1, value2, "distributionOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdIsNull() {
+            addCriterion("buyer_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdIsNotNull() {
+            addCriterion("buyer_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdEqualTo(Long value) {
+            addCriterion("buyer_id =", value, "buyerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyerIdEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buyer_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdNotEqualTo(Long value) {
+            addCriterion("buyer_id <>", value, "buyerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyerIdNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buyer_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdGreaterThan(Long value) {
+            addCriterion("buyer_id >", value, "buyerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyerIdGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buyer_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("buyer_id >=", value, "buyerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyerIdGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buyer_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdLessThan(Long value) {
+            addCriterion("buyer_id <", value, "buyerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyerIdLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buyer_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdLessThanOrEqualTo(Long value) {
+            addCriterion("buyer_id <=", value, "buyerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyerIdLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buyer_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdIn(List<Long> values) {
+            addCriterion("buyer_id in", values, "buyerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdNotIn(List<Long> values) {
+            addCriterion("buyer_id not in", values, "buyerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdBetween(Long value1, Long value2) {
+            addCriterion("buyer_id between", value1, value2, "buyerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyerIdNotBetween(Long value1, Long value2) {
+            addCriterion("buyer_id not between", value1, value2, "buyerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdIsNull() {
+            addCriterion("item_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdIsNotNull() {
+            addCriterion("item_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdEqualTo(Long value) {
+            addCriterion("item_id =", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdNotEqualTo(Long value) {
+            addCriterion("item_id <>", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdGreaterThan(Long value) {
+            addCriterion("item_id >", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("item_id >=", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdLessThan(Long value) {
+            addCriterion("item_id <", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdLessThanOrEqualTo(Long value) {
+            addCriterion("item_id <=", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdIn(List<Long> values) {
+            addCriterion("item_id in", values, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdNotIn(List<Long> values) {
+            addCriterion("item_id not in", values, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdBetween(Long value1, Long value2) {
+            addCriterion("item_id between", value1, value2, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdNotBetween(Long value1, Long value2) {
+            addCriterion("item_id not between", value1, value2, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumIsNull() {
+            addCriterion("item_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumIsNotNull() {
+            addCriterion("item_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumEqualTo(Integer value) {
+            addCriterion("item_num =", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumNotEqualTo(Integer value) {
+            addCriterion("item_num <>", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumGreaterThan(Integer value) {
+            addCriterion("item_num >", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("item_num >=", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumLessThan(Integer value) {
+            addCriterion("item_num <", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumLessThanOrEqualTo(Integer value) {
+            addCriterion("item_num <=", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumIn(List<Integer> values) {
+            addCriterion("item_num in", values, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumNotIn(List<Integer> values) {
+            addCriterion("item_num not in", values, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumBetween(Integer value1, Integer value2) {
+            addCriterion("item_num between", value1, value2, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("item_num not between", value1, value2, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("`type` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("`type` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("`type` =", value, "type");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTypeEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("`type` = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Integer value) {
+            addCriterion("`type` <>", value, "type");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTypeNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("`type` <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Integer value) {
+            addCriterion("`type` >", value, "type");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTypeGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("`type` > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`type` >=", value, "type");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTypeGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("`type` >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Integer value) {
+            addCriterion("`type` <", value, "type");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTypeLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("`type` < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("`type` <=", value, "type");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTypeLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("`type` <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Integer> values) {
+            addCriterion("`type` in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Integer> values) {
+            addCriterion("`type` not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
+            addCriterion("`type` between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("`type` not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdIsNull() {
+            addCriterion("seller_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdIsNotNull() {
+            addCriterion("seller_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdEqualTo(Long value) {
+            addCriterion("seller_id =", value, "sellerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSellerIdEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("seller_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdNotEqualTo(Long value) {
+            addCriterion("seller_id <>", value, "sellerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSellerIdNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("seller_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdGreaterThan(Long value) {
+            addCriterion("seller_id >", value, "sellerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSellerIdGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("seller_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("seller_id >=", value, "sellerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSellerIdGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("seller_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdLessThan(Long value) {
+            addCriterion("seller_id <", value, "sellerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSellerIdLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("seller_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdLessThanOrEqualTo(Long value) {
+            addCriterion("seller_id <=", value, "sellerId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSellerIdLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("seller_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdIn(List<Long> values) {
+            addCriterion("seller_id in", values, "sellerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdNotIn(List<Long> values) {
+            addCriterion("seller_id not in", values, "sellerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdBetween(Long value1, Long value2) {
+            addCriterion("seller_id between", value1, value2, "sellerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSellerIdNotBetween(Long value1, Long value2) {
+            addCriterion("seller_id not between", value1, value2, "sellerId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleIsNull() {
+            addCriterion("is_on_sale is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleIsNotNull() {
+            addCriterion("is_on_sale is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleEqualTo(Boolean value) {
+            addCriterion("is_on_sale =", value, "isOnSale");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsOnSaleEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_on_sale = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleNotEqualTo(Boolean value) {
+            addCriterion("is_on_sale <>", value, "isOnSale");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsOnSaleNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_on_sale <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleGreaterThan(Boolean value) {
+            addCriterion("is_on_sale >", value, "isOnSale");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsOnSaleGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_on_sale > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_on_sale >=", value, "isOnSale");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsOnSaleGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_on_sale >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleLessThan(Boolean value) {
+            addCriterion("is_on_sale <", value, "isOnSale");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsOnSaleLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_on_sale < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_on_sale <=", value, "isOnSale");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsOnSaleLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_on_sale <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleIn(List<Boolean> values) {
+            addCriterion("is_on_sale in", values, "isOnSale");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleNotIn(List<Boolean> values) {
+            addCriterion("is_on_sale not in", values, "isOnSale");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_on_sale between", value1, value2, "isOnSale");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsOnSaleNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_on_sale not between", value1, value2, "isOnSale");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageIsNull() {
+            addCriterion("top_image is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageIsNotNull() {
+            addCriterion("top_image is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageEqualTo(String value) {
+            addCriterion("top_image =", value, "topImage");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTopImageEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("top_image = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageNotEqualTo(String value) {
+            addCriterion("top_image <>", value, "topImage");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTopImageNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("top_image <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageGreaterThan(String value) {
+            addCriterion("top_image >", value, "topImage");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTopImageGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("top_image > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageGreaterThanOrEqualTo(String value) {
+            addCriterion("top_image >=", value, "topImage");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTopImageGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("top_image >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageLessThan(String value) {
+            addCriterion("top_image <", value, "topImage");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTopImageLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("top_image < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageLessThanOrEqualTo(String value) {
+            addCriterion("top_image <=", value, "topImage");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTopImageLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("top_image <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageLike(String value) {
+            addCriterion("top_image like", value, "topImage");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageNotLike(String value) {
+            addCriterion("top_image not like", value, "topImage");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageIn(List<String> values) {
+            addCriterion("top_image in", values, "topImage");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageNotIn(List<String> values) {
+            addCriterion("top_image not in", values, "topImage");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageBetween(String value1, String value2) {
+            addCriterion("top_image between", value1, value2, "topImage");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopImageNotBetween(String value1, String value2) {
+            addCriterion("top_image not between", value1, value2, "topImage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceIsNull() {
+            addCriterion("distribution_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceIsNotNull() {
+            addCriterion("distribution_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceEqualTo(Long value) {
+            addCriterion("distribution_price =", value, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionPriceEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_price = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceNotEqualTo(Long value) {
+            addCriterion("distribution_price <>", value, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionPriceNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_price <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceGreaterThan(Long value) {
+            addCriterion("distribution_price >", value, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionPriceGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_price > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceGreaterThanOrEqualTo(Long value) {
+            addCriterion("distribution_price >=", value, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionPriceGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_price >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceLessThan(Long value) {
+            addCriterion("distribution_price <", value, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionPriceLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_price < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceLessThanOrEqualTo(Long value) {
+            addCriterion("distribution_price <=", value, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionPriceLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("distribution_price <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceIn(List<Long> values) {
+            addCriterion("distribution_price in", values, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceNotIn(List<Long> values) {
+            addCriterion("distribution_price not in", values, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceBetween(Long value1, Long value2) {
+            addCriterion("distribution_price between", value1, value2, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionPriceNotBetween(Long value1, Long value2) {
+            addCriterion("distribution_price not between", value1, value2, "distributionPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceIsNull() {
+            addCriterion("supply_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceIsNotNull() {
+            addCriterion("supply_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceEqualTo(Long value) {
+            addCriterion("supply_price =", value, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSupplyPriceEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("supply_price = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceNotEqualTo(Long value) {
+            addCriterion("supply_price <>", value, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSupplyPriceNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("supply_price <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceGreaterThan(Long value) {
+            addCriterion("supply_price >", value, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSupplyPriceGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("supply_price > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceGreaterThanOrEqualTo(Long value) {
+            addCriterion("supply_price >=", value, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSupplyPriceGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("supply_price >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceLessThan(Long value) {
+            addCriterion("supply_price <", value, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSupplyPriceLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("supply_price < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceLessThanOrEqualTo(Long value) {
+            addCriterion("supply_price <=", value, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andSupplyPriceLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("supply_price <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceIn(List<Long> values) {
+            addCriterion("supply_price in", values, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceNotIn(List<Long> values) {
+            addCriterion("supply_price not in", values, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceBetween(Long value1, Long value2) {
+            addCriterion("supply_price between", value1, value2, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSupplyPriceNotBetween(Long value1, Long value2) {
+            addCriterion("supply_price not between", value1, value2, "supplyPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceIsNull() {
+            addCriterion("official_estimated_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceIsNotNull() {
+            addCriterion("official_estimated_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceEqualTo(Long value) {
+            addCriterion("official_estimated_price =", value, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOfficialEstimatedPriceEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("official_estimated_price = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceNotEqualTo(Long value) {
+            addCriterion("official_estimated_price <>", value, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOfficialEstimatedPriceNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("official_estimated_price <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceGreaterThan(Long value) {
+            addCriterion("official_estimated_price >", value, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOfficialEstimatedPriceGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("official_estimated_price > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceGreaterThanOrEqualTo(Long value) {
+            addCriterion("official_estimated_price >=", value, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOfficialEstimatedPriceGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("official_estimated_price >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceLessThan(Long value) {
+            addCriterion("official_estimated_price <", value, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOfficialEstimatedPriceLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("official_estimated_price < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceLessThanOrEqualTo(Long value) {
+            addCriterion("official_estimated_price <=", value, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOfficialEstimatedPriceLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("official_estimated_price <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceIn(List<Long> values) {
+            addCriterion("official_estimated_price in", values, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceNotIn(List<Long> values) {
+            addCriterion("official_estimated_price not in", values, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceBetween(Long value1, Long value2) {
+            addCriterion("official_estimated_price between", value1, value2, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andOfficialEstimatedPriceNotBetween(Long value1, Long value2) {
+            addCriterion("official_estimated_price not between", value1, value2, "officialEstimatedPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andStockIsNull() {
+            addCriterion("stock is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStockIsNotNull() {
+            addCriterion("stock is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStockEqualTo(Integer value) {
+            addCriterion("stock =", value, "stock");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStockEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("stock = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStockNotEqualTo(Integer value) {
+            addCriterion("stock <>", value, "stock");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStockNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("stock <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStockGreaterThan(Integer value) {
+            addCriterion("stock >", value, "stock");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStockGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("stock > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStockGreaterThanOrEqualTo(Integer value) {
+            addCriterion("stock >=", value, "stock");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStockGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("stock >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStockLessThan(Integer value) {
+            addCriterion("stock <", value, "stock");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStockLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("stock < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStockLessThanOrEqualTo(Integer value) {
+            addCriterion("stock <=", value, "stock");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStockLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("stock <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStockIn(List<Integer> values) {
+            addCriterion("stock in", values, "stock");
+            return (Criteria) this;
+        }
+
+        public Criteria andStockNotIn(List<Integer> values) {
+            addCriterion("stock not in", values, "stock");
+            return (Criteria) this;
+        }
+
+        public Criteria andStockBetween(Integer value1, Integer value2) {
+            addCriterion("stock between", value1, value2, "stock");
+            return (Criteria) this;
+        }
+
+        public Criteria andStockNotBetween(Integer value1, Integer value2) {
+            addCriterion("stock not between", value1, value2, "stock");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumIsNull() {
+            addCriterion("buy_limit_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumIsNotNull() {
+            addCriterion("buy_limit_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumEqualTo(Integer value) {
+            addCriterion("buy_limit_num =", value, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyLimitNumEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buy_limit_num = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumNotEqualTo(Integer value) {
+            addCriterion("buy_limit_num <>", value, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyLimitNumNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buy_limit_num <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumGreaterThan(Integer value) {
+            addCriterion("buy_limit_num >", value, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyLimitNumGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buy_limit_num > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("buy_limit_num >=", value, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyLimitNumGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buy_limit_num >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumLessThan(Integer value) {
+            addCriterion("buy_limit_num <", value, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyLimitNumLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buy_limit_num < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumLessThanOrEqualTo(Integer value) {
+            addCriterion("buy_limit_num <=", value, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andBuyLimitNumLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("buy_limit_num <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumIn(List<Integer> values) {
+            addCriterion("buy_limit_num in", values, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumNotIn(List<Integer> values) {
+            addCriterion("buy_limit_num not in", values, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumBetween(Integer value1, Integer value2) {
+            addCriterion("buy_limit_num between", value1, value2, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuyLimitNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("buy_limit_num not between", value1, value2, "buyLimitNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNull() {
+            addCriterion("creator_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIsNotNull() {
+            addCriterion("creator_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdEqualTo(Long value) {
+            addCriterion("creator_id =", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreatorIdEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("creator_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotEqualTo(Long value) {
+            addCriterion("creator_id <>", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreatorIdNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("creator_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThan(Long value) {
+            addCriterion("creator_id >", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreatorIdGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("creator_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("creator_id >=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreatorIdGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("creator_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThan(Long value) {
+            addCriterion("creator_id <", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreatorIdLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("creator_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdLessThanOrEqualTo(Long value) {
+            addCriterion("creator_id <=", value, "creatorId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreatorIdLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("creator_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdIn(List<Long> values) {
+            addCriterion("creator_id in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotIn(List<Long> values) {
+            addCriterion("creator_id not in", values, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdBetween(Long value1, Long value2) {
+            addCriterion("creator_id between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIdNotBetween(Long value1, Long value2) {
+            addCriterion("creator_id not between", value1, value2, "creatorId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameIsNull() {
+            addCriterion("item_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameIsNotNull() {
+            addCriterion("item_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameEqualTo(String value) {
+            addCriterion("item_name =", value, "itemName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNameEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_name = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameNotEqualTo(String value) {
+            addCriterion("item_name <>", value, "itemName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNameNotEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_name <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameGreaterThan(String value) {
+            addCriterion("item_name >", value, "itemName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNameGreaterThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_name > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameGreaterThanOrEqualTo(String value) {
+            addCriterion("item_name >=", value, "itemName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNameGreaterThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_name >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameLessThan(String value) {
+            addCriterion("item_name <", value, "itemName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNameLessThanColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_name < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameLessThanOrEqualTo(String value) {
+            addCriterion("item_name <=", value, "itemName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNameLessThanOrEqualToColumn(DistributionOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_name <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameLike(String value) {
+            addCriterion("item_name like", value, "itemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameNotLike(String value) {
+            addCriterion("item_name not like", value, "itemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameIn(List<String> values) {
+            addCriterion("item_name in", values, "itemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameNotIn(List<String> values) {
+            addCriterion("item_name not in", values, "itemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameBetween(String value1, String value2) {
+            addCriterion("item_name between", value1, value2, "itemName");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNameNotBetween(String value1, String value2) {
+            addCriterion("item_name not between", value1, value2, "itemName");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private DistributionOrderDetailExample example;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        protected Criteria(DistributionOrderDetailExample example) {
+            super();
+            this.example = example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public DistributionOrderDetailExample example() {
+            return this.example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
+            if (ifAdd) {
+                add.add(this);
+            }
+            return this;
+        }
+
+        /**
+         * This interface was generated by MyBatis Generator.
+         * This interface corresponds to the database table distribution_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public interface ICriteriaAdd {
+            /**
+             * This method was generated by MyBatis Generator.
+             * This method corresponds to the database table distribution_order_detail
+             *
+             * @mbg.generated
+             * @project https://github.com/itfsw/mybatis-generator-plugin
+             */
+            Criteria add(Criteria add);
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/DistributionOrderExample.java

@@ -4604,6 +4604,138 @@ public class DistributionOrderExample {
             addCriterion("channel_rebate not between", value1, value2, "channelRebate");
             return (Criteria) this;
         }
+
+        public Criteria andIsMultipleIsNull() {
+            addCriterion("is_multiple is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleIsNotNull() {
+            addCriterion("is_multiple is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleEqualTo(Boolean value) {
+            addCriterion("is_multiple =", value, "isMultiple");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsMultipleEqualToColumn(DistributionOrder.Column column) {
+            addCriterion(new StringBuilder("is_multiple = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleNotEqualTo(Boolean value) {
+            addCriterion("is_multiple <>", value, "isMultiple");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsMultipleNotEqualToColumn(DistributionOrder.Column column) {
+            addCriterion(new StringBuilder("is_multiple <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleGreaterThan(Boolean value) {
+            addCriterion("is_multiple >", value, "isMultiple");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsMultipleGreaterThanColumn(DistributionOrder.Column column) {
+            addCriterion(new StringBuilder("is_multiple > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_multiple >=", value, "isMultiple");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsMultipleGreaterThanOrEqualToColumn(DistributionOrder.Column column) {
+            addCriterion(new StringBuilder("is_multiple >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleLessThan(Boolean value) {
+            addCriterion("is_multiple <", value, "isMultiple");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsMultipleLessThanColumn(DistributionOrder.Column column) {
+            addCriterion(new StringBuilder("is_multiple < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_multiple <=", value, "isMultiple");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table distribution_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsMultipleLessThanOrEqualToColumn(DistributionOrder.Column column) {
+            addCriterion(new StringBuilder("is_multiple <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleIn(List<Boolean> values) {
+            addCriterion("is_multiple in", values, "isMultiple");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleNotIn(List<Boolean> values) {
+            addCriterion("is_multiple not in", values, "isMultiple");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_multiple between", value1, value2, "isMultiple");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsMultipleNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_multiple not between", value1, value2, "isMultiple");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/ExchangeApplyOrder.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+/**
+ * @author shiyu
+ * @date   2024/09/11
+ */
+@Data
+public class ExchangeApplyOrder implements Entity {
+    private Integer id;
+
+    /**
+     * 申请交换单
+     */
+    private String exchangeApplyOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 目标用户id
+     */
+    private Long targetUserId;
+
+    /**
+     * 目标商品id
+     */
+    private Long targetItemId;
+
+    /**
+     * 目标商品数量
+     */
+    private Integer targetItemNum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态0未处理1同意2拒绝
+     */
+    private Integer state;
+
+    /**
+     * 用户订单号
+     */
+    private String userOrderId;
+
+    /**
+     * 目标用户订单号
+     */
+    private String targetUserOrderId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", exchangeApplyOrderId=").append(exchangeApplyOrderId);
+        sb.append(", userId=").append(userId);
+        sb.append(", targetUserId=").append(targetUserId);
+        sb.append(", targetItemId=").append(targetItemId);
+        sb.append(", targetItemNum=").append(targetItemNum);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", state=").append(state);
+        sb.append(", userOrderId=").append(userOrderId);
+        sb.append(", targetUserOrderId=").append(targetUserOrderId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        ExchangeApplyOrder other = (ExchangeApplyOrder) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getExchangeApplyOrderId() == null ? other.getExchangeApplyOrderId() == null : this.getExchangeApplyOrderId().equals(other.getExchangeApplyOrderId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getTargetUserId() == null ? other.getTargetUserId() == null : this.getTargetUserId().equals(other.getTargetUserId()))
+            && (this.getTargetItemId() == null ? other.getTargetItemId() == null : this.getTargetItemId().equals(other.getTargetItemId()))
+            && (this.getTargetItemNum() == null ? other.getTargetItemNum() == null : this.getTargetItemNum().equals(other.getTargetItemNum()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()))
+            && (this.getUserOrderId() == null ? other.getUserOrderId() == null : this.getUserOrderId().equals(other.getUserOrderId()))
+            && (this.getTargetUserOrderId() == null ? other.getTargetUserOrderId() == null : this.getTargetUserOrderId().equals(other.getTargetUserOrderId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getExchangeApplyOrderId() == null) ? 0 : getExchangeApplyOrderId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getTargetUserId() == null) ? 0 : getTargetUserId().hashCode());
+        result = prime * result + ((getTargetItemId() == null) ? 0 : getTargetItemId().hashCode());
+        result = prime * result + ((getTargetItemNum() == null) ? 0 : getTargetItemNum().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getState() == null) ? 0 : getState().hashCode());
+        result = prime * result + ((getUserOrderId() == null) ? 0 : getUserOrderId().hashCode());
+        result = prime * result + ((getTargetUserOrderId() == null) ? 0 : getTargetUserOrderId().hashCode());
+        return result;
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public enum Column {
+        id("id", "id", "INTEGER", false),
+        exchangeApplyOrderId("exchange_apply_order_id", "exchangeApplyOrderId", "VARCHAR", false),
+        userId("user_id", "userId", "BIGINT", false),
+        targetUserId("target_user_id", "targetUserId", "BIGINT", false),
+        targetItemId("target_item_id", "targetItemId", "BIGINT", false),
+        targetItemNum("target_item_num", "targetItemNum", "INTEGER", false),
+        createTime("create_time", "createTime", "TIMESTAMP", false),
+        updateTime("update_time", "updateTime", "TIMESTAMP", false),
+        state("state", "state", "INTEGER", true),
+        userOrderId("user_order_id", "userOrderId", "VARCHAR", false),
+        targetUserOrderId("target_user_order_id", "targetUserOrderId", "VARCHAR", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String BEGINNING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String ENDING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public static Column[] excludes(Column ... excludes) {
+            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+    }
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/ExchangeApplyOrderDetail.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+/**
+ * @author shiyu
+ * @date   2024/09/11
+ */
+@Data
+public class ExchangeApplyOrderDetail implements Entity {
+
+    private Integer id;
+
+    /**
+     * 交换单id
+     */
+    private String exchangeApplyOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 商品数量
+     */
+    private Integer itemNum;
+
+    /**
+     * 目标用户id
+     */
+    private Long targetUserId;
+
+    /**
+     * 目标商品id
+     */
+    private Long targetItemId;
+
+    /**
+     * 目标商品数量
+     */
+    private Integer targetItemNum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否有效
+     */
+    private Boolean isValid;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", exchangeApplyOrderId=").append(exchangeApplyOrderId);
+        sb.append(", userId=").append(userId);
+        sb.append(", itemId=").append(itemId);
+        sb.append(", itemNum=").append(itemNum);
+        sb.append(", targetUserId=").append(targetUserId);
+        sb.append(", targetItemId=").append(targetItemId);
+        sb.append(", targetItemNum=").append(targetItemNum);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", isValid=").append(isValid);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        ExchangeApplyOrderDetail other = (ExchangeApplyOrderDetail) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getExchangeApplyOrderId() == null ? other.getExchangeApplyOrderId() == null : this.getExchangeApplyOrderId().equals(other.getExchangeApplyOrderId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getItemId() == null ? other.getItemId() == null : this.getItemId().equals(other.getItemId()))
+            && (this.getItemNum() == null ? other.getItemNum() == null : this.getItemNum().equals(other.getItemNum()))
+            && (this.getTargetUserId() == null ? other.getTargetUserId() == null : this.getTargetUserId().equals(other.getTargetUserId()))
+            && (this.getTargetItemId() == null ? other.getTargetItemId() == null : this.getTargetItemId().equals(other.getTargetItemId()))
+            && (this.getTargetItemNum() == null ? other.getTargetItemNum() == null : this.getTargetItemNum().equals(other.getTargetItemNum()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (this.getIsValid() == null ? other.getIsValid() == null : this.getIsValid().equals(other.getIsValid()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getExchangeApplyOrderId() == null) ? 0 : getExchangeApplyOrderId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getItemId() == null) ? 0 : getItemId().hashCode());
+        result = prime * result + ((getItemNum() == null) ? 0 : getItemNum().hashCode());
+        result = prime * result + ((getTargetUserId() == null) ? 0 : getTargetUserId().hashCode());
+        result = prime * result + ((getTargetItemId() == null) ? 0 : getTargetItemId().hashCode());
+        result = prime * result + ((getTargetItemNum() == null) ? 0 : getTargetItemNum().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        result = prime * result + ((getIsValid() == null) ? 0 : getIsValid().hashCode());
+        return result;
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public enum Column {
+        id("id", "id", "INTEGER", false),
+        exchangeApplyOrderId("exchange_apply_order_id", "exchangeApplyOrderId", "VARCHAR", false),
+        userId("user_id", "userId", "BIGINT", false),
+        itemId("item_id", "itemId", "BIGINT", false),
+        itemNum("item_num", "itemNum", "INTEGER", false),
+        targetUserId("target_user_id", "targetUserId", "BIGINT", false),
+        targetItemId("target_item_id", "targetItemId", "BIGINT", false),
+        targetItemNum("target_item_num", "targetItemNum", "INTEGER", false),
+        createTime("create_time", "createTime", "TIMESTAMP", false),
+        updateTime("update_time", "updateTime", "TIMESTAMP", false),
+        isValid("is_valid", "isValid", "BIT", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String BEGINNING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private static final String ENDING_DELIMITER = "`";
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String column;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final boolean isColumnNameDelimited;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String javaProperty;
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private final String jdbcType;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String value() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getValue() {
+            return this.column;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJavaProperty() {
+            return this.javaProperty;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getJdbcType() {
+            return this.jdbcType;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
+            this.column = column;
+            this.javaProperty = javaProperty;
+            this.jdbcType = jdbcType;
+            this.isColumnNameDelimited = isColumnNameDelimited;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String desc() {
+            return this.getEscapedColumnName() + " DESC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String asc() {
+            return this.getEscapedColumnName() + " ASC";
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public static Column[] excludes(Column ... excludes) {
+            ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
+            if (excludes != null && excludes.length > 0) {
+                columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
+            }
+            return columns.toArray(new Column[]{});
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public String getEscapedColumnName() {
+            if (this.isColumnNameDelimited) {
+                return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
+            } else {
+                return this.column;
+            }
+        }
+    }
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/ExchangeApplyOrderDetailExample.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ExchangeApplyOrderDetailExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ExchangeApplyOrderDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public ExchangeApplyOrderDetailExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public ExchangeApplyOrderDetailExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static Criteria newAndCreateCriteria() {
+        ExchangeApplyOrderDetailExample example = new ExchangeApplyOrderDetailExample();
+        return example.createCriteria();
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdIsNull() {
+            addCriterion("exchange_apply_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdIsNotNull() {
+            addCriterion("exchange_apply_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdEqualTo(String value) {
+            addCriterion("exchange_apply_order_id =", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotEqualTo(String value) {
+            addCriterion("exchange_apply_order_id <>", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdGreaterThan(String value) {
+            addCriterion("exchange_apply_order_id >", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("exchange_apply_order_id >=", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdLessThan(String value) {
+            addCriterion("exchange_apply_order_id <", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("exchange_apply_order_id <=", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdLike(String value) {
+            addCriterion("exchange_apply_order_id like", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotLike(String value) {
+            addCriterion("exchange_apply_order_id not like", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdIn(List<String> values) {
+            addCriterion("exchange_apply_order_id in", values, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotIn(List<String> values) {
+            addCriterion("exchange_apply_order_id not in", values, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdBetween(String value1, String value2) {
+            addCriterion("exchange_apply_order_id between", value1, value2, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotBetween(String value1, String value2) {
+            addCriterion("exchange_apply_order_id not between", value1, value2, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("user_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("user_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("user_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("user_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("user_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("user_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdIsNull() {
+            addCriterion("item_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdIsNotNull() {
+            addCriterion("item_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdEqualTo(Long value) {
+            addCriterion("item_id =", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdNotEqualTo(Long value) {
+            addCriterion("item_id <>", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdGreaterThan(Long value) {
+            addCriterion("item_id >", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("item_id >=", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdLessThan(Long value) {
+            addCriterion("item_id <", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdLessThanOrEqualTo(Long value) {
+            addCriterion("item_id <=", value, "itemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdIn(List<Long> values) {
+            addCriterion("item_id in", values, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdNotIn(List<Long> values) {
+            addCriterion("item_id not in", values, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdBetween(Long value1, Long value2) {
+            addCriterion("item_id between", value1, value2, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemIdNotBetween(Long value1, Long value2) {
+            addCriterion("item_id not between", value1, value2, "itemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumIsNull() {
+            addCriterion("item_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumIsNotNull() {
+            addCriterion("item_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumEqualTo(Integer value) {
+            addCriterion("item_num =", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumNotEqualTo(Integer value) {
+            addCriterion("item_num <>", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumGreaterThan(Integer value) {
+            addCriterion("item_num >", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("item_num >=", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumLessThan(Integer value) {
+            addCriterion("item_num <", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumLessThanOrEqualTo(Integer value) {
+            addCriterion("item_num <=", value, "itemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemNumLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("item_num <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumIn(List<Integer> values) {
+            addCriterion("item_num in", values, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumNotIn(List<Integer> values) {
+            addCriterion("item_num not in", values, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumBetween(Integer value1, Integer value2) {
+            addCriterion("item_num between", value1, value2, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andItemNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("item_num not between", value1, value2, "itemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdIsNull() {
+            addCriterion("target_user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdIsNotNull() {
+            addCriterion("target_user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdEqualTo(Long value) {
+            addCriterion("target_user_id =", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_user_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdNotEqualTo(Long value) {
+            addCriterion("target_user_id <>", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_user_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdGreaterThan(Long value) {
+            addCriterion("target_user_id >", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_user_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("target_user_id >=", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_user_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdLessThan(Long value) {
+            addCriterion("target_user_id <", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_user_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("target_user_id <=", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_user_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdIn(List<Long> values) {
+            addCriterion("target_user_id in", values, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdNotIn(List<Long> values) {
+            addCriterion("target_user_id not in", values, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdBetween(Long value1, Long value2) {
+            addCriterion("target_user_id between", value1, value2, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("target_user_id not between", value1, value2, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdIsNull() {
+            addCriterion("target_item_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdIsNotNull() {
+            addCriterion("target_item_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdEqualTo(Long value) {
+            addCriterion("target_item_id =", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdNotEqualTo(Long value) {
+            addCriterion("target_item_id <>", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdGreaterThan(Long value) {
+            addCriterion("target_item_id >", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("target_item_id >=", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdLessThan(Long value) {
+            addCriterion("target_item_id <", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdLessThanOrEqualTo(Long value) {
+            addCriterion("target_item_id <=", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdIn(List<Long> values) {
+            addCriterion("target_item_id in", values, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdNotIn(List<Long> values) {
+            addCriterion("target_item_id not in", values, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdBetween(Long value1, Long value2) {
+            addCriterion("target_item_id between", value1, value2, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdNotBetween(Long value1, Long value2) {
+            addCriterion("target_item_id not between", value1, value2, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumIsNull() {
+            addCriterion("target_item_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumIsNotNull() {
+            addCriterion("target_item_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumEqualTo(Integer value) {
+            addCriterion("target_item_num =", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_num = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumNotEqualTo(Integer value) {
+            addCriterion("target_item_num <>", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_num <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumGreaterThan(Integer value) {
+            addCriterion("target_item_num >", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_num > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("target_item_num >=", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_num >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumLessThan(Integer value) {
+            addCriterion("target_item_num <", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_num < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumLessThanOrEqualTo(Integer value) {
+            addCriterion("target_item_num <=", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("target_item_num <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumIn(List<Integer> values) {
+            addCriterion("target_item_num in", values, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumNotIn(List<Integer> values) {
+            addCriterion("target_item_num not in", values, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumBetween(Integer value1, Integer value2) {
+            addCriterion("target_item_num between", value1, value2, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("target_item_num not between", value1, value2, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("create_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("update_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("update_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("update_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("update_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("update_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("update_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidIsNull() {
+            addCriterion("is_valid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidIsNotNull() {
+            addCriterion("is_valid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidEqualTo(Boolean value) {
+            addCriterion("is_valid =", value, "isValid");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsValidEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_valid = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidNotEqualTo(Boolean value) {
+            addCriterion("is_valid <>", value, "isValid");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsValidNotEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_valid <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidGreaterThan(Boolean value) {
+            addCriterion("is_valid >", value, "isValid");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsValidGreaterThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_valid > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_valid >=", value, "isValid");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsValidGreaterThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_valid >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidLessThan(Boolean value) {
+            addCriterion("is_valid <", value, "isValid");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsValidLessThanColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_valid < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_valid <=", value, "isValid");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIsValidLessThanOrEqualToColumn(ExchangeApplyOrderDetail.Column column) {
+            addCriterion(new StringBuilder("is_valid <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidIn(List<Boolean> values) {
+            addCriterion("is_valid in", values, "isValid");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidNotIn(List<Boolean> values) {
+            addCriterion("is_valid not in", values, "isValid");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_valid between", value1, value2, "isValid");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsValidNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_valid not between", value1, value2, "isValid");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private ExchangeApplyOrderDetailExample example;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        protected Criteria(ExchangeApplyOrderDetailExample example) {
+            super();
+            this.example = example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public ExchangeApplyOrderDetailExample example() {
+            return this.example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
+            if (ifAdd) {
+                add.add(this);
+            }
+            return this;
+        }
+
+        /**
+         * This interface was generated by MyBatis Generator.
+         * This interface corresponds to the database table exchange_apply_order_detail
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public interface ICriteriaAdd {
+            /**
+             * This method was generated by MyBatis Generator.
+             * This method corresponds to the database table exchange_apply_order_detail
+             *
+             * @mbg.generated
+             * @project https://github.com/itfsw/mybatis-generator-plugin
+             */
+            Criteria add(Criteria add);
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/ExchangeApplyOrderExample.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ExchangeApplyOrderExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ExchangeApplyOrderExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public ExchangeApplyOrderExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public ExchangeApplyOrderExample orderBy(String ... orderByClauses) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < orderByClauses.length; i++) {
+            sb.append(orderByClauses[i]);
+            if (i < orderByClauses.length - 1) {
+                sb.append(" , ");
+            }
+        }
+        this.setOrderByClause(sb.toString());
+        return this;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria(this);
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static Criteria newAndCreateCriteria() {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        return example.createCriteria();
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdIsNull() {
+            addCriterion("exchange_apply_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdIsNotNull() {
+            addCriterion("exchange_apply_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdEqualTo(String value) {
+            addCriterion("exchange_apply_order_id =", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotEqualTo(String value) {
+            addCriterion("exchange_apply_order_id <>", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdGreaterThan(String value) {
+            addCriterion("exchange_apply_order_id >", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("exchange_apply_order_id >=", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdLessThan(String value) {
+            addCriterion("exchange_apply_order_id <", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("exchange_apply_order_id <=", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andExchangeApplyOrderIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("exchange_apply_order_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdLike(String value) {
+            addCriterion("exchange_apply_order_id like", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotLike(String value) {
+            addCriterion("exchange_apply_order_id not like", value, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdIn(List<String> values) {
+            addCriterion("exchange_apply_order_id in", values, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotIn(List<String> values) {
+            addCriterion("exchange_apply_order_id not in", values, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdBetween(String value1, String value2) {
+            addCriterion("exchange_apply_order_id between", value1, value2, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeApplyOrderIdNotBetween(String value1, String value2) {
+            addCriterion("exchange_apply_order_id not between", value1, value2, "exchangeApplyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdIsNull() {
+            addCriterion("target_user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdIsNotNull() {
+            addCriterion("target_user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdEqualTo(Long value) {
+            addCriterion("target_user_id =", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdNotEqualTo(Long value) {
+            addCriterion("target_user_id <>", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdGreaterThan(Long value) {
+            addCriterion("target_user_id >", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("target_user_id >=", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdLessThan(Long value) {
+            addCriterion("target_user_id <", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("target_user_id <=", value, "targetUserId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdIn(List<Long> values) {
+            addCriterion("target_user_id in", values, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdNotIn(List<Long> values) {
+            addCriterion("target_user_id not in", values, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdBetween(Long value1, Long value2) {
+            addCriterion("target_user_id between", value1, value2, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("target_user_id not between", value1, value2, "targetUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdIsNull() {
+            addCriterion("target_item_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdIsNotNull() {
+            addCriterion("target_item_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdEqualTo(Long value) {
+            addCriterion("target_item_id =", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdNotEqualTo(Long value) {
+            addCriterion("target_item_id <>", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdGreaterThan(Long value) {
+            addCriterion("target_item_id >", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("target_item_id >=", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdLessThan(Long value) {
+            addCriterion("target_item_id <", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdLessThanOrEqualTo(Long value) {
+            addCriterion("target_item_id <=", value, "targetItemId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdIn(List<Long> values) {
+            addCriterion("target_item_id in", values, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdNotIn(List<Long> values) {
+            addCriterion("target_item_id not in", values, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdBetween(Long value1, Long value2) {
+            addCriterion("target_item_id between", value1, value2, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemIdNotBetween(Long value1, Long value2) {
+            addCriterion("target_item_id not between", value1, value2, "targetItemId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumIsNull() {
+            addCriterion("target_item_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumIsNotNull() {
+            addCriterion("target_item_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumEqualTo(Integer value) {
+            addCriterion("target_item_num =", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_num = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumNotEqualTo(Integer value) {
+            addCriterion("target_item_num <>", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_num <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumGreaterThan(Integer value) {
+            addCriterion("target_item_num >", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_num > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("target_item_num >=", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_num >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumLessThan(Integer value) {
+            addCriterion("target_item_num <", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_num < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumLessThanOrEqualTo(Integer value) {
+            addCriterion("target_item_num <=", value, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetItemNumLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_item_num <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumIn(List<Integer> values) {
+            addCriterion("target_item_num in", values, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumNotIn(List<Integer> values) {
+            addCriterion("target_item_num not in", values, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumBetween(Integer value1, Integer value2) {
+            addCriterion("target_item_num between", value1, value2, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetItemNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("target_item_num not between", value1, value2, "targetItemNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("create_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("create_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("create_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("create_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("create_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("create_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("update_time = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("update_time <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("update_time > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("update_time >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("update_time < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("update_time <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("`state` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("`state` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Integer value) {
+            addCriterion("`state` =", value, "state");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("`state` = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Integer value) {
+            addCriterion("`state` <>", value, "state");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("`state` <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Integer value) {
+            addCriterion("`state` >", value, "state");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("`state` > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`state` >=", value, "state");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("`state` >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Integer value) {
+            addCriterion("`state` <", value, "state");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("`state` < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Integer value) {
+            addCriterion("`state` <=", value, "state");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("`state` <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Integer> values) {
+            addCriterion("`state` in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Integer> values) {
+            addCriterion("`state` not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Integer value1, Integer value2) {
+            addCriterion("`state` between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Integer value1, Integer value2) {
+            addCriterion("`state` not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdIsNull() {
+            addCriterion("user_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdIsNotNull() {
+            addCriterion("user_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdEqualTo(String value) {
+            addCriterion("user_order_id =", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserOrderIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_order_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdNotEqualTo(String value) {
+            addCriterion("user_order_id <>", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserOrderIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_order_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdGreaterThan(String value) {
+            addCriterion("user_order_id >", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserOrderIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_order_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_order_id >=", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserOrderIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_order_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdLessThan(String value) {
+            addCriterion("user_order_id <", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserOrderIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_order_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("user_order_id <=", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUserOrderIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("user_order_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdLike(String value) {
+            addCriterion("user_order_id like", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdNotLike(String value) {
+            addCriterion("user_order_id not like", value, "userOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdIn(List<String> values) {
+            addCriterion("user_order_id in", values, "userOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdNotIn(List<String> values) {
+            addCriterion("user_order_id not in", values, "userOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdBetween(String value1, String value2) {
+            addCriterion("user_order_id between", value1, value2, "userOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserOrderIdNotBetween(String value1, String value2) {
+            addCriterion("user_order_id not between", value1, value2, "userOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdIsNull() {
+            addCriterion("target_user_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdIsNotNull() {
+            addCriterion("target_user_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdEqualTo(String value) {
+            addCriterion("target_user_order_id =", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserOrderIdEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_order_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdNotEqualTo(String value) {
+            addCriterion("target_user_order_id <>", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserOrderIdNotEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_order_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdGreaterThan(String value) {
+            addCriterion("target_user_order_id >", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserOrderIdGreaterThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_order_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("target_user_order_id >=", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserOrderIdGreaterThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_order_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdLessThan(String value) {
+            addCriterion("target_user_order_id <", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserOrderIdLessThanColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_order_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("target_user_order_id <=", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andTargetUserOrderIdLessThanOrEqualToColumn(ExchangeApplyOrder.Column column) {
+            addCriterion(new StringBuilder("target_user_order_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdLike(String value) {
+            addCriterion("target_user_order_id like", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdNotLike(String value) {
+            addCriterion("target_user_order_id not like", value, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdIn(List<String> values) {
+            addCriterion("target_user_order_id in", values, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdNotIn(List<String> values) {
+            addCriterion("target_user_order_id not in", values, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdBetween(String value1, String value2) {
+            addCriterion("target_user_order_id between", value1, value2, "targetUserOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetUserOrderIdNotBetween(String value1, String value2) {
+            addCriterion("target_user_order_id not between", value1, value2, "targetUserOrderId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private ExchangeApplyOrderExample example;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        protected Criteria(ExchangeApplyOrderExample example) {
+            super();
+            this.example = example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public ExchangeApplyOrderExample example() {
+            return this.example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIf(boolean ifAdd, ICriteriaAdd add) {
+            if (ifAdd) {
+                add.add(this);
+            }
+            return this;
+        }
+
+        /**
+         * This interface was generated by MyBatis Generator.
+         * This interface corresponds to the database table exchange_apply_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public interface ICriteriaAdd {
+            /**
+             * This method was generated by MyBatis Generator.
+             * This method corresponds to the database table exchange_apply_order
+             *
+             * @mbg.generated
+             * @project https://github.com/itfsw/mybatis-generator-plugin
+             */
+            Criteria add(Criteria add);
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ItemSimpleDto.java → ch-dao/src/main/java/com/wwdz/ch/db/dto/request/ItemSimpleDto.java

-package com.wwdz.ch.wx.entity.request;
+package com.wwdz.ch.db.dto.request;
 
 import com.xxdxxs.entity.Entity;
 import lombok.Data;

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java

@@ -230,6 +230,16 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
      */
     private String estimatedPrice;
 
+    /**
+     * 用于同步数据到es
+     */
+    private Date startUpdateTime;
+
+    /**
+     * 用于同步数据到es
+     */
+    private Date endUpdateTime;
+
 
     /**
      * 收藏标签id

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/exchange/ExchangeApplyOrderRequestDto.java

+package com.wwdz.ch.db.dto.request.exchange;
+
+import com.wwdz.ch.db.dto.request.BaseRequestDto;
+import com.wwdz.ch.db.dto.request.ItemSimpleDto;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ExchangeApplyOrderRequestDto extends BaseRequestDto implements Entity {
+
+    /**
+     * 申请交换单
+     */
+    private String exchangeAppluOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户用来交换的商品
+     */
+    private List<ItemSimpleDto> itemList;
+
+    /**
+     * 目标用户id
+     */
+    private Long targetUserId;
+
+    /**
+     * 目标商品id
+     */
+    private Long targetItemId;
+
+    /**
+     * 目标商品数量
+     */
+    private Integer targetItemNum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态0未处理1同意2拒绝
+     */
+    private Integer state;
+
+    /**
+     * 用户订单号
+     */
+    private String userOrderId;
+
+    /**
+     * 目标用户订单号
+     */
+    private String targetUserOrderId;
+
+    /**
+     * 1同意2拒绝
+     */
+    private Integer isAgree;
+}

ch-dao/src/main/java/com/wwdz/ch/db/es/ItemEsDao.java

@@ -12,6 +12,7 @@ import co.elastic.clients.json.JsonData;
 import com.wwdz.ch.db.bean.EsPageInfo;
 import com.wwdz.ch.db.bean.ItemOfEs;
 import com.wwdz.ch.db.domain.Item;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
 import com.wwdz.ch.db.dto.request.EsSearchRequestDto;
 import com.xxdxxs.utils.DateUtils;
@@ -107,9 +108,9 @@ public class ItemEsDao {
                 Query cidQuery = TermQuery.of(t->t.field("cid").value(esSearchRequestDto.getCid()))._toQuery();
                 build.filter(cidQuery);
             }
-            //只查询权限为公开的商品
+          /*  //只查询权限为公开的商品
             Query viewPermissionQuery = TermQuery.of(t->t.field("viewPermission").value(0))._toQuery();
-            build.filter(viewPermissionQuery);
+            build.filter(viewPermissionQuery);*/
 
             if(StringUtils.hasLength(esSearchRequestDto.getContent())) {
                 Query matchQuery = MatchQuery.of(m -> m
@@ -274,14 +275,14 @@ public class ItemEsDao {
     }
 
 
-    public void create(List<Item> itemList) {
+    public void create(List<SupplierItem> supplierItemList) {
         // 批量添加数据
         List<BulkOperation> opts = new ArrayList<>();
-        for (Item item : itemList) {
-            CreateOperation<Item> optObj = new CreateOperation.Builder<Item>()
+        for (SupplierItem supplierItem : supplierItemList) {
+            CreateOperation<SupplierItem> optObj = new CreateOperation.Builder<SupplierItem>()
                     .index(INDEX)
-                    .id(String.valueOf(item.getId()))
-                    .document(item)
+                    .id(String.valueOf(supplierItem.getId()))
+                    .document(supplierItem)
                     .build();
             BulkOperation opt = new BulkOperation.Builder()
                     .create(optObj)
@@ -303,24 +304,24 @@ public class ItemEsDao {
 
     /**
      * 更新或创建
-     * @param item
+     * @param supplierItem
      */
-    public void upsert(Item item) {
+    public void upsert(SupplierItem supplierItem) {
         try {
             IndexRequest indexRequest = new IndexRequest.Builder()
                     .index(INDEX)
-                    .id(String.valueOf(item.getId()))
-                    .document(item)
+                    .id(String.valueOf(supplierItem.getId()))
+                    .document(supplierItem)
                     .build();
             IndexResponse indexResponse = elasticsearchClient.index(indexRequest);
             logger.info("indexResponse ={}", indexResponse);
             if (indexResponse.shards().successful().intValue() == 1 ) {
-                logger.info("ES upsert 数据成功 : {} ", item.getId());
+                logger.info("ES upsert 数据成功 : {} ", supplierItem.getId());
             } else {
-                logger.error("ES upsert 数据失败 : {} ", item.getId());
+                logger.error("ES upsert 数据失败 : {} ", supplierItem.getId());
             }
         } catch (IOException e) {
-            logger.info("ES upsert 数据 content :{}  error" , item.getId(), e);
+            logger.info("ES upsert 数据 content :{}  error" , supplierItem.getId(), e);
         }
     }
 

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributionOrderDetailDaoImpl.java

+package com.wwdz.ch.db.impl.distribution;
+
+import com.wwdz.ch.db.dao.distribution.DistributionOrderDetailDao;
+import com.wwdz.ch.db.domain.distribution.DistributionOrderDetail;
+import com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample;
+import com.wwdz.ch.db.mapper.distribution.DistributionOrderDetailMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Repository
+public class DistributionOrderDetailDaoImpl implements DistributionOrderDetailDao {
+
+    @Autowired
+    DistributionOrderDetailMapper distributionOrderDetailMapper;
+
+
+    @Override
+    public int insert(DistributionOrderDetail distributionOrderDetail) {
+        distributionOrderDetail.setCreateTime(new Date());
+        return distributionOrderDetailMapper.insert(distributionOrderDetail);
+    }
+
+    @Override
+    public List<DistributionOrderDetail> findByOrderId(String orderId) {
+        DistributionOrderDetailExample example = new DistributionOrderDetailExample();
+        DistributionOrderDetailExample.Criteria criteria = example.createCriteria();
+        criteria.andDistributionOrderIdEqualTo(orderId);
+        return distributionOrderDetailMapper.selectByExampleWithBLOBs(example);
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -2,8 +2,11 @@ package com.wwdz.ch.db.impl.distribution;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.domain.Item;
+import com.wwdz.ch.db.domain.ItemExample;
 import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.domain.distribution.SupplierItemExample;
+import com.wwdz.ch.db.dto.request.CoinRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.wwdz.ch.db.mapper.distribution.SupplierItemMapper;
 import com.xxdxxs.db.component.JdbcHelper;
@@ -282,4 +285,17 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return supplierItemMapper.selectByExampleSelective(supplierItemExample, SupplierItem.Column.id);
     }
+
+
+    @Override
+    public List<SupplierItem> findListByPage(SupplierItemRequestDto dto) {
+        SupplierItemExample example = new SupplierItemExample();
+        SupplierItemExample.Criteria criteria = example.createCriteria();
+        example.setOrderByClause("create_time asc");
+        JdbcHelper.ifPresent(dto.getStartUpdateTime(), criteria::andUpdateTimeGreaterThan);
+        JdbcHelper.ifPresent(dto.getEndUpdateTime(), criteria::andUpdateTimeLessThanOrEqualTo);
+        JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        return supplierItemMapper.selectByExampleWithBLOBs(example);
+    }
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/exchange/ExchangeApplyOrderDaoImpl.java

+package com.wwdz.ch.db.impl.exchange;
+
+import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+import com.wwdz.ch.db.mapper.distribution.ExchangeApplyOrderMapper;
+import com.xxdxxs.db.component.JdbcHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public class ExchangeApplyOrderDaoImpl implements ExchangeApplyOrderDao {
+
+    @Autowired
+    ExchangeApplyOrderMapper exchangeApplyOrderMapper;
+
+
+    @Override
+    public int insert(ExchangeApplyOrder exchangeApplyOrder) {
+        return exchangeApplyOrderMapper.insert(exchangeApplyOrder);
+    }
+
+    @Override
+    public List<ExchangeApplyOrder> findByPage(ExchangeApplyOrderRequestDto dto) {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        ExchangeApplyOrderExample.Criteria criteria = example.createCriteria();
+        JdbcHelper.ifPresent(dto.getExchangeAppluOrderId(), criteria::andExchangeApplyOrderIdEqualTo);
+        JdbcHelper.ifPresent(dto.getUserId(), criteria::andUserIdEqualTo);
+        JdbcHelper.ifPresent(dto.getTargetUserId(), criteria::andTargetUserIdEqualTo);
+        JdbcHelper.ifPresent(dto.getState(), criteria::andStateEqualTo);
+        example.setOrderByClause(" update_time desc");
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        return exchangeApplyOrderMapper.selectByExample(example);
+    }
+
+
+    @Override
+    public ExchangeApplyOrder findByOrderId(String orderId) {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        ExchangeApplyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andExchangeApplyOrderIdEqualTo(orderId);
+        return exchangeApplyOrderMapper.selectOneByExample(example);
+    }
+
+    @Override
+    public long countPreHandleOrderOfCommit(long userId) {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        ExchangeApplyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(userId);
+        criteria.andStateEqualTo(0);
+        return exchangeApplyOrderMapper.countByExample(example);
+    }
+
+    @Override
+    public long countPreHandleOrderOfReceive(long targetUserId) {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        ExchangeApplyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andTargetUserIdEqualTo(targetUserId);
+        criteria.andStateEqualTo(0);
+        return exchangeApplyOrderMapper.countByExample(example);
+    }
+
+    @Override
+    public int update(ExchangeApplyOrder exchangeApplyOrder) {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        ExchangeApplyOrderExample.Criteria criteria = example.createCriteria();
+        return exchangeApplyOrderMapper.updateByExampleSelective(exchangeApplyOrder, example);
+    }
+
+
+    @Override
+    public int updateState(String orderId, int state) {
+        ExchangeApplyOrderExample example = new ExchangeApplyOrderExample();
+        ExchangeApplyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andExchangeApplyOrderIdEqualTo(orderId);
+        ExchangeApplyOrder exchangeApplyOrder = new ExchangeApplyOrder();
+        exchangeApplyOrder.setState(state);
+        exchangeApplyOrder.setUpdateTime(new Date());
+        return exchangeApplyOrderMapper.updateByExampleSelective(exchangeApplyOrder, example);
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/impl/exchange/ExchangeApplyOrderDetailDaoImpl.java

+package com.wwdz.ch.db.impl.exchange;
+
+import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDetailDao;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetailExample;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample;
+import com.wwdz.ch.db.mapper.distribution.ExchangeApplyOrderDetailMapper;
+import com.xxdxxs.db.component.JdbcHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public class ExchangeApplyOrderDetailDaoImpl implements ExchangeApplyOrderDetailDao {
+
+    @Autowired
+    ExchangeApplyOrderDetailMapper exchangeApplyOrderDetailMapper;
+
+
+    @Override
+    public int insert(ExchangeApplyOrderDetail exchangeApplyOrderDetail) {
+        return exchangeApplyOrderDetailMapper.insert(exchangeApplyOrderDetail);
+    }
+
+    @Override
+    public List<ExchangeApplyOrderDetail> findByOrderId(String orderId) {
+        ExchangeApplyOrderDetailExample example = new ExchangeApplyOrderDetailExample();
+        ExchangeApplyOrderDetailExample.Criteria criteria = example.createCriteria();
+        criteria.andExchangeApplyOrderIdEqualTo(orderId);
+        return exchangeApplyOrderDetailMapper.selectByExample(example);
+    }
+
+    @Override
+    public boolean updateInValid(String orderId) {
+        ExchangeApplyOrderDetailExample example = new ExchangeApplyOrderDetailExample();
+        ExchangeApplyOrderDetailExample.Criteria criteria = example.createCriteria();
+        criteria.andExchangeApplyOrderIdEqualTo(orderId);
+        ExchangeApplyOrderDetail exchangeApplyOrderDetail = new ExchangeApplyOrderDetail();
+        exchangeApplyOrderDetail.setIsValid(false);
+        exchangeApplyOrderDetail.setUpdateTime(new Date());
+        return exchangeApplyOrderDetailMapper.updateByExampleSelective(exchangeApplyOrderDetail, example) > 0;
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/mapper/distribution/DistributionOrderDetailMapper.java

+package com.wwdz.ch.db.mapper.distribution;
+
+import com.wwdz.ch.db.domain.distribution.DistributionOrderDetail;
+import com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DistributionOrderDetailMapper {
+    long countByExample(DistributionOrderDetailExample example);
+
+    int deleteByExample(DistributionOrderDetailExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(DistributionOrderDetail record);
+
+    int insertSelective(DistributionOrderDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DistributionOrderDetail selectOneByExample(DistributionOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DistributionOrderDetail selectOneByExampleSelective(@Param("example") DistributionOrderDetailExample example, @Param("selective") DistributionOrderDetail.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DistributionOrderDetail selectOneByExampleWithBLOBs(DistributionOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    List<DistributionOrderDetail> selectByExampleSelective(@Param("example") DistributionOrderDetailExample example, @Param("selective") DistributionOrderDetail.Column ... selective);
+
+    List<DistributionOrderDetail> selectByExampleWithBLOBs(DistributionOrderDetailExample example);
+
+    List<DistributionOrderDetail> selectByExample(DistributionOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table distribution_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    DistributionOrderDetail selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") DistributionOrderDetail.Column ... selective);
+
+    DistributionOrderDetail selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") DistributionOrderDetail record, @Param("example") DistributionOrderDetailExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") DistributionOrderDetail record, @Param("example") DistributionOrderDetailExample example);
+
+    int updateByExample(@Param("record") DistributionOrderDetail record, @Param("example") DistributionOrderDetailExample example);
+
+    int updateByPrimaryKeySelective(DistributionOrderDetail record);
+
+    int updateByPrimaryKeyWithBLOBs(DistributionOrderDetail record);
+
+    int updateByPrimaryKey(DistributionOrderDetail record);
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/mapper/distribution/ExchangeApplyOrderDetailMapper.java

+package com.wwdz.ch.db.mapper.distribution;
+
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetailExample;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ExchangeApplyOrderDetailMapper {
+    long countByExample(ExchangeApplyOrderDetailExample example);
+
+    int deleteByExample(ExchangeApplyOrderDetailExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ExchangeApplyOrderDetail record);
+
+    int insertSelective(ExchangeApplyOrderDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    ExchangeApplyOrderDetail selectOneByExample(ExchangeApplyOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    ExchangeApplyOrderDetail selectOneByExampleSelective(@Param("example") ExchangeApplyOrderDetailExample example, @Param("selective") ExchangeApplyOrderDetail.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    List<ExchangeApplyOrderDetail> selectByExampleSelective(@Param("example") ExchangeApplyOrderDetailExample example, @Param("selective") ExchangeApplyOrderDetail.Column ... selective);
+
+    List<ExchangeApplyOrderDetail> selectByExample(ExchangeApplyOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order_detail
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    ExchangeApplyOrderDetail selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") ExchangeApplyOrderDetail.Column ... selective);
+
+    ExchangeApplyOrderDetail selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") ExchangeApplyOrderDetail record, @Param("example") ExchangeApplyOrderDetailExample example);
+
+    int updateByExample(@Param("record") ExchangeApplyOrderDetail record, @Param("example") ExchangeApplyOrderDetailExample example);
+
+    int updateByPrimaryKeySelective(ExchangeApplyOrderDetail record);
+
+    int updateByPrimaryKey(ExchangeApplyOrderDetail record);
+}
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/mapper/distribution/ExchangeApplyOrderMapper.java

+package com.wwdz.ch.db.mapper.distribution;
+
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ExchangeApplyOrderMapper {
+    long countByExample(ExchangeApplyOrderExample example);
+
+    int deleteByExample(ExchangeApplyOrderExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ExchangeApplyOrder record);
+
+    int insertSelective(ExchangeApplyOrder record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    ExchangeApplyOrder selectOneByExample(ExchangeApplyOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    ExchangeApplyOrder selectOneByExampleSelective(@Param("example") ExchangeApplyOrderExample example, @Param("selective") ExchangeApplyOrder.Column ... selective);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    List<ExchangeApplyOrder> selectByExampleSelective(@Param("example") ExchangeApplyOrderExample example, @Param("selective") ExchangeApplyOrder.Column ... selective);
+
+    List<ExchangeApplyOrder> selectByExample(ExchangeApplyOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table exchange_apply_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    ExchangeApplyOrder selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") ExchangeApplyOrder.Column ... selective);
+
+    ExchangeApplyOrder selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") ExchangeApplyOrder record, @Param("example") ExchangeApplyOrderExample example);
+
+    int updateByExample(@Param("record") ExchangeApplyOrder record, @Param("example") ExchangeApplyOrderExample example);
+
+    int updateByPrimaryKeySelective(ExchangeApplyOrder record);
+
+    int updateByPrimaryKey(ExchangeApplyOrder record);
+}
\ No newline at end of file

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/DistributionOrderDetailMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wwdz.ch.db.mapper.distribution.DistributionOrderDetailMapper">
+  <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="distribution_order_id" jdbcType="VARCHAR" property="distributionOrderId" />
+    <result column="buyer_id" jdbcType="BIGINT" property="buyerId" />
+    <result column="item_id" jdbcType="BIGINT" property="itemId" />
+    <result column="item_num" jdbcType="INTEGER" property="itemNum" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="seller_id" jdbcType="BIGINT" property="sellerId" />
+    <result column="is_on_sale" jdbcType="BIT" property="isOnSale" />
+    <result column="top_image" jdbcType="VARCHAR" property="topImage" />
+    <result column="distribution_price" jdbcType="BIGINT" property="distributionPrice" />
+    <result column="supply_price" jdbcType="BIGINT" property="supplyPrice" />
+    <result column="official_estimated_price" jdbcType="BIGINT" property="officialEstimatedPrice" />
+    <result column="stock" jdbcType="INTEGER" property="stock" />
+    <result column="buy_limit_num" jdbcType="INTEGER" property="buyLimitNum" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="item_name" jdbcType="VARCHAR" property="itemName" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    <result column="images" jdbcType="LONGVARCHAR" property="images" />
+    <result column="videos" jdbcType="LONGVARCHAR" property="videos" />
+    <result column="description" jdbcType="LONGVARCHAR" property="description" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, distribution_order_id, buyer_id, item_id, item_num, `type`, create_time, seller_id, 
+    is_on_sale, top_image, distribution_price, supply_price, official_estimated_price, 
+    stock, buy_limit_num, creator_id, item_name
+  </sql>
+  <sql id="Blob_Column_List">
+    images, videos, description
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExampleSelective" parameterType="map" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <if test="example.distinct">
+      distinct
+    </if>
+    <choose>
+      <when test="selective != null and selective.length > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, distribution_order_id, buyer_id, item_id, item_num, `type`, create_time, seller_id, 
+          is_on_sale, top_image, distribution_price, supply_price, official_estimated_price, 
+          stock, buy_limit_num, creator_id, item_name, images, videos, description
+      </otherwise>
+    </choose>
+    from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from distribution_order_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    <choose>
+      <when test="selective != null and selective.length > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, distribution_order_id, buyer_id, item_id, item_num, `type`, create_time, seller_id, 
+          is_on_sale, top_image, distribution_price, supply_price, official_estimated_price, 
+          stock, buy_limit_num, creator_id, item_name, images, videos, description
+      </otherwise>
+    </choose>
+    from distribution_order_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from distribution_order_detail
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample">
+    delete from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into distribution_order_detail (distribution_order_id, buyer_id, item_id, 
+      item_num, `type`, create_time, 
+      seller_id, is_on_sale, top_image, 
+      distribution_price, supply_price, official_estimated_price, 
+      stock, buy_limit_num, creator_id, 
+      item_name, images, videos, 
+      description)
+    values (#{distributionOrderId,jdbcType=VARCHAR}, #{buyerId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT}, 
+      #{itemNum,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{sellerId,jdbcType=BIGINT}, #{isOnSale,jdbcType=BIT}, #{topImage,jdbcType=VARCHAR}, 
+      #{distributionPrice,jdbcType=BIGINT}, #{supplyPrice,jdbcType=BIGINT}, #{officialEstimatedPrice,jdbcType=BIGINT}, 
+      #{stock,jdbcType=INTEGER}, #{buyLimitNum,jdbcType=INTEGER}, #{creatorId,jdbcType=BIGINT}, 
+      #{itemName,jdbcType=VARCHAR}, #{images,jdbcType=LONGVARCHAR}, #{videos,jdbcType=LONGVARCHAR}, 
+      #{description,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into distribution_order_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="distributionOrderId != null">
+        distribution_order_id,
+      </if>
+      <if test="buyerId != null">
+        buyer_id,
+      </if>
+      <if test="itemId != null">
+        item_id,
+      </if>
+      <if test="itemNum != null">
+        item_num,
+      </if>
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="sellerId != null">
+        seller_id,
+      </if>
+      <if test="isOnSale != null">
+        is_on_sale,
+      </if>
+      <if test="topImage != null">
+        top_image,
+      </if>
+      <if test="distributionPrice != null">
+        distribution_price,
+      </if>
+      <if test="supplyPrice != null">
+        supply_price,
+      </if>
+      <if test="officialEstimatedPrice != null">
+        official_estimated_price,
+      </if>
+      <if test="stock != null">
+        stock,
+      </if>
+      <if test="buyLimitNum != null">
+        buy_limit_num,
+      </if>
+      <if test="creatorId != null">
+        creator_id,
+      </if>
+      <if test="itemName != null">
+        item_name,
+      </if>
+      <if test="images != null">
+        images,
+      </if>
+      <if test="videos != null">
+        videos,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="distributionOrderId != null">
+        #{distributionOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="buyerId != null">
+        #{buyerId,jdbcType=BIGINT},
+      </if>
+      <if test="itemId != null">
+        #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="itemNum != null">
+        #{itemNum,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sellerId != null">
+        #{sellerId,jdbcType=BIGINT},
+      </if>
+      <if test="isOnSale != null">
+        #{isOnSale,jdbcType=BIT},
+      </if>
+      <if test="topImage != null">
+        #{topImage,jdbcType=VARCHAR},
+      </if>
+      <if test="distributionPrice != null">
+        #{distributionPrice,jdbcType=BIGINT},
+      </if>
+      <if test="supplyPrice != null">
+        #{supplyPrice,jdbcType=BIGINT},
+      </if>
+      <if test="officialEstimatedPrice != null">
+        #{officialEstimatedPrice,jdbcType=BIGINT},
+      </if>
+      <if test="stock != null">
+        #{stock,jdbcType=INTEGER},
+      </if>
+      <if test="buyLimitNum != null">
+        #{buyLimitNum,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        #{creatorId,jdbcType=BIGINT},
+      </if>
+      <if test="itemName != null">
+        #{itemName,jdbcType=VARCHAR},
+      </if>
+      <if test="images != null">
+        #{images,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="videos != null">
+        #{videos,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample" resultType="java.lang.Long">
+    select count(*) from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update distribution_order_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.distributionOrderId != null">
+        distribution_order_id = #{record.distributionOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.buyerId != null">
+        buyer_id = #{record.buyerId,jdbcType=BIGINT},
+      </if>
+      <if test="record.itemId != null">
+        item_id = #{record.itemId,jdbcType=BIGINT},
+      </if>
+      <if test="record.itemNum != null">
+        item_num = #{record.itemNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null">
+        `type` = #{record.type,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sellerId != null">
+        seller_id = #{record.sellerId,jdbcType=BIGINT},
+      </if>
+      <if test="record.isOnSale != null">
+        is_on_sale = #{record.isOnSale,jdbcType=BIT},
+      </if>
+      <if test="record.topImage != null">
+        top_image = #{record.topImage,jdbcType=VARCHAR},
+      </if>
+      <if test="record.distributionPrice != null">
+        distribution_price = #{record.distributionPrice,jdbcType=BIGINT},
+      </if>
+      <if test="record.supplyPrice != null">
+        supply_price = #{record.supplyPrice,jdbcType=BIGINT},
+      </if>
+      <if test="record.officialEstimatedPrice != null">
+        official_estimated_price = #{record.officialEstimatedPrice,jdbcType=BIGINT},
+      </if>
+      <if test="record.stock != null">
+        stock = #{record.stock,jdbcType=INTEGER},
+      </if>
+      <if test="record.buyLimitNum != null">
+        buy_limit_num = #{record.buyLimitNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.creatorId != null">
+        creator_id = #{record.creatorId,jdbcType=BIGINT},
+      </if>
+      <if test="record.itemName != null">
+        item_name = #{record.itemName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.images != null">
+        images = #{record.images,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.videos != null">
+        videos = #{record.videos,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update distribution_order_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      distribution_order_id = #{record.distributionOrderId,jdbcType=VARCHAR},
+      buyer_id = #{record.buyerId,jdbcType=BIGINT},
+      item_id = #{record.itemId,jdbcType=BIGINT},
+      item_num = #{record.itemNum,jdbcType=INTEGER},
+      `type` = #{record.type,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      seller_id = #{record.sellerId,jdbcType=BIGINT},
+      is_on_sale = #{record.isOnSale,jdbcType=BIT},
+      top_image = #{record.topImage,jdbcType=VARCHAR},
+      distribution_price = #{record.distributionPrice,jdbcType=BIGINT},
+      supply_price = #{record.supplyPrice,jdbcType=BIGINT},
+      official_estimated_price = #{record.officialEstimatedPrice,jdbcType=BIGINT},
+      stock = #{record.stock,jdbcType=INTEGER},
+      buy_limit_num = #{record.buyLimitNum,jdbcType=INTEGER},
+      creator_id = #{record.creatorId,jdbcType=BIGINT},
+      item_name = #{record.itemName,jdbcType=VARCHAR},
+      images = #{record.images,jdbcType=LONGVARCHAR},
+      videos = #{record.videos,jdbcType=LONGVARCHAR},
+      description = #{record.description,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update distribution_order_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      distribution_order_id = #{record.distributionOrderId,jdbcType=VARCHAR},
+      buyer_id = #{record.buyerId,jdbcType=BIGINT},
+      item_id = #{record.itemId,jdbcType=BIGINT},
+      item_num = #{record.itemNum,jdbcType=INTEGER},
+      `type` = #{record.type,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      seller_id = #{record.sellerId,jdbcType=BIGINT},
+      is_on_sale = #{record.isOnSale,jdbcType=BIT},
+      top_image = #{record.topImage,jdbcType=VARCHAR},
+      distribution_price = #{record.distributionPrice,jdbcType=BIGINT},
+      supply_price = #{record.supplyPrice,jdbcType=BIGINT},
+      official_estimated_price = #{record.officialEstimatedPrice,jdbcType=BIGINT},
+      stock = #{record.stock,jdbcType=INTEGER},
+      buy_limit_num = #{record.buyLimitNum,jdbcType=INTEGER},
+      creator_id = #{record.creatorId,jdbcType=BIGINT},
+      item_name = #{record.itemName,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    update distribution_order_detail
+    <set>
+      <if test="distributionOrderId != null">
+        distribution_order_id = #{distributionOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="buyerId != null">
+        buyer_id = #{buyerId,jdbcType=BIGINT},
+      </if>
+      <if test="itemId != null">
+        item_id = #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="itemNum != null">
+        item_num = #{itemNum,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sellerId != null">
+        seller_id = #{sellerId,jdbcType=BIGINT},
+      </if>
+      <if test="isOnSale != null">
+        is_on_sale = #{isOnSale,jdbcType=BIT},
+      </if>
+      <if test="topImage != null">
+        top_image = #{topImage,jdbcType=VARCHAR},
+      </if>
+      <if test="distributionPrice != null">
+        distribution_price = #{distributionPrice,jdbcType=BIGINT},
+      </if>
+      <if test="supplyPrice != null">
+        supply_price = #{supplyPrice,jdbcType=BIGINT},
+      </if>
+      <if test="officialEstimatedPrice != null">
+        official_estimated_price = #{officialEstimatedPrice,jdbcType=BIGINT},
+      </if>
+      <if test="stock != null">
+        stock = #{stock,jdbcType=INTEGER},
+      </if>
+      <if test="buyLimitNum != null">
+        buy_limit_num = #{buyLimitNum,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        creator_id = #{creatorId,jdbcType=BIGINT},
+      </if>
+      <if test="itemName != null">
+        item_name = #{itemName,jdbcType=VARCHAR},
+      </if>
+      <if test="images != null">
+        images = #{images,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="videos != null">
+        videos = #{videos,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    update distribution_order_detail
+    set distribution_order_id = #{distributionOrderId,jdbcType=VARCHAR},
+      buyer_id = #{buyerId,jdbcType=BIGINT},
+      item_id = #{itemId,jdbcType=BIGINT},
+      item_num = #{itemNum,jdbcType=INTEGER},
+      `type` = #{type,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      seller_id = #{sellerId,jdbcType=BIGINT},
+      is_on_sale = #{isOnSale,jdbcType=BIT},
+      top_image = #{topImage,jdbcType=VARCHAR},
+      distribution_price = #{distributionPrice,jdbcType=BIGINT},
+      supply_price = #{supplyPrice,jdbcType=BIGINT},
+      official_estimated_price = #{officialEstimatedPrice,jdbcType=BIGINT},
+      stock = #{stock,jdbcType=INTEGER},
+      buy_limit_num = #{buyLimitNum,jdbcType=INTEGER},
+      creator_id = #{creatorId,jdbcType=BIGINT},
+      item_name = #{itemName,jdbcType=VARCHAR},
+      images = #{images,jdbcType=LONGVARCHAR},
+      videos = #{videos,jdbcType=LONGVARCHAR},
+      description = #{description,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetail">
+    update distribution_order_detail
+    set distribution_order_id = #{distributionOrderId,jdbcType=VARCHAR},
+      buyer_id = #{buyerId,jdbcType=BIGINT},
+      item_id = #{itemId,jdbcType=BIGINT},
+      item_num = #{itemNum,jdbcType=INTEGER},
+      `type` = #{type,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      seller_id = #{sellerId,jdbcType=BIGINT},
+      is_on_sale = #{isOnSale,jdbcType=BIT},
+      top_image = #{topImage,jdbcType=VARCHAR},
+      distribution_price = #{distributionPrice,jdbcType=BIGINT},
+      supply_price = #{supplyPrice,jdbcType=BIGINT},
+      official_estimated_price = #{officialEstimatedPrice,jdbcType=BIGINT},
+      stock = #{stock,jdbcType=INTEGER},
+      buy_limit_num = #{buyLimitNum,jdbcType=INTEGER},
+      creator_id = #{creatorId,jdbcType=BIGINT},
+      item_name = #{itemName,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    limit 1
+  </select>
+  <select id="selectOneByExampleWithBLOBs" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderDetailExample" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    limit 1
+  </select>
+  <select id="selectOneByExampleSelective" parameterType="map" resultMap="ResultMapWithBLOBs">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <choose>
+      <when test="selective != null and selective.length > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, distribution_order_id, buyer_id, item_id, item_num, `type`, create_time, seller_id, 
+          is_on_sale, top_image, distribution_price, supply_price, official_estimated_price, 
+          stock, buy_limit_num, creator_id, item_name, images, videos, description
+      </otherwise>
+    </choose>
+    from distribution_order_detail
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+    limit 1
+  </select>
+</mapper>
\ No newline at end of file

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/DistributionOrderMapper.xml

@@ -35,6 +35,7 @@
     <result column="introducer_id" jdbcType="BIGINT" property="introducerId" />
     <result column="channel_amount" jdbcType="BIGINT" property="channelAmount" />
     <result column="channel_rebate" jdbcType="DECIMAL" property="channelRebate" />
+    <result column="is_multiple" jdbcType="BIT" property="isMultiple" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -100,7 +101,7 @@
     receiver_address, logistics_code, waybill, create_time, pay_time, delivery_time, 
     signed_time, finish_time, update_time, share_record_id, `state`, logistics_state, 
     `type`, supply_price, introduce_amount, introduce_rebate, introducer_id, channel_amount, 
-    channel_rebate
+    channel_rebate, is_multiple
   </sql>
   <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderExample" resultMap="BaseResultMap">
     select
@@ -140,7 +141,7 @@
           receiver_address, logistics_code, waybill, create_time, pay_time, delivery_time, 
           signed_time, finish_time, update_time, share_record_id, `state`, logistics_state, 
           `type`, supply_price, introduce_amount, introduce_rebate, introducer_id, channel_amount, 
-          channel_rebate
+          channel_rebate, is_multiple
       </otherwise>
     </choose>
     from distribution_order
@@ -176,7 +177,7 @@
           receiver_address, logistics_code, waybill, create_time, pay_time, delivery_time, 
           signed_time, finish_time, update_time, share_record_id, `state`, logistics_state, 
           `type`, supply_price, introduce_amount, introduce_rebate, introducer_id, channel_amount, 
-          channel_rebate
+          channel_rebate, is_multiple
       </otherwise>
     </choose>
     from distribution_order
@@ -206,7 +207,8 @@
       update_time, share_record_id, `state`, 
       logistics_state, `type`, supply_price, 
       introduce_amount, introduce_rebate, introducer_id, 
-      channel_amount, channel_rebate)
+      channel_amount, channel_rebate, is_multiple
+      )
     values (#{distributionOrderId,jdbcType=VARCHAR}, #{prepayId,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, 
       #{itemId,jdbcType=BIGINT}, #{itemNum,jdbcType=INTEGER}, #{buyerId,jdbcType=BIGINT}, 
       #{buyerOpenid,jdbcType=VARCHAR}, #{shopId,jdbcType=BIGINT}, #{sellerId,jdbcType=BIGINT}, 
@@ -217,7 +219,8 @@
       #{updateTime,jdbcType=TIMESTAMP}, #{shareRecordId,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, 
       #{logisticsState,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{supplyPrice,jdbcType=BIGINT}, 
       #{introduceAmount,jdbcType=BIGINT}, #{introduceRebate,jdbcType=DECIMAL}, #{introducerId,jdbcType=BIGINT}, 
-      #{channelAmount,jdbcType=BIGINT}, #{channelRebate,jdbcType=DECIMAL})
+      #{channelAmount,jdbcType=BIGINT}, #{channelRebate,jdbcType=DECIMAL}, #{isMultiple,jdbcType=BIT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrder">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -321,6 +324,9 @@
       <if test="channelRebate != null">
         channel_rebate,
       </if>
+      <if test="isMultiple != null">
+        is_multiple,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="distributionOrderId != null">
@@ -419,6 +425,9 @@
       <if test="channelRebate != null">
         #{channelRebate,jdbcType=DECIMAL},
       </if>
+      <if test="isMultiple != null">
+        #{isMultiple,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderExample" resultType="java.lang.Long">
@@ -529,6 +538,9 @@
       <if test="record.channelRebate != null">
         channel_rebate = #{record.channelRebate,jdbcType=DECIMAL},
       </if>
+      <if test="record.isMultiple != null">
+        is_multiple = #{record.isMultiple,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -568,7 +580,8 @@
       introduce_rebate = #{record.introduceRebate,jdbcType=DECIMAL},
       introducer_id = #{record.introducerId,jdbcType=BIGINT},
       channel_amount = #{record.channelAmount,jdbcType=BIGINT},
-      channel_rebate = #{record.channelRebate,jdbcType=DECIMAL}
+      channel_rebate = #{record.channelRebate,jdbcType=DECIMAL},
+      is_multiple = #{record.isMultiple,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -672,6 +685,9 @@
       <if test="channelRebate != null">
         channel_rebate = #{channelRebate,jdbcType=DECIMAL},
       </if>
+      <if test="isMultiple != null">
+        is_multiple = #{isMultiple,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -708,7 +724,8 @@
       introduce_rebate = #{introduceRebate,jdbcType=DECIMAL},
       introducer_id = #{introducerId,jdbcType=BIGINT},
       channel_amount = #{channelAmount,jdbcType=BIGINT},
-      channel_rebate = #{channelRebate,jdbcType=DECIMAL}
+      channel_rebate = #{channelRebate,jdbcType=DECIMAL},
+      is_multiple = #{isMultiple,jdbcType=BIT}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.DistributionOrderExample" resultMap="BaseResultMap">
@@ -749,7 +766,7 @@
           receiver_address, logistics_code, waybill, create_time, pay_time, delivery_time, 
           signed_time, finish_time, update_time, share_record_id, `state`, logistics_state, 
           `type`, supply_price, introduce_amount, introduce_rebate, introducer_id, channel_amount, 
-          channel_rebate
+          channel_rebate, is_multiple
       </otherwise>
     </choose>
     from distribution_order

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/ExchangeApplyOrderDetailMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wwdz.ch.db.mapper.distribution.ExchangeApplyOrderDetailMapper">
+  <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="exchange_apply_order_id" jdbcType="VARCHAR" property="exchangeApplyOrderId" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="item_id" jdbcType="BIGINT" property="itemId" />
+    <result column="item_num" jdbcType="INTEGER" property="itemNum" />
+    <result column="target_user_id" jdbcType="BIGINT" property="targetUserId" />
+    <result column="target_item_id" jdbcType="BIGINT" property="targetItemId" />
+    <result column="target_item_num" jdbcType="INTEGER" property="targetItemNum" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="is_valid" jdbcType="BIT" property="isValid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, exchange_apply_order_id, user_id, item_id, item_num, target_user_id, target_item_id, 
+    target_item_num, create_time, update_time, is_valid
+  </sql>
+  <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetailExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from exchange_apply_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExampleSelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <if test="example.distinct">
+      distinct
+    </if>
+    <choose>
+      <when test="selective != null and selective.length > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, exchange_apply_order_id, user_id, item_id, item_num, target_user_id, target_item_id, 
+          target_item_num, create_time, update_time, is_valid
+      </otherwise>
+    </choose>
+    from exchange_apply_order_detail
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from exchange_apply_order_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    <choose>
+      <when test="selective != null and selective.length > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, exchange_apply_order_id, user_id, item_id, item_num, target_user_id, target_item_id, 
+          target_item_num, create_time, update_time, is_valid
+      </otherwise>
+    </choose>
+    from exchange_apply_order_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from exchange_apply_order_detail
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetailExample">
+    delete from exchange_apply_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into exchange_apply_order_detail (exchange_apply_order_id, user_id, item_id, 
+      item_num, target_user_id, target_item_id, 
+      target_item_num, create_time, update_time, 
+      is_valid)
+    values (#{exchangeApplyOrderId,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT}, 
+      #{itemNum,jdbcType=INTEGER}, #{targetUserId,jdbcType=BIGINT}, #{targetItemId,jdbcType=BIGINT}, 
+      #{targetItemNum,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{isValid,jdbcType=BIT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into exchange_apply_order_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="exchangeApplyOrderId != null">
+        exchange_apply_order_id,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="itemId != null">
+        item_id,
+      </if>
+      <if test="itemNum != null">
+        item_num,
+      </if>
+      <if test="targetUserId != null">
+        target_user_id,
+      </if>
+      <if test="targetItemId != null">
+        target_item_id,
+      </if>
+      <if test="targetItemNum != null">
+        target_item_num,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="isValid != null">
+        is_valid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="exchangeApplyOrderId != null">
+        #{exchangeApplyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="itemId != null">
+        #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="itemNum != null">
+        #{itemNum,jdbcType=INTEGER},
+      </if>
+      <if test="targetUserId != null">
+        #{targetUserId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemId != null">
+        #{targetItemId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemNum != null">
+        #{targetItemNum,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isValid != null">
+        #{isValid,jdbcType=BIT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetailExample" resultType="java.lang.Long">
+    select count(*) from exchange_apply_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update exchange_apply_order_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.exchangeApplyOrderId != null">
+        exchange_apply_order_id = #{record.exchangeApplyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
+      <if test="record.itemId != null">
+        item_id = #{record.itemId,jdbcType=BIGINT},
+      </if>
+      <if test="record.itemNum != null">
+        item_num = #{record.itemNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.targetUserId != null">
+        target_user_id = #{record.targetUserId,jdbcType=BIGINT},
+      </if>
+      <if test="record.targetItemId != null">
+        target_item_id = #{record.targetItemId,jdbcType=BIGINT},
+      </if>
+      <if test="record.targetItemNum != null">
+        target_item_num = #{record.targetItemNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isValid != null">
+        is_valid = #{record.isValid,jdbcType=BIT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update exchange_apply_order_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      exchange_apply_order_id = #{record.exchangeApplyOrderId,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=BIGINT},
+      item_id = #{record.itemId,jdbcType=BIGINT},
+      item_num = #{record.itemNum,jdbcType=INTEGER},
+      target_user_id = #{record.targetUserId,jdbcType=BIGINT},
+      target_item_id = #{record.targetItemId,jdbcType=BIGINT},
+      target_item_num = #{record.targetItemNum,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      is_valid = #{record.isValid,jdbcType=BIT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail">
+    update exchange_apply_order_detail
+    <set>
+      <if test="exchangeApplyOrderId != null">
+        exchange_apply_order_id = #{exchangeApplyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="itemId != null">
+        item_id = #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="itemNum != null">
+        item_num = #{itemNum,jdbcType=INTEGER},
+      </if>
+      <if test="targetUserId != null">
+        target_user_id = #{targetUserId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemId != null">
+        target_item_id = #{targetItemId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemNum != null">
+        target_item_num = #{targetItemNum,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isValid != null">
+        is_valid = #{isValid,jdbcType=BIT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetail">
+    update exchange_apply_order_detail
+    set exchange_apply_order_id = #{exchangeApplyOrderId,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=BIGINT},
+      item_id = #{itemId,jdbcType=BIGINT},
+      item_num = #{itemNum,jdbcType=INTEGER},
+      target_user_id = #{targetUserId,jdbcType=BIGINT},
+      target_item_id = #{targetItemId,jdbcType=BIGINT},
+      target_item_num = #{targetItemNum,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      is_valid = #{isValid,jdbcType=BIT}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderDetailExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from exchange_apply_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    limit 1
+  </select>
+  <select id="selectOneByExampleSelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <choose>
+      <when test="selective != null and selective.length > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, exchange_apply_order_id, user_id, item_id, item_num, target_user_id, target_item_id, 
+          target_item_num, create_time, update_time, is_valid
+      </otherwise>
+    </choose>
+    from exchange_apply_order_detail
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+    limit 1
+  </select>
+</mapper>
\ No newline at end of file

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/ExchangeApplyOrderMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wwdz.ch.db.mapper.distribution.ExchangeApplyOrderMapper">
+  <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="exchange_apply_order_id" jdbcType="VARCHAR" property="exchangeApplyOrderId" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="target_user_id" jdbcType="BIGINT" property="targetUserId" />
+    <result column="target_item_id" jdbcType="BIGINT" property="targetItemId" />
+    <result column="target_item_num" jdbcType="INTEGER" property="targetItemNum" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="user_order_id" jdbcType="VARCHAR" property="userOrderId" />
+    <result column="target_user_order_id" jdbcType="VARCHAR" property="targetUserOrderId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, exchange_apply_order_id, user_id, target_user_id, target_item_id, target_item_num, 
+    create_time, update_time, `state`, user_order_id, target_user_order_id
+  </sql>
+  <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from exchange_apply_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExampleSelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <if test="example.distinct">
+      distinct
+    </if>
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, exchange_apply_order_id, user_id, target_user_id, target_item_id, target_item_num, 
+          create_time, update_time, `state`, user_order_id, target_user_order_id
+      </otherwise>
+    </choose>
+    from exchange_apply_order
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from exchange_apply_order
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, exchange_apply_order_id, user_id, target_user_id, target_item_id, target_item_num, 
+          create_time, update_time, `state`, user_order_id, target_user_order_id
+      </otherwise>
+    </choose>
+    from exchange_apply_order
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from exchange_apply_order
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample">
+    delete from exchange_apply_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into exchange_apply_order (exchange_apply_order_id, user_id, target_user_id, 
+      target_item_id, target_item_num, create_time, 
+      update_time, `state`, user_order_id, 
+      target_user_order_id)
+    values (#{exchangeApplyOrderId,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{targetUserId,jdbcType=BIGINT}, 
+      #{targetItemId,jdbcType=BIGINT}, #{targetItemNum,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{userOrderId,jdbcType=VARCHAR}, 
+      #{targetUserOrderId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into exchange_apply_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="exchangeApplyOrderId != null">
+        exchange_apply_order_id,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="targetUserId != null">
+        target_user_id,
+      </if>
+      <if test="targetItemId != null">
+        target_item_id,
+      </if>
+      <if test="targetItemNum != null">
+        target_item_num,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="state != null">
+        `state`,
+      </if>
+      <if test="userOrderId != null">
+        user_order_id,
+      </if>
+      <if test="targetUserOrderId != null">
+        target_user_order_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="exchangeApplyOrderId != null">
+        #{exchangeApplyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="targetUserId != null">
+        #{targetUserId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemId != null">
+        #{targetItemId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemNum != null">
+        #{targetItemNum,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="userOrderId != null">
+        #{userOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="targetUserOrderId != null">
+        #{targetUserOrderId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample" resultType="java.lang.Long">
+    select count(*) from exchange_apply_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update exchange_apply_order
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.exchangeApplyOrderId != null">
+        exchange_apply_order_id = #{record.exchangeApplyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
+      <if test="record.targetUserId != null">
+        target_user_id = #{record.targetUserId,jdbcType=BIGINT},
+      </if>
+      <if test="record.targetItemId != null">
+        target_item_id = #{record.targetItemId,jdbcType=BIGINT},
+      </if>
+      <if test="record.targetItemNum != null">
+        target_item_num = #{record.targetItemNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.state != null">
+        `state` = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.userOrderId != null">
+        user_order_id = #{record.userOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.targetUserOrderId != null">
+        target_user_order_id = #{record.targetUserOrderId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update exchange_apply_order
+    set id = #{record.id,jdbcType=INTEGER},
+      exchange_apply_order_id = #{record.exchangeApplyOrderId,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=BIGINT},
+      target_user_id = #{record.targetUserId,jdbcType=BIGINT},
+      target_item_id = #{record.targetItemId,jdbcType=BIGINT},
+      target_item_num = #{record.targetItemNum,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      `state` = #{record.state,jdbcType=INTEGER},
+      user_order_id = #{record.userOrderId,jdbcType=VARCHAR},
+      target_user_order_id = #{record.targetUserOrderId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder">
+    update exchange_apply_order
+    <set>
+      <if test="exchangeApplyOrderId != null">
+        exchange_apply_order_id = #{exchangeApplyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
+      <if test="targetUserId != null">
+        target_user_id = #{targetUserId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemId != null">
+        target_item_id = #{targetItemId,jdbcType=BIGINT},
+      </if>
+      <if test="targetItemNum != null">
+        target_item_num = #{targetItemNum,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null">
+        `state` = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="userOrderId != null">
+        user_order_id = #{userOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="targetUserOrderId != null">
+        target_user_order_id = #{targetUserOrderId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder">
+    update exchange_apply_order
+    set exchange_apply_order_id = #{exchangeApplyOrderId,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=BIGINT},
+      target_user_id = #{targetUserId,jdbcType=BIGINT},
+      target_item_id = #{targetItemId,jdbcType=BIGINT},
+      target_item_num = #{targetItemNum,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      `state` = #{state,jdbcType=INTEGER},
+      user_order_id = #{userOrderId,jdbcType=VARCHAR},
+      target_user_order_id = #{targetUserOrderId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.ExchangeApplyOrderExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from exchange_apply_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    limit 1
+  </select>
+  <select id="selectOneByExampleSelective" parameterType="map" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      @project https://github.com/itfsw/mybatis-generator-plugin
+    -->
+    select
+    'true' as QUERYID,
+    <choose>
+      <when test="selective != null and selective.length &gt; 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, exchange_apply_order_id, user_id, target_user_id, target_item_id, target_item_num, 
+          create_time, update_time, `state`, user_order_id, target_user_order_id
+      </otherwise>
+    </choose>
+    from exchange_apply_order
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+    <if test="example.orderByClause != null">
+      order by ${example.orderByClause}
+    </if>
+    limit 1
+  </select>
+</mapper>
\ No newline at end of file

ch-dao/src/main/resources/generatorConfig_new.xml

@@ -72,7 +72,7 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper.distribution"
                              targetProject="ch-dao/src/main/java"/>
 
-        <table tableName="exchange_order_snapshot" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+        <table tableName="distribution_order" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
             <generatedKey column="id" sqlStatement="Mysql" identity="true" />
         </table>
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ExchangeRequestDto.java

 package com.wwdz.ch.wx.entity.request;
 
 import com.wwdz.ch.db.dto.request.BaseRequestDto;
+import com.wwdz.ch.db.dto.request.ItemSimpleDto;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
@@ -27,6 +28,13 @@ public class ExchangeRequestDto extends BaseRequestDto implements Entity {
      */
     private Integer exchangeItemNum;
 
+    /**
+     * 被交换的商品数量
+     * 多个
+     * 当isMultiple=true
+     */
+    private List<ItemSimpleDto> exchangeItemList;
+
 
     private List<ItemSimpleDto> itemList;
 
@@ -76,4 +84,14 @@ public class ExchangeRequestDto extends BaseRequestDto implements Entity {
      */
     private Date signedTime;
 
+    /**
+     * 交换商品是否校验价格
+     */
+    private Boolean checkPrice = true;
+
+    /**
+     * 订单中是否包含多个商品
+     */
+    private Boolean isMultiple = false;
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/ExchangeApplyOrderServiceImpl.java

+package com.wwdz.ch.wx.impl.distribution;
+
+import com.wwdz.ch.core.consts.CommConsts;
+import com.wwdz.ch.core.consts.DistributionEnum;
+import com.wwdz.ch.core.consts.ExchangeApplyOrderEnum;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.CacheUtil;
+import com.wwdz.ch.core.util.IdUtils;
+import com.wwdz.ch.db.dao.distribution.ExchangeOrderSnapshotDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao;
+import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDetailDao;
+import com.wwdz.ch.db.domain.User;
+import com.wwdz.ch.db.domain.distribution.*;
+import com.wwdz.ch.db.dto.request.ItemSimpleDto;
+import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+import com.wwdz.ch.wx.entity.request.ExchangeRequestDto;
+import com.wwdz.ch.wx.service.distribution.ExchangeApplyOrderService;
+import com.wwdz.ch.wx.service.distribution.ExchangeService;
+import com.xxdxxs.utils.EntityMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class ExchangeApplyOrderServiceImpl implements ExchangeApplyOrderService {
+
+    private static final Logger logger = LoggerFactory.getLogger(DistributorProfitServiceImpl.class);
+
+    @Autowired
+    ExchangeApplyOrderDetailDao exchangeApplyOrderDetailDao;
+
+    @Autowired
+    ExchangeApplyOrderDao exchangeApplyOrderDao;
+
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
+    @Autowired
+    ExchangeOrderSnapshotDao exchangeOrderSnapshotDao;
+
+    @Autowired
+    ExchangeService exchangeService;
+
+    @Autowired
+    CacheUtil cacheUtil;
+
+    @Transactional
+    @Override
+    public Result applyExchange(ExchangeApplyOrderRequestDto dto) {
+        try {
+
+            SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+            supplierItemRequestDto.setCreatorId(dto.getUserId());
+            List<ExchangeOrderSnapshot> exchangeOrderSnapshotList = exchangeOrderSnapshotDao.findByUserId(dto.getUserId());
+            List<Long> filterItemList = exchangeOrderSnapshotList.stream().map(ExchangeOrderSnapshot::getItemId).distinct().collect(Collectors.toList());
+            supplierItemRequestDto.setFilterIds(filterItemList);
+            supplierItemRequestDto.setIsDeleted(false);
+            List<SupplierItem> supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
+            if (CollectionUtils.isEmpty(supplierItemList)) {
+                return Result.failed("请先上传藏品");
+            }
+            SupplierItem targetSupplierItem = supplierItemDao.findById(dto.getTargetItemId());
+            dto.setTargetUserId(targetSupplierItem.getCreatorId());
+            Date now = new Date();
+            ExchangeApplyOrder exchangeApplyOrder = new ExchangeApplyOrder();
+            String exchangeApplyOrderId = IdUtils.getOrderNumber(CommConsts.EXCHANGE_ORDER_PREFIX);
+            exchangeApplyOrder.setExchangeApplyOrderId(exchangeApplyOrderId);
+            exchangeApplyOrder.setUserId(dto.getUserId());
+            exchangeApplyOrder.setTargetUserId(dto.getTargetUserId());
+            exchangeApplyOrder.setTargetItemId(dto.getTargetItemId());
+            exchangeApplyOrder.setTargetItemNum(1);
+            exchangeApplyOrder.setCreateTime(now);
+            exchangeApplyOrder.setUpdateTime(now);
+            exchangeApplyOrder.setState(ExchangeApplyOrderEnum.StateEnum.PRE_HANDLE.getCode());
+            exchangeApplyOrderDao.insert(exchangeApplyOrder);
+            //交换单详情
+            List<ItemSimpleDto> itemSimpleDtoList = dto.getItemList();
+            //保存订单中用户交换商品快照
+            for (ItemSimpleDto itemSimpleDto : itemSimpleDtoList) {
+                ExchangeApplyOrderDetail exchangeApplyOrderDetail = new ExchangeApplyOrderDetail();
+                exchangeApplyOrderDetail.setExchangeApplyOrderId(exchangeApplyOrderId);
+                exchangeApplyOrderDetail.setUserId(dto.getUserId());
+                exchangeApplyOrderDetail.setItemId(itemSimpleDto.getItemId());
+                exchangeApplyOrderDetail.setItemNum(itemSimpleDto.getItemNum());
+                exchangeApplyOrderDetail.setTargetItemId(dto.getTargetItemId());
+                exchangeApplyOrderDetail.setTargetUserId(dto.getTargetUserId());
+                exchangeApplyOrderDetail.setTargetItemNum(1);
+                exchangeApplyOrderDetail.setIsValid(true);
+                exchangeApplyOrderDetail.setCreateTime(now);
+                exchangeApplyOrderDetail.setUpdateTime(now);
+                exchangeApplyOrderDetailDao.insert(exchangeApplyOrderDetail);
+            }
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("用户申请以物换物 error:{}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return Result.failed();
+    }
+
+
+    @Override
+    public Result handleApplyOrder(ExchangeApplyOrderRequestDto dto) {
+        try {
+            String orderId = dto.getExchangeAppluOrderId();
+            ExchangeApplyOrder exchangeApplyOrder = exchangeApplyOrderDao.findByOrderId(orderId);
+            if (ExchangeApplyOrderEnum.StateEnum.AGREE.getCode() == dto.getIsAgree()) {
+                //同意交换申请，则为交换双方创建订单
+                //为提交方创建订单
+                ExchangeRequestDto commitExchangeDto = new ExchangeRequestDto();
+                //无需校验官方价格
+                commitExchangeDto.setCheckPrice(false);
+                //按多个商品来处理
+                commitExchangeDto.setIsMultiple(true);
+                commitExchangeDto.setExchangeItemId(exchangeApplyOrder.getTargetItemId());
+                commitExchangeDto.setExchangeItemNum(exchangeApplyOrder.getTargetItemNum());
+                List<ItemSimpleDto> itemSimpleDtoList = new ArrayList<>();
+                //查询提交方的商品
+                List<ExchangeApplyOrderDetail> exchangeApplyOrderDetails = exchangeApplyOrderDetailDao.findByOrderId(orderId);
+                for (ExchangeApplyOrderDetail exchangeApplyOrderDetail : exchangeApplyOrderDetails) {
+                    ItemSimpleDto itemSimpleDto = new ItemSimpleDto();
+                    itemSimpleDto.setItemId(exchangeApplyOrderDetail.getItemId());
+                    itemSimpleDto.setItemNum(exchangeApplyOrderDetail.getItemNum());
+                    itemSimpleDtoList.add(itemSimpleDto);
+                }
+                commitExchangeDto.setItemList(itemSimpleDtoList);
+                commitExchangeDto.setUserId(exchangeApplyOrder.getUserId());
+                User user = cacheUtil.getAppletUserById(exchangeApplyOrder.getUserId());
+                commitExchangeDto.setUserOpenId(user.getWeixinOpenid());
+                Result commitExchangeOrderResult = exchangeService.exchange(commitExchangeDto);
+                if (!commitExchangeOrderResult.getSuccess()) {
+                    return Result.failed("创建交换订单失败");
+                }
+
+                //为受理方创建订单
+                ExchangeRequestDto receiveExchangeDto = new ExchangeRequestDto();
+                receiveExchangeDto.setIsMultiple(true);
+                //无需校验官方价格
+                receiveExchangeDto.setCheckPrice(false);
+
+                //受理方换来的商品
+                List<ItemSimpleDto> receiveExchangeItemSimpleDtoList = new ArrayList<>();
+                for (ExchangeApplyOrderDetail exchangeApplyOrderDetail : exchangeApplyOrderDetails) {
+                    ItemSimpleDto receiveExchangeItemSimpleDto = new ItemSimpleDto();
+                    receiveExchangeItemSimpleDto.setItemId(exchangeApplyOrderDetail.getItemId());
+                    receiveExchangeItemSimpleDto.setItemNum(exchangeApplyOrderDetail.getItemNum());
+                    receiveExchangeItemSimpleDtoList.add(receiveExchangeItemSimpleDto);
+                }
+                receiveExchangeDto.setExchangeItemList(receiveExchangeItemSimpleDtoList);
+
+                List<ItemSimpleDto> receiveItemSimpleDtoList = new ArrayList<>();
+                //查询受理方被换走的商品
+                ItemSimpleDto itemSimpleDto = new ItemSimpleDto();
+                itemSimpleDto.setItemId(exchangeApplyOrder.getTargetItemId());
+                itemSimpleDto.setItemNum(exchangeApplyOrder.getTargetItemNum());
+                receiveItemSimpleDtoList.add(itemSimpleDto);
+
+                receiveExchangeDto.setItemList(receiveItemSimpleDtoList);
+                receiveExchangeDto.setUserId(exchangeApplyOrder.getUserId());
+                User receiveUser = cacheUtil.getAppletUserById(exchangeApplyOrder.getTargetUserId());
+                commitExchangeDto.setUserOpenId(receiveUser.getWeixinOpenid());
+                Result receiveExchangeOrderResult = exchangeService.exchange(commitExchangeDto);
+                if (!receiveExchangeOrderResult.getSuccess()) {
+                    return Result.failed("创建交换订单失败");
+                }
+
+                ExchangeApplyOrder updateExchangeApplyOrder = new ExchangeApplyOrder();
+                updateExchangeApplyOrder.setExchangeApplyOrderId(orderId);
+                updateExchangeApplyOrder.setTargetUserOrderId(((Map)receiveExchangeOrderResult.getData()).get("distributionOrderId").toString());
+                updateExchangeApplyOrder.setUserOrderId(((Map)commitExchangeOrderResult.getData()).get("distributionOrderId").toString());
+
+            }
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("处理换物申请单 error:{}", e);
+        }
+        return Result.failed();
+    }
+
+    @Override
+    public Result cancel(ExchangeApplyOrderRequestDto dto) {
+        return null;
+    }
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/ExchangeServiceImpl.java

@@ -15,12 +15,10 @@ import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.distribution.*;
 import com.wwdz.ch.wx.constant.CollectionBookConstants;
 import com.wwdz.ch.wx.entity.request.ExchangeRequestDto;
-import com.wwdz.ch.wx.entity.request.ItemSimpleDto;
+import com.wwdz.ch.db.dto.request.ItemSimpleDto;
 import com.wwdz.ch.wx.service.distribution.ExchangeService;
 import com.wwdz.ch.wx.service.distribution.SupplierItemService;
 import com.xxdxxs.utils.EntityMapper;
-import com.xxdxxs.utils.StringUtils;
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +26,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -58,6 +58,9 @@ public class ExchangeServiceImpl implements ExchangeService {
     @Autowired
     SupplierItemService supplierItemService;
 
+    @Autowired
+    DistributionOrderDetailDao distributionOrderDetailDao;
+
     @Override
     public Result checkEnoughItem(ExchangeRequestDto dto) {
         try {
@@ -238,9 +241,11 @@ public class ExchangeServiceImpl implements ExchangeService {
                 SupplierItem userItem = supplierItemDao.findById(itemSimpleDto.getItemId());
                 userItemPrice = userItemPrice + userItem.getOfficialEstimatedPrice() * itemSimpleDto.getItemNum();
             }
+            if (dto.getCheckPrice()) {
                 if (exchangeItemPrice > userItemPrice) {
                     return Result.failed("您的藏品价格低于交换的商品价值，不支持换藏");
                 }
+            }
             //可以换藏，则创建订单
             String distributionOrderId = IdUtils.getOrderNumber(CommConsts.DISTRIBUTION_ORDER_PREFIX);
             DistributionOrder distributionOrder = new DistributionOrder();
@@ -259,10 +264,43 @@ public class ExchangeServiceImpl implements ExchangeService {
             distributionOrder.setCreateTime(new Date());
             distributionOrder.setUpdateTime(new Date());
             distributionOrder.setType(DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode());
+            distributionOrder.setIsMultiple(dto.getIsMultiple());
             //待换货状态
             distributionOrder.setState(DistributionEnum.DistributionOrderStateEnum.PRE_EXCHANGE.getCode());
             distributionOrderDao.insert(distributionOrder);
 
+            //商品信息保存在订单详情中
+            if (dto.getIsMultiple()) {
+                List<ItemSimpleDto> exchangeItemList = dto.getExchangeItemList();
+                for (ItemSimpleDto exchangeItemSimpleDto : exchangeItemList) {
+                    DistributionOrderDetail distributionOrderDetail = new DistributionOrderDetail();
+                    SupplierItem item = supplierItemDao.findById(exchangeItemSimpleDto.getItemId());
+                    EntityMapper.copyAttribute(item, distributionOrderDetail);
+                    distributionOrderDetail.setDistributionOrderId(distributionOrderId);
+                    distributionOrderDetail.setItemId(exchangeItemSimpleDto.getItemId());
+                    distributionOrderDetail.setItemNum(exchangeItemSimpleDto.getItemNum());
+                    distributionOrderDetail.setItemName(item.getName());
+                    distributionOrder.setBuyerId(dto.getUserId());
+                    distributionOrder.setSellerId(supplierItem.getCreatorId());
+                    distributionOrderDetailDao.insert(distributionOrderDetail);
+                    //减少库存
+                    supplierItemService.reduceStock(exchangeItemSimpleDto.getItemId(), exchangeItemSimpleDto.getItemNum());
+                }
+            } else {
+                DistributionOrderDetail distributionOrderDetail = new DistributionOrderDetail();
+                SupplierItem item = supplierItemDao.findById(exchangeItemId);
+                EntityMapper.copyAttribute(item, distributionOrderDetail);
+                distributionOrderDetail.setDistributionOrderId(distributionOrderId);
+                distributionOrderDetail.setItemId(exchangeItemId);
+                distributionOrderDetail.setItemNum(dto.getExchangeItemNum());
+                distributionOrderDetail.setItemName(item.getName());
+                distributionOrder.setBuyerId(dto.getUserId());
+                distributionOrder.setSellerId(supplierItem.getCreatorId());
+                distributionOrderDetailDao.insert(distributionOrderDetail);
+                supplierItemService.reduceStock(exchangeItemId, dto.getExchangeItemNum());
+            }
+
+
             //保存订单中用户交换商品快照
             for (ItemSimpleDto itemSimpleDto : itemSimpleDtoList) {
                 SupplierItem userItem = supplierItemDao.findById(itemSimpleDto.getItemId());
@@ -279,8 +317,7 @@ public class ExchangeServiceImpl implements ExchangeService {
                 exchangeOrderSnapshotDao.insert(exchangeOrderSnapshot);
                 supplierItemService.reduceStock(itemSimpleDto.getItemId(), itemSimpleDto.getItemNum());
             }
-            //减少库存
-            supplierItemService.reduceStock(exchangeItemId, dto.getExchangeItemNum());
+
 
             Map<String, Object> map = new HashMap<>();
             map.put("distributionOrderId", distributionOrderId);
@@ -293,6 +330,8 @@ public class ExchangeServiceImpl implements ExchangeService {
     }
 
 
+
+    @Transactional
     @Override
     public Result delivery(DistributionOrderRequestDto dto) {
         try {
@@ -308,9 +347,21 @@ public class ExchangeServiceImpl implements ExchangeService {
             exchangeOrderSnapshot.setWaybill(dto.getWaybill());
             exchangeOrderSnapshot.setDeliveryTime(new Date());
             exchangeOrderSnapshotDao.update(exchangeOrderSnapshot);
+
+            //保存用户收货地址
+            if (StringUtils.hasLength(dto.getReceiverAddress())) {
+                DistributionOrder updateOrderDto = new DistributionOrder();
+                updateOrderDto.setDistributionOrderId(distributionOrderId);
+                updateOrderDto.setAddressId(dto.getAddressId());
+                updateOrderDto.setReceiverAddress(dto.getReceiverAddress());
+                updateOrderDto.setReceiverName(dto.getReceiverName());
+                updateOrderDto.setReceiverPhone(dto.getReceiverPhone());
+                distributionOrderDao.update(distributionOrder);
+            }
             return Result.success();
         } catch (Exception e) {
             logger.info("用户换藏发货失败 error: {}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/ExchangeApplyOrderService.java

+package com.wwdz.ch.wx.service.distribution;
+
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+
+public interface ExchangeApplyOrderService {
+
+    /**
+     * 用户申请以物换物
+     * @param dto
+     * @return
+     */
+    Result applyExchange(ExchangeApplyOrderRequestDto dto);
+
+
+    /**
+     * 处理申请单
+     * @param dto
+     * @return
+     */
+    Result handleApplyOrder(ExchangeApplyOrderRequestDto dto);
+
+
+    /**
+     * 取消申请单
+     * @param dto
+     * @return
+     */
+    Result cancel(ExchangeApplyOrderRequestDto dto);
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/ExchangeService.java

@@ -36,6 +36,9 @@ public interface ExchangeService {
      */
     Result exchange(ExchangeRequestDto dto);
 
+
+
+
     /**
      * 用户换藏发货
      * @param dto

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/ExchangeApplyOrderController.java

+package com.wwdz.ch.wx.web.distribution;
+
+
+import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.domain.distribution.ExchangeApplyOrder;
+import com.wwdz.ch.db.dto.request.exchange.ExchangeApplyOrderRequestDto;
+import com.wwdz.ch.wx.entity.request.ExchangeRequestDto;
+import com.wwdz.ch.wx.service.distribution.ExchangeApplyOrderService;
+import com.xxdxxs.service.FormHandler;
+import com.xxdxxs.validation.Validator;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/wx/exchangeApplyOrder")
+public class ExchangeApplyOrderController {
+
+    private static final Logger logger = LoggerFactory.getLogger(ExchangeApplyOrderController.class);
+
+
+    @Autowired
+    ExchangeApplyOrderService exchangeApplyOrderService;
+
+
+    @ApiOperation(value = "用户申请以物换物")
+    @PostMapping("/checkEnoughItem")
+    public Result checkEnoughItem(@RequestBody ExchangeApplyOrderRequestDto dto) {
+        logger.info("用户申请以物换物,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("userId", "用户id").must().number()
+                .set("targetItemId", "想换的目标商品id").must().number()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return exchangeApplyOrderService.applyExchange(dto);
+    }
+
+
+    @ApiOperation(value = "同意申请")
+    @PostMapping("/agree")
+    public Result agree(@RequestBody ExchangeApplyOrderRequestDto dto) {
+        logger.info("用户申请以物换物,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("userId", "用户id").must().number()
+                .set("targetItemId", "想换的目标商品id").must().number()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return exchangeApplyOrderService.applyExchange(dto);
+    }
+
+}