查询图录

ch-admin-api/src/main/java/com/wwdz/ch/admin/config/ShiroConfig.java

@@ -122,6 +122,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/admin/supplierItem/**", "anon");
 		filterChainDefinitionMap.put("/admin/user/**", "anon");
 		filterChainDefinitionMap.put("/admin/sysDistributionOrder/**", "anon");
+		filterChainDefinitionMap.put("/admin/imageCatelog/**", "anon");
 
 		filterChainDefinitionMap.put("/admin/invitationCode/**", "anon");
 	//	filterChainDefinitionMap.put("/admin/**", "anon");

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

@@ -8,18 +8,19 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
+import com.wwdz.ch.admin.entity.request.DataPanelRequestDto;
 import com.wwdz.ch.admin.entity.vo.OrderAmtsVo;
 import com.wwdz.ch.admin.entity.vo.UserOrderCntVo;
 import com.wwdz.ch.admin.service.AdminDashbordService;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.bean.DayStatis;
@@ -35,10 +36,11 @@ public class AdminDashbordController {
 	@Autowired
 	private DtsUserDao userService;
 
-
 	@Autowired
 	AdminDashbordService adminDashbordService;
 
+
+
 	@GetMapping("")
 	public Object info() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName() + "] 系统管理->首页仪表盘查询");
@@ -140,4 +142,10 @@ public class AdminDashbordController {
 		return orderAmts;
 	}
 
+
+	@PostMapping("/dataPanel")
+	public Result dataPanel(@RequestBody DataPanelRequestDto dto) {
+		return adminDashbordService.dataPanel(dto);
+	}
+
 }

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

 package com.wwdz.ch.admin.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.admin.service.ImageCatelogDetailService;
 import com.wwdz.ch.admin.service.ImageCatelogService;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
@@ -22,10 +23,21 @@ public class ImageCatelogController {
     @Autowired
     ImageCatelogService imageCatelogService;
 
+    @Autowired
+    ImageCatelogDetailService imageCatelogDetailService;
+
     @ApiOperation(value = "查询图录列表")
     @PostMapping("/find")
-    public Result update(@RequestBody ImageCatelogRequestDto dto) {
+    public Result find(@RequestBody ImageCatelogRequestDto dto) {
         logger.info("查询图录列表,请求参数:{}", JSON.toJSONString(dto));
         return imageCatelogService.findList(dto);
     }
+
+
+    @ApiOperation(value = "查询图录内容")
+    @PostMapping("/findDetail")
+    public Result findDetailList(@RequestBody ImageCatelogRequestDto dto) {
+        logger.info("查询图录内容,请求参数:{}", JSON.toJSONString(dto));
+        return imageCatelogDetailService.findDetailList(dto);
+    }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/request/DataPanelRequestDto.java

+package com.wwdz.ch.admin.entity.request;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+@Data
+public class DataPanelRequestDto implements Entity {
+
+    private String startTime;
+
+    private String endTime;
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/DataPanelVo.java

+package com.wwdz.ch.admin.entity.vo;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class DataPanelVo implements Entity {
+
+    /**
+     * 访问用户数
+     */
+    private Integer visitNum;
+
+    /**
+     * 打开次数
+     */
+    private Integer openNum;
+
+    /**
+     * 新增注册用户数
+     */
+    private Integer newUserNum;
+
+    /**
+     * 新增藏品数
+     */
+    private Integer newItemNum;
+
+    /**
+     * 藏馆订单
+     */
+    private Map<String, Object> collectOrderData;
+
+    /**
+     * 分销订单
+     */
+    private Map<String, Object> distributionOrderData;
+
+
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminDashbordServiceImpl.java

 package com.wwdz.ch.admin.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.wwdz.ch.admin.controller.AdminDashbordController;
+import com.wwdz.ch.admin.entity.request.DataPanelRequestDto;
+import com.wwdz.ch.admin.entity.vo.DataPanelVo;
 import com.wwdz.ch.admin.service.AdminDashbordService;
+import com.wwdz.ch.core.api.WxAppletApi;
+import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.ItemDao;
+import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.dao.dts.DtsUserDao;
+import com.wwdz.ch.db.dto.request.distribution.CollectionShareRecordRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.xxdxxs.utils.DateUtils;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TimeZone;
 
 
 @Service
@@ -24,6 +43,14 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
     @Autowired
     private ItemDao itemDao;
 
+    @Autowired
+    WxAppletApi wxAppletApi;
+
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
+    @Autowired
+    DistributionOrderDao distributionOrderDao;
 
     @Override
     public Object info() {
@@ -37,4 +64,49 @@ public class AdminDashbordServiceImpl implements AdminDashbordService {
         //	data.put("productTotal", productTotal);
         return data;
     }
+
+    @Override
+    public Result dataPanel(DataPanelRequestDto dto) {
+        try {
+            LocalDate localDate = LocalDate.parse(dto.getStartTime());
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+            String formattedDate = localDate.format(formatter);
+            DataPanelVo dataPanelVo = new DataPanelVo();
+            //查询小程序访问数据
+            Result result = wxAppletApi.getAccessData(formattedDate, formattedDate, 1);
+            if (result.getSuccess()) {
+                Map<String, Integer> map = (Map<String, Integer>) result.getData();
+                dataPanelVo.setVisitNum(map.get("visitUv"));
+                dataPanelVo.setOpenNum(map.get("sessionCnt"));
+                dataPanelVo.setNewUserNum(map.get("visitUvNew"));
+            }
+            //查询新增藏品数量
+            SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
+            Date startTime = DateUtils.parseString(dto.getStartTime());
+            Date endTime = DateUtil.endOfDay(startTime);
+            supplierItemRequestDto.setStartCreateTime(startTime);
+            supplierItemRequestDto.setEndCreateTime(endTime);
+            long count = supplierItemDao.countNewItem(supplierItemRequestDto);
+            dataPanelVo.setNewItemNum((int) count);
+            //查询藏品订单数据
+            DistributionOrderRequestDto collectRequestDto = new DistributionOrderRequestDto();
+            collectRequestDto.setType(3);
+            collectRequestDto.setStartCreateTime(startTime);
+            collectRequestDto.setEndCreateTime(endTime);
+            //distributionOrderDao.
+        } catch (Exception e) {
+            logger.error("查询数据看板 error:{}", e);
+        }
+        return Result.failed();
+    }
+
+    public static void main(String[] args) throws ParseException {
+        Date date = DateUtils.parseString("2024-05-07");
+        System.out.println(date);
+        System.out.println(DateUtil.endOfDay(date));
+        LocalDate localDate = LocalDate.parse("2024-05-07");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        String formattedDate = localDate.format(formatter);
+        System.out.println(formattedDate);
+    }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ImageCatelogDetailServiceImpl.java

+package com.wwdz.ch.admin.impl;
+
+import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.admin.service.ImageCatelogDetailService;
+import com.wwdz.ch.core.type.PageSearchResult;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dao.distribution.ImageCatelogDetailDao;
+import com.wwdz.ch.db.domain.distribution.ImageCatelog;
+import com.wwdz.ch.db.domain.distribution.ImageCatelogDetail;
+import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ImageCatelogDetailServiceImpl implements ImageCatelogDetailService {
+
+    private static final Logger logger = LoggerFactory.getLogger(ImageCatelogDetailServiceImpl.class);
+
+    @Autowired
+    ImageCatelogDetailDao imageCatelogDetailDao;
+
+    @Override
+    public Result findDetailList(ImageCatelogRequestDto dto) {
+        try {
+            dto.setOrder(" asc");
+            List<ImageCatelogDetail> list = imageCatelogDetailDao.findList(dto);
+            return Result.success(list);
+        } catch (Exception e) {
+            logger.error("查询图录内容 error:{}", e);
+        }
+        return Result.failed();
+    }
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminDashbordService.java

 package com.wwdz.ch.admin.service;
 
+import com.wwdz.ch.admin.entity.request.DataPanelRequestDto;
+import com.wwdz.ch.core.type.Result;
+
 public interface AdminDashbordService {
 
     Object info();
+
+    Result dataPanel(DataPanelRequestDto dto);
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/ImageCatelogDetailService.java

+package com.wwdz.ch.admin.service;
+
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
+
+public interface ImageCatelogDetailService {
+
+    Result findDetailList(ImageCatelogRequestDto dto);
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/SysIdentifyOrderService.java

+package com.wwdz.ch.admin.service;
+
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.distribution.IdentifyOrderRequestDto;
+
+public interface SysIdentifyOrderService {
+
+    /**
+     * 审核鉴定单
+     * @param dto
+     * @return
+     */
+    Result identify(IdentifyOrderRequestDto dto);
+
+    /**
+     * 鉴定单审核后发出
+     * @param dto
+     * @return
+     */
+    Result delivery(IdentifyOrderRequestDto dto);
+}

ch-core/src/main/java/com/wwdz/ch/core/api/WxAppletApi.java

@@ -111,7 +111,7 @@ public class WxAppletApi {
             logger.info("获取用户访问小程序数据 response :{}", responseStr);
             String listInfo = JsonUtils.getValueByPath(responseStr, "list");
             List<Map<String, Object>> dataList = JsonUtils.toMapList(listInfo);
-            //session_cnt
+            //打开次数
             int sessionCnt = (int) dataList.get(0).get("session_cnt");
             //访问次数
             int visitPv = (int) dataList.get(0).get("visit_pv");
@@ -119,7 +119,12 @@ public class WxAppletApi {
             int visitUv = (int) dataList.get(0).get("visit_uv");
             //新用户数
             int visitUvNew = (int) dataList.get(0).get("visit_uv_new");
-
+            Map<String, Integer> resultMap = new HashMap<>();
+            resultMap.put("sessionCnt", sessionCnt);
+            resultMap.put("visitPv", visitPv);
+            resultMap.put("visitUv", visitUv);
+            resultMap.put("visitUvNew", visitUvNew);
+            return Result.success(resultMap);
         } catch (Exception e) {
             logger.error("获取用户访问小程序数据失败:{}", e);
         }

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

@@ -267,4 +267,43 @@ public class DistributionEnum {
 
     }
 
+    /**
+     * 鉴定单状态
+     */
+    public enum IdentifyOrderStateEnum {
+        CHANNEL_WAIT_RECEIVE(12, "平台待收货"),
+        CHANNEL_IDENTIFYING(13, "平台鉴定中"),
+        CHANNEL_WAIT_SEND(14, "平台待发货"),
+        CHANNEL_WAIT_RETURN(15, "平台待退回"),
+        CHANNEL_SENDED(16, "平台已发货"),
+        CHANNEL_RETURNED(17, "平台已退回"),
+        ;
+
+        private int code;
+        private String des;
+
+        IdentifyOrderStateEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+            for (DistributionEnum.IdentifyOrderStateEnum identifyOrderStateEnum : DistributionEnum.IdentifyOrderStateEnum.values()) {
+                if (code == identifyOrderStateEnum.getCode()) {
+                    return identifyOrderStateEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+
 }

ch-core/src/main/java/com/wwdz/ch/core/util/UploadImageCatelogUtil.java

@@ -8,6 +8,7 @@ import com.wwdz.ch.db.dao.distribution.ImageCatelogDao;
 import com.wwdz.ch.db.dao.distribution.ImageCatelogDetailDao;
 import com.wwdz.ch.db.domain.distribution.ImageCatelog;
 import com.wwdz.ch.db.domain.distribution.ImageCatelogDetail;
+import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
 import com.xxdxxs.utils.CommonUtils;
 import jodd.io.findfile.FindFile;
 import org.slf4j.Logger;
@@ -48,7 +49,13 @@ public class UploadImageCatelogUtil {
             File[] listOfFiles = folder.listFiles();
             java.util.Arrays.sort(listOfFiles, new FindFile.FileNameComparator(true));
             logger.info("============ 当前目录下共有文件 : {} 个 =============", listOfFiles.length);
+
+            //查询是否已有数据
+            ImageCatelogDetail maxDetail = imageCatelogDetailDao.findMaxId(CATELOG_ID);
             int sort = 1;
+            if (maxDetail != null && maxDetail.getSort() != null) {
+                sort = maxDetail.getSort() + 1;
+            }
             for (File file : listOfFiles) {
                 logger.info(">>>>>>>>>> 当前处理的文件名称:{} <<<<<<<<<<", file.getName());
                 if (isImageFile(file)) {

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

+package com.wwdz.ch.db.dao.distribution;
+
+import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
+
+public interface IdentifyOrderDao {
+
+    /**
+     * 插入新记录
+     *
+     * @param identifyOrder
+     * @return
+     */
+    int insert(IdentifyOrder identifyOrder);
+
+    /**
+     * 更新记录
+     *
+     * @param identifyOrder
+     * @return
+     */
+    int update(IdentifyOrder identifyOrder);
+
+
+    IdentifyOrder findById(String identifyOrderId);
+
+}

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

 package com.wwdz.ch.db.dao.distribution;
 
 import com.wwdz.ch.db.domain.distribution.ImageCatelogDetail;
+import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
+
+import java.util.List;
 
 public interface ImageCatelogDetailDao {
 
     void insert(ImageCatelogDetail imageCatelogDetail);
+
+    List<ImageCatelogDetail> findList(ImageCatelogRequestDto dto);
+
+    ImageCatelogDetail findMaxId(int id);
 }

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

@@ -79,6 +79,13 @@ public interface SupplierItemDao {
      */
     long countOfNewItem(SupplierItemRequestDto supplierItemRequestDto);
 
+    /**
+     * 统计平台上新商品的数量
+     * @param supplierItemRequestDto
+     * @return
+     */
+    long countNewItem(SupplierItemRequestDto supplierItemRequestDto);
+
     /**
      * 查询上新藏品
      * @param supplierItemRequestDto

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/IdentifyOrder.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/05/07
+ */
+@Data
+public class IdentifyOrder implements Entity {
+    private Integer id;
+
+    /**
+     * 分销订单号
+     */
+    private String distributionOrderId;
+
+    /**
+     * 鉴定单号
+     */
+    private String identifyOrderId;
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 寄来的快递公司编码
+     */
+    private String fromLogisticsCode;
+
+    /**
+     * 寄来的物流单号
+     */
+    private String fromWaybill;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    /**
+     * 备注（鉴定不通过理由）
+     */
+    private String remark;
+
+    /**
+     * 发出的快递公司编码
+     */
+    private String outLogisticsCode;
+
+    /**
+     * 发出的物流单号
+     */
+    private String outWaybill;
+
+    /**
+     * 退回收货人名称
+     */
+    private String returnName;
+
+    /**
+     * 退回收货人电话
+     */
+    private String returnPhone;
+
+    /**
+     * 退回收货人地址
+     */
+    private String returnAddress;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    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(", identifyOrderId=").append(identifyOrderId);
+        sb.append(", itemId=").append(itemId);
+        sb.append(", fromLogisticsCode=").append(fromLogisticsCode);
+        sb.append(", fromWaybill=").append(fromWaybill);
+        sb.append(", state=").append(state);
+        sb.append(", remark=").append(remark);
+        sb.append(", outLogisticsCode=").append(outLogisticsCode);
+        sb.append(", outWaybill=").append(outWaybill);
+        sb.append(", returnName=").append(returnName);
+        sb.append(", returnPhone=").append(returnPhone);
+        sb.append(", returnAddress=").append(returnAddress);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        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;
+        }
+        IdentifyOrder other = (IdentifyOrder) 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.getIdentifyOrderId() == null ? other.getIdentifyOrderId() == null : this.getIdentifyOrderId().equals(other.getIdentifyOrderId()))
+            && (this.getItemId() == null ? other.getItemId() == null : this.getItemId().equals(other.getItemId()))
+            && (this.getFromLogisticsCode() == null ? other.getFromLogisticsCode() == null : this.getFromLogisticsCode().equals(other.getFromLogisticsCode()))
+            && (this.getFromWaybill() == null ? other.getFromWaybill() == null : this.getFromWaybill().equals(other.getFromWaybill()))
+            && (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()))
+            && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
+            && (this.getOutLogisticsCode() == null ? other.getOutLogisticsCode() == null : this.getOutLogisticsCode().equals(other.getOutLogisticsCode()))
+            && (this.getOutWaybill() == null ? other.getOutWaybill() == null : this.getOutWaybill().equals(other.getOutWaybill()))
+            && (this.getReturnName() == null ? other.getReturnName() == null : this.getReturnName().equals(other.getReturnName()))
+            && (this.getReturnPhone() == null ? other.getReturnPhone() == null : this.getReturnPhone().equals(other.getReturnPhone()))
+            && (this.getReturnAddress() == null ? other.getReturnAddress() == null : this.getReturnAddress().equals(other.getReturnAddress()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
+    }
+
+    @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 + ((getIdentifyOrderId() == null) ? 0 : getIdentifyOrderId().hashCode());
+        result = prime * result + ((getItemId() == null) ? 0 : getItemId().hashCode());
+        result = prime * result + ((getFromLogisticsCode() == null) ? 0 : getFromLogisticsCode().hashCode());
+        result = prime * result + ((getFromWaybill() == null) ? 0 : getFromWaybill().hashCode());
+        result = prime * result + ((getState() == null) ? 0 : getState().hashCode());
+        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
+        result = prime * result + ((getOutLogisticsCode() == null) ? 0 : getOutLogisticsCode().hashCode());
+        result = prime * result + ((getOutWaybill() == null) ? 0 : getOutWaybill().hashCode());
+        result = prime * result + ((getReturnName() == null) ? 0 : getReturnName().hashCode());
+        result = prime * result + ((getReturnPhone() == null) ? 0 : getReturnPhone().hashCode());
+        result = prime * result + ((getReturnAddress() == null) ? 0 : getReturnAddress().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        return result;
+    }
+
+    /**
+     * This enum was generated by MyBatis Generator.
+     * This enum corresponds to the database table identify_order
+     *
+     * @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),
+        identifyOrderId("identify_order_id", "identifyOrderId", "VARCHAR", false),
+        itemId("item_id", "itemId", "BIGINT", false),
+        fromLogisticsCode("from_logistics_code", "fromLogisticsCode", "VARCHAR", false),
+        fromWaybill("from_waybill", "fromWaybill", "VARCHAR", false),
+        state("state", "state", "INTEGER", true),
+        remark("remark", "remark", "VARCHAR", false),
+        outLogisticsCode("out_logistics_code", "outLogisticsCode", "VARCHAR", false),
+        outWaybill("out_waybill", "outWaybill", "VARCHAR", false),
+        returnName("return_name", "returnName", "VARCHAR", false),
+        returnPhone("return_phone", "returnPhone", "VARCHAR", false),
+        returnAddress("return_address", "returnAddress", "VARCHAR", false),
+        createTime("create_time", "createTime", "TIMESTAMP", false),
+        updateTime("update_time", "updateTime", "TIMESTAMP", false);
+
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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 identify_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/IdentifyOrderExample.java

+package com.wwdz.ch.db.domain.distribution;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class IdentifyOrderExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public IdentifyOrderExample() {
+        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 identify_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public IdentifyOrderExample orderBy(String orderByClause) {
+        this.setOrderByClause(orderByClause);
+        return this;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table identify_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public IdentifyOrderExample 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 identify_order
+     *
+     * @mbg.generated
+     * @project https://github.com/itfsw/mybatis-generator-plugin
+     */
+    public static Criteria newAndCreateCriteria() {
+        IdentifyOrderExample example = new IdentifyOrderExample();
+        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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdNotEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdGreaterThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdLessThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdNotEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdGreaterThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdGreaterThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdLessThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andDistributionOrderIdLessThanOrEqualToColumn(IdentifyOrder.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 andIdentifyOrderIdIsNull() {
+            addCriterion("identify_order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdIsNotNull() {
+            addCriterion("identify_order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdEqualTo(String value) {
+            addCriterion("identify_order_id =", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdentifyOrderIdEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("identify_order_id = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdNotEqualTo(String value) {
+            addCriterion("identify_order_id <>", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdentifyOrderIdNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("identify_order_id <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdGreaterThan(String value) {
+            addCriterion("identify_order_id >", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdentifyOrderIdGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("identify_order_id > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdGreaterThanOrEqualTo(String value) {
+            addCriterion("identify_order_id >=", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdentifyOrderIdGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("identify_order_id >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdLessThan(String value) {
+            addCriterion("identify_order_id <", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdentifyOrderIdLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("identify_order_id < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdLessThanOrEqualTo(String value) {
+            addCriterion("identify_order_id <=", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andIdentifyOrderIdLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("identify_order_id <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdLike(String value) {
+            addCriterion("identify_order_id like", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdNotLike(String value) {
+            addCriterion("identify_order_id not like", value, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdIn(List<String> values) {
+            addCriterion("identify_order_id in", values, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdNotIn(List<String> values) {
+            addCriterion("identify_order_id not in", values, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdBetween(String value1, String value2) {
+            addCriterion("identify_order_id between", value1, value2, "identifyOrderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyOrderIdNotBetween(String value1, String value2) {
+            addCriterion("identify_order_id not between", value1, value2, "identifyOrderId");
+            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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdNotEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdGreaterThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdGreaterThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdLessThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andItemIdLessThanOrEqualToColumn(IdentifyOrder.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 andFromLogisticsCodeIsNull() {
+            addCriterion("from_logistics_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeIsNotNull() {
+            addCriterion("from_logistics_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeEqualTo(String value) {
+            addCriterion("from_logistics_code =", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromLogisticsCodeEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_logistics_code = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeNotEqualTo(String value) {
+            addCriterion("from_logistics_code <>", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromLogisticsCodeNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_logistics_code <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeGreaterThan(String value) {
+            addCriterion("from_logistics_code >", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromLogisticsCodeGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_logistics_code > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("from_logistics_code >=", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromLogisticsCodeGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_logistics_code >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeLessThan(String value) {
+            addCriterion("from_logistics_code <", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromLogisticsCodeLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_logistics_code < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeLessThanOrEqualTo(String value) {
+            addCriterion("from_logistics_code <=", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromLogisticsCodeLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_logistics_code <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeLike(String value) {
+            addCriterion("from_logistics_code like", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeNotLike(String value) {
+            addCriterion("from_logistics_code not like", value, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeIn(List<String> values) {
+            addCriterion("from_logistics_code in", values, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeNotIn(List<String> values) {
+            addCriterion("from_logistics_code not in", values, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeBetween(String value1, String value2) {
+            addCriterion("from_logistics_code between", value1, value2, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromLogisticsCodeNotBetween(String value1, String value2) {
+            addCriterion("from_logistics_code not between", value1, value2, "fromLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillIsNull() {
+            addCriterion("from_waybill is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillIsNotNull() {
+            addCriterion("from_waybill is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillEqualTo(String value) {
+            addCriterion("from_waybill =", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromWaybillEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_waybill = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillNotEqualTo(String value) {
+            addCriterion("from_waybill <>", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromWaybillNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_waybill <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillGreaterThan(String value) {
+            addCriterion("from_waybill >", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromWaybillGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_waybill > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillGreaterThanOrEqualTo(String value) {
+            addCriterion("from_waybill >=", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromWaybillGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_waybill >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillLessThan(String value) {
+            addCriterion("from_waybill <", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromWaybillLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_waybill < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillLessThanOrEqualTo(String value) {
+            addCriterion("from_waybill <=", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andFromWaybillLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("from_waybill <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillLike(String value) {
+            addCriterion("from_waybill like", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillNotLike(String value) {
+            addCriterion("from_waybill not like", value, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillIn(List<String> values) {
+            addCriterion("from_waybill in", values, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillNotIn(List<String> values) {
+            addCriterion("from_waybill not in", values, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillBetween(String value1, String value2) {
+            addCriterion("from_waybill between", value1, value2, "fromWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromWaybillNotBetween(String value1, String value2) {
+            addCriterion("from_waybill not between", value1, value2, "fromWaybill");
+            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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateNotEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateGreaterThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateGreaterThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateLessThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andStateLessThanOrEqualToColumn(IdentifyOrder.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 andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRemarkEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("remark = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRemarkNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("remark <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRemarkGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("remark > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRemarkGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("remark >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRemarkLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("remark < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andRemarkLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("remark <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeIsNull() {
+            addCriterion("out_logistics_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeIsNotNull() {
+            addCriterion("out_logistics_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeEqualTo(String value) {
+            addCriterion("out_logistics_code =", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutLogisticsCodeEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_logistics_code = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeNotEqualTo(String value) {
+            addCriterion("out_logistics_code <>", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutLogisticsCodeNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_logistics_code <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeGreaterThan(String value) {
+            addCriterion("out_logistics_code >", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutLogisticsCodeGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_logistics_code > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("out_logistics_code >=", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutLogisticsCodeGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_logistics_code >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeLessThan(String value) {
+            addCriterion("out_logistics_code <", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutLogisticsCodeLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_logistics_code < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeLessThanOrEqualTo(String value) {
+            addCriterion("out_logistics_code <=", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutLogisticsCodeLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_logistics_code <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeLike(String value) {
+            addCriterion("out_logistics_code like", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeNotLike(String value) {
+            addCriterion("out_logistics_code not like", value, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeIn(List<String> values) {
+            addCriterion("out_logistics_code in", values, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeNotIn(List<String> values) {
+            addCriterion("out_logistics_code not in", values, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeBetween(String value1, String value2) {
+            addCriterion("out_logistics_code between", value1, value2, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutLogisticsCodeNotBetween(String value1, String value2) {
+            addCriterion("out_logistics_code not between", value1, value2, "outLogisticsCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillIsNull() {
+            addCriterion("out_waybill is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillIsNotNull() {
+            addCriterion("out_waybill is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillEqualTo(String value) {
+            addCriterion("out_waybill =", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutWaybillEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_waybill = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillNotEqualTo(String value) {
+            addCriterion("out_waybill <>", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutWaybillNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_waybill <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillGreaterThan(String value) {
+            addCriterion("out_waybill >", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutWaybillGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_waybill > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillGreaterThanOrEqualTo(String value) {
+            addCriterion("out_waybill >=", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutWaybillGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_waybill >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillLessThan(String value) {
+            addCriterion("out_waybill <", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutWaybillLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_waybill < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillLessThanOrEqualTo(String value) {
+            addCriterion("out_waybill <=", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andOutWaybillLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("out_waybill <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillLike(String value) {
+            addCriterion("out_waybill like", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillNotLike(String value) {
+            addCriterion("out_waybill not like", value, "outWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillIn(List<String> values) {
+            addCriterion("out_waybill in", values, "outWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillNotIn(List<String> values) {
+            addCriterion("out_waybill not in", values, "outWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillBetween(String value1, String value2) {
+            addCriterion("out_waybill between", value1, value2, "outWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutWaybillNotBetween(String value1, String value2) {
+            addCriterion("out_waybill not between", value1, value2, "outWaybill");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameIsNull() {
+            addCriterion("return_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameIsNotNull() {
+            addCriterion("return_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameEqualTo(String value) {
+            addCriterion("return_name =", value, "returnName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnNameEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_name = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameNotEqualTo(String value) {
+            addCriterion("return_name <>", value, "returnName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnNameNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_name <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameGreaterThan(String value) {
+            addCriterion("return_name >", value, "returnName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnNameGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_name > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameGreaterThanOrEqualTo(String value) {
+            addCriterion("return_name >=", value, "returnName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnNameGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_name >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameLessThan(String value) {
+            addCriterion("return_name <", value, "returnName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnNameLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_name < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameLessThanOrEqualTo(String value) {
+            addCriterion("return_name <=", value, "returnName");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnNameLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_name <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameLike(String value) {
+            addCriterion("return_name like", value, "returnName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameNotLike(String value) {
+            addCriterion("return_name not like", value, "returnName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameIn(List<String> values) {
+            addCriterion("return_name in", values, "returnName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameNotIn(List<String> values) {
+            addCriterion("return_name not in", values, "returnName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameBetween(String value1, String value2) {
+            addCriterion("return_name between", value1, value2, "returnName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnNameNotBetween(String value1, String value2) {
+            addCriterion("return_name not between", value1, value2, "returnName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneIsNull() {
+            addCriterion("return_phone is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneIsNotNull() {
+            addCriterion("return_phone is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneEqualTo(String value) {
+            addCriterion("return_phone =", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnPhoneEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_phone = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneNotEqualTo(String value) {
+            addCriterion("return_phone <>", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnPhoneNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_phone <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneGreaterThan(String value) {
+            addCriterion("return_phone >", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnPhoneGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_phone > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("return_phone >=", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnPhoneGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_phone >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneLessThan(String value) {
+            addCriterion("return_phone <", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnPhoneLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_phone < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneLessThanOrEqualTo(String value) {
+            addCriterion("return_phone <=", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnPhoneLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_phone <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneLike(String value) {
+            addCriterion("return_phone like", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneNotLike(String value) {
+            addCriterion("return_phone not like", value, "returnPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneIn(List<String> values) {
+            addCriterion("return_phone in", values, "returnPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneNotIn(List<String> values) {
+            addCriterion("return_phone not in", values, "returnPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneBetween(String value1, String value2) {
+            addCriterion("return_phone between", value1, value2, "returnPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnPhoneNotBetween(String value1, String value2) {
+            addCriterion("return_phone not between", value1, value2, "returnPhone");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressIsNull() {
+            addCriterion("return_address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressIsNotNull() {
+            addCriterion("return_address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressEqualTo(String value) {
+            addCriterion("return_address =", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnAddressEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_address = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressNotEqualTo(String value) {
+            addCriterion("return_address <>", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnAddressNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_address <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressGreaterThan(String value) {
+            addCriterion("return_address >", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnAddressGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_address > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("return_address >=", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnAddressGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_address >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressLessThan(String value) {
+            addCriterion("return_address <", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnAddressLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_address < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressLessThanOrEqualTo(String value) {
+            addCriterion("return_address <=", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andReturnAddressLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("return_address <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressLike(String value) {
+            addCriterion("return_address like", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressNotLike(String value) {
+            addCriterion("return_address not like", value, "returnAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressIn(List<String> values) {
+            addCriterion("return_address in", values, "returnAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressNotIn(List<String> values) {
+            addCriterion("return_address not in", values, "returnAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressBetween(String value1, String value2) {
+            addCriterion("return_address between", value1, value2, "returnAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReturnAddressNotBetween(String value1, String value2) {
+            addCriterion("return_address not between", value1, value2, "returnAddress");
+            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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeNotEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeGreaterThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andCreateTimeLessThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeNotEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeGreaterThanOrEqualToColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanColumn(IdentifyOrder.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 identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andUpdateTimeLessThanOrEqualToColumn(IdentifyOrder.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 static class Criteria extends GeneratedCriteria {
+        /**
+         * This field was generated by MyBatis Generator.
+         * This field corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        private IdentifyOrderExample example;
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        protected Criteria(IdentifyOrderExample example) {
+            super();
+            this.example = example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public IdentifyOrderExample example() {
+            return this.example;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_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 identify_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 identify_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-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -143,9 +143,9 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      */
     private String secret;
 
-    private Date startTime;
+    private Date startCreateTime;
 
-    private Date endTime;
+    private Date endCreateTime;
 
     /**
      * 订单类型

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

+package com.wwdz.ch.db.dto.request.distribution;
+
+import com.wwdz.ch.db.dto.request.BaseRequestDto;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IdentifyOrderRequestDto extends BaseRequestDto implements Entity {
+
+    private Integer id;
+
+    /**
+     * 分销订单号
+     */
+    private String distributionOrderId;
+
+    /**
+     * 鉴定单号
+     */
+    private String identifyOrderId;
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 寄来的快递公司编码
+     */
+    private String fromLogisticsCode;
+
+    /**
+     * 寄来的物流单号
+     */
+    private String fromWaybill;
+
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    /**
+     * 备注（鉴定不通过理由）
+     */
+    private String remark;
+
+    /**
+     * 发出的快递公司编码
+     */
+    private String outLogisticsCode;
+
+    /**
+     * 发出的物流单号
+     */
+    private String outWaybill;
+
+    /**
+     * 退回收货人名称
+     */
+    private String returnName;
+
+    /**
+     * 退回收货人电话
+     */
+    private String returnPhone;
+
+    /**
+     * 退回收货人地址
+     */
+    private String returnAddress;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

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

+package com.wwdz.ch.db.impl.distribution;
+
+import com.wwdz.ch.db.dao.distribution.IdentifyOrderDao;
+import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.db.domain.distribution.DistributionOrderExample;
+import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
+import com.wwdz.ch.db.domain.distribution.IdentifyOrderExample;
+import com.wwdz.ch.db.mapper.distribution.IdentifyOrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+
+@Repository
+public class IdentifyOrderDaoImpl implements IdentifyOrderDao {
+
+    @Autowired
+    IdentifyOrderMapper identifyOrderMapper;
+
+    @Override
+    public int insert(IdentifyOrder identifyOrder) {
+        return identifyOrderMapper.insert(identifyOrder);
+    }
+
+    @Override
+    public int update(IdentifyOrder identifyOrder) {
+        IdentifyOrderExample example = new IdentifyOrderExample();
+        IdentifyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andIdentifyOrderIdEqualTo(identifyOrder.getIdentifyOrderId());
+        identifyOrder.setUpdateTime(new Date());
+        return identifyOrderMapper.updateByExampleSelective(identifyOrder, example);
+    }
+
+    @Override
+    public IdentifyOrder findById(String identifyOrderId) {
+        IdentifyOrderExample example = new IdentifyOrderExample();
+        IdentifyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andIdentifyOrderIdEqualTo(identifyOrderId);
+        return identifyOrderMapper.selectOneByExample(example);
+    }
+}

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

@@ -2,10 +2,14 @@ package com.wwdz.ch.db.impl.distribution;
 
 import com.wwdz.ch.db.dao.distribution.ImageCatelogDetailDao;
 import com.wwdz.ch.db.domain.distribution.ImageCatelogDetail;
+import com.wwdz.ch.db.domain.distribution.ImageCatelogDetailExample;
+import com.wwdz.ch.db.dto.request.distribution.ImageCatelogRequestDto;
 import com.wwdz.ch.db.mapper.distribution.ImageCatelogDetailMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 @Repository
 public class ImageCatelogDetailDaoImpl implements ImageCatelogDetailDao {
@@ -17,4 +21,22 @@ public class ImageCatelogDetailDaoImpl implements ImageCatelogDetailDao {
     public void insert(ImageCatelogDetail imageCatelogDetail) {
         imageCatelogDetailMapper.insert(imageCatelogDetail);
     }
+
+    @Override
+    public List<ImageCatelogDetail> findList(ImageCatelogRequestDto dto) {
+        ImageCatelogDetailExample example = new ImageCatelogDetailExample();
+        ImageCatelogDetailExample.Criteria criteria = example.createCriteria();
+        criteria.andCatalogIdEqualTo(dto.getId());
+        example.setOrderByClause(" sort " + dto.getOrder());
+        return imageCatelogDetailMapper.selectByExample(example);
+    }
+
+    @Override
+    public ImageCatelogDetail findMaxId(int id) {
+        ImageCatelogDetailExample example = new ImageCatelogDetailExample();
+        ImageCatelogDetailExample.Criteria criteria = example.createCriteria();
+        criteria.andCatalogIdEqualTo(id);
+        example.setOrderByClause(" sort desc");
+        return imageCatelogDetailMapper.selectOneByExample(example);
+    }
 }

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

@@ -180,6 +180,17 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
     }
 
 
+    @Override
+    public long countNewItem(SupplierItemRequestDto supplierItemRequestDto) {
+        SupplierItemExample supplierItemExample = new SupplierItemExample();
+        SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
+        criteria.andCreateTimeGreaterThanOrEqualTo(supplierItemRequestDto.getStartCreateTime());
+        criteria.andCreateTimeLessThanOrEqualTo(supplierItemRequestDto.getEndCreateTime());
+        criteria.andIsDeletedEqualTo(false);
+        criteria.andIsOnSaleEqualTo(true);
+        return supplierItemMapper.countByExample(supplierItemExample);
+    }
+
     @Override
     public List<SupplierItem> findDistinctCreator(SupplierItemRequestDto supplierItemRequestDto) {
         SupplierItemExample supplierItemExample = new SupplierItemExample();

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

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

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/IdentifyOrderMapper.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.IdentifyOrderMapper">
+  <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.distribution.IdentifyOrder">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="distribution_order_id" jdbcType="VARCHAR" property="distributionOrderId" />
+    <result column="identify_order_id" jdbcType="VARCHAR" property="identifyOrderId" />
+    <result column="item_id" jdbcType="BIGINT" property="itemId" />
+    <result column="from_logistics_code" jdbcType="VARCHAR" property="fromLogisticsCode" />
+    <result column="from_waybill" jdbcType="VARCHAR" property="fromWaybill" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="out_logistics_code" jdbcType="VARCHAR" property="outLogisticsCode" />
+    <result column="out_waybill" jdbcType="VARCHAR" property="outWaybill" />
+    <result column="return_name" jdbcType="VARCHAR" property="returnName" />
+    <result column="return_phone" jdbcType="VARCHAR" property="returnPhone" />
+    <result column="return_address" jdbcType="VARCHAR" property="returnAddress" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </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, identify_order_id, item_id, from_logistics_code, from_waybill, 
+    `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
+    create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrderExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from identify_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 > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
+          `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
+          create_time, update_time
+      </otherwise>
+    </choose>
+    from identify_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 identify_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 > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
+          `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
+          create_time, update_time
+      </otherwise>
+    </choose>
+    from identify_order
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from identify_order
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrderExample">
+    delete from identify_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrder">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into identify_order (distribution_order_id, identify_order_id, 
+      item_id, from_logistics_code, from_waybill, 
+      `state`, remark, out_logistics_code, 
+      out_waybill, return_name, return_phone, 
+      return_address, create_time, update_time
+      )
+    values (#{distributionOrderId,jdbcType=VARCHAR}, #{identifyOrderId,jdbcType=VARCHAR}, 
+      #{itemId,jdbcType=BIGINT}, #{fromLogisticsCode,jdbcType=VARCHAR}, #{fromWaybill,jdbcType=VARCHAR}, 
+      #{state,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{outLogisticsCode,jdbcType=VARCHAR}, 
+      #{outWaybill,jdbcType=VARCHAR}, #{returnName,jdbcType=VARCHAR}, #{returnPhone,jdbcType=VARCHAR}, 
+      #{returnAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrder">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into identify_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="distributionOrderId != null">
+        distribution_order_id,
+      </if>
+      <if test="identifyOrderId != null">
+        identify_order_id,
+      </if>
+      <if test="itemId != null">
+        item_id,
+      </if>
+      <if test="fromLogisticsCode != null">
+        from_logistics_code,
+      </if>
+      <if test="fromWaybill != null">
+        from_waybill,
+      </if>
+      <if test="state != null">
+        `state`,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="outLogisticsCode != null">
+        out_logistics_code,
+      </if>
+      <if test="outWaybill != null">
+        out_waybill,
+      </if>
+      <if test="returnName != null">
+        return_name,
+      </if>
+      <if test="returnPhone != null">
+        return_phone,
+      </if>
+      <if test="returnAddress != null">
+        return_address,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="distributionOrderId != null">
+        #{distributionOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="identifyOrderId != null">
+        #{identifyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="itemId != null">
+        #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="fromLogisticsCode != null">
+        #{fromLogisticsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="fromWaybill != null">
+        #{fromWaybill,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="outLogisticsCode != null">
+        #{outLogisticsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="outWaybill != null">
+        #{outWaybill,jdbcType=VARCHAR},
+      </if>
+      <if test="returnName != null">
+        #{returnName,jdbcType=VARCHAR},
+      </if>
+      <if test="returnPhone != null">
+        #{returnPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="returnAddress != null">
+        #{returnAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrderExample" resultType="java.lang.Long">
+    select count(*) from identify_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update identify_order
+    <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.identifyOrderId != null">
+        identify_order_id = #{record.identifyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.itemId != null">
+        item_id = #{record.itemId,jdbcType=BIGINT},
+      </if>
+      <if test="record.fromLogisticsCode != null">
+        from_logistics_code = #{record.fromLogisticsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fromWaybill != null">
+        from_waybill = #{record.fromWaybill,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        `state` = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outLogisticsCode != null">
+        out_logistics_code = #{record.outLogisticsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outWaybill != null">
+        out_waybill = #{record.outWaybill,jdbcType=VARCHAR},
+      </if>
+      <if test="record.returnName != null">
+        return_name = #{record.returnName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.returnPhone != null">
+        return_phone = #{record.returnPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.returnAddress != null">
+        return_address = #{record.returnAddress,jdbcType=VARCHAR},
+      </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>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update identify_order
+    set id = #{record.id,jdbcType=INTEGER},
+      distribution_order_id = #{record.distributionOrderId,jdbcType=VARCHAR},
+      identify_order_id = #{record.identifyOrderId,jdbcType=VARCHAR},
+      item_id = #{record.itemId,jdbcType=BIGINT},
+      from_logistics_code = #{record.fromLogisticsCode,jdbcType=VARCHAR},
+      from_waybill = #{record.fromWaybill,jdbcType=VARCHAR},
+      `state` = #{record.state,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      out_logistics_code = #{record.outLogisticsCode,jdbcType=VARCHAR},
+      out_waybill = #{record.outWaybill,jdbcType=VARCHAR},
+      return_name = #{record.returnName,jdbcType=VARCHAR},
+      return_phone = #{record.returnPhone,jdbcType=VARCHAR},
+      return_address = #{record.returnAddress,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrder">
+    update identify_order
+    <set>
+      <if test="distributionOrderId != null">
+        distribution_order_id = #{distributionOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="identifyOrderId != null">
+        identify_order_id = #{identifyOrderId,jdbcType=VARCHAR},
+      </if>
+      <if test="itemId != null">
+        item_id = #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="fromLogisticsCode != null">
+        from_logistics_code = #{fromLogisticsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="fromWaybill != null">
+        from_waybill = #{fromWaybill,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        `state` = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="outLogisticsCode != null">
+        out_logistics_code = #{outLogisticsCode,jdbcType=VARCHAR},
+      </if>
+      <if test="outWaybill != null">
+        out_waybill = #{outWaybill,jdbcType=VARCHAR},
+      </if>
+      <if test="returnName != null">
+        return_name = #{returnName,jdbcType=VARCHAR},
+      </if>
+      <if test="returnPhone != null">
+        return_phone = #{returnPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="returnAddress != null">
+        return_address = #{returnAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrder">
+    update identify_order
+    set distribution_order_id = #{distributionOrderId,jdbcType=VARCHAR},
+      identify_order_id = #{identifyOrderId,jdbcType=VARCHAR},
+      item_id = #{itemId,jdbcType=BIGINT},
+      from_logistics_code = #{fromLogisticsCode,jdbcType=VARCHAR},
+      from_waybill = #{fromWaybill,jdbcType=VARCHAR},
+      `state` = #{state,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      out_logistics_code = #{outLogisticsCode,jdbcType=VARCHAR},
+      out_waybill = #{outWaybill,jdbcType=VARCHAR},
+      return_name = #{returnName,jdbcType=VARCHAR},
+      return_phone = #{returnPhone,jdbcType=VARCHAR},
+      return_address = #{returnAddress,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrderExample" 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 identify_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 > 0">
+        <foreach collection="selective" item="column" separator=",">
+          ${column.escapedColumnName}
+        </foreach>
+      </when>
+      <otherwise>
+        id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
+          `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
+          create_time, update_time
+      </otherwise>
+    </choose>
+    from identify_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="image_catelog" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+        <table tableName="identify_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/impl/distribution/IdentifyOrderServiceImpl.java

+package com.wwdz.ch.wx.impl.distribution;
+
+import com.wwdz.ch.core.consts.DistributionEnum;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dao.distribution.IdentifyOrderDao;
+import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
+import com.wwdz.ch.db.dto.request.distribution.IdentifyOrderRequestDto;
+import com.wwdz.ch.wx.service.distribution.IdentifyOrderService;
+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.interceptor.TransactionAspectSupport;
+import java.util.Date;
+
+@Service
+public class IdentifyOrderServiceImpl implements IdentifyOrderService {
+
+    private static final Logger logger = LoggerFactory.getLogger(IdentifyOrderServiceImpl.class);
+
+    @Autowired
+    IdentifyOrderDao identifyOrderDao;
+
+    @Override
+    public Result createIdentifyOrder(IdentifyOrderRequestDto dto) {
+        try {
+            IdentifyOrder identifyOrder = new IdentifyOrder();
+            EntityMapper.copyAttribute(dto, identifyOrder);
+            identifyOrder.setState(DistributionEnum.IdentifyOrderStateEnum.CHANNEL_WAIT_RECEIVE.getCode());
+            identifyOrder.setCreateTime(new Date());
+            identifyOrder.setUpdateTime(new Date());
+            identifyOrderDao.insert(identifyOrder);
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("创建鉴定单失败 error : {}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return Result.failed();
+    }
+}

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

+package com.wwdz.ch.wx.service.distribution;
+
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.IdentifyOrderRequestDto;
+
+public interface IdentifyOrderService {
+
+    /**
+     * 创建鉴定单
+     * @param dto
+     * @return
+     */
+    Result createIdentifyOrder(IdentifyOrderRequestDto dto);
+}