查询图录

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/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/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);
+}