1、将hutool引用放到common服务，使用common中的hutool

pom.xml

@@ -87,10 +87,7 @@
             <artifactId>spring-webmvc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
+
 
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/java/com/link/bi/domain/dao/CollectOrderLogInfoDao.java

@@ -8,5 +8,5 @@ public interface CollectOrderLogInfoDao {
     // 插入一条记录
     void insert(CollectOrderLogInfo collectOrderLogInfo);
 
-    Date selectOrderLatest(Integer syncType);
+    Date selectOrderSyncLatest(Integer syncType);
 }

src/main/java/com/link/bi/domain/dao/impl/CollectOrderLogInfoDaoImpl.java

@@ -23,7 +23,7 @@ public class CollectOrderLogInfoDaoImpl implements CollectOrderLogInfoDao {
     }
 
     @Override
-    public Date selectOrderLatest(Integer syncType) {
+    public Date selectOrderSyncLatest(Integer syncType) {
         // 查询最新发货日期
         List<CollectOrderLogInfo> orderList = logInfoMapper.selectList(
                 new LambdaQueryWrapper<CollectOrderLogInfo>()

src/main/java/com/link/bi/pojo/response/FinanceSyncOrderDetailDto.java

-package com.link.bi.pojo.response;
-
-import com.link.bi.domain.entity.FinanceOrder;
-import com.link.bi.domain.entity.FinanceOrderDetail;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 财务同步旺店通返回数据Dto
- */
-@Data
-public class FinanceSyncOrderDetailDto {
-    private Integer orderCount;
-    private Integer orderDetailCount;
-    private List<FinanceOrder> orders;
-    private List<FinanceOrderDetail> orderDetails;
-    private Date startTime;
-    private Date endTime;
-    private Integer syncType;
-    private String batchNo;
-
-}

src/main/java/com/link/bi/service/CollectOrderLogInfoService.java

@@ -6,5 +6,5 @@ import com.link.bi.domain.entity.CollectOrderLogInfo;
 import java.util.Date;
 
 public interface CollectOrderLogInfoService  extends IService<CollectOrderLogInfo> {
-    Date selectLatest(Integer syncType);
+    Date selectOrderSyncLatest(Integer syncType);
 }

src/main/java/com/link/bi/service/FinanceBaseProductService.java

 package com.link.bi.service;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.link.bi.domain.entity.FinanceBaseProduct;
 import com.link.bi.pojo.request.FinanceSelectCommonVo;
@@ -15,13 +13,6 @@ import java.util.Map;
 public interface FinanceBaseProductService extends IService<FinanceBaseProduct> {
     Map<String,FinanceBaseProduct> selectBaseProduct();
 
-
-    boolean saveProduct(FinanceBaseProduct product);
-    boolean removeProductById(Integer id);
-    boolean updateProduct(FinanceBaseProduct product);
-    FinanceBaseProduct getProductById(Integer id);
-    IPage<FinanceBaseProduct> pageProduct(IPage<FinanceBaseProduct> page, Wrapper<FinanceBaseProduct> wrapper);
-
     List<FinanceBaseProductListDto> flavorList(FinanceSelectCommonVo commonVo);
 
     List<FinanceBaseProductListDto> specList(FinanceSelectCommonVo commonVo);

src/main/java/com/link/bi/service/impl/CollectOrderLogInfoServiceImpl.java

@@ -29,9 +29,9 @@ public class CollectOrderLogInfoServiceImpl extends ServiceImpl<CollectOrderLogI
      * @return
      */
     @Override
-    public Date selectLatest(Integer syncType) {
+    public Date selectOrderSyncLatest(Integer syncType) {
         // 查询最新发货日期
-        Date date = dao.selectOrderLatest(syncType);
+        Date date = dao.selectOrderSyncLatest(syncType);
         return date;
     }
 

src/main/java/com/link/bi/service/impl/FinanceBaseProductServiceImpl.java

@@ -2,9 +2,7 @@ package com.link.bi.service.impl;
 
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.link.bi.domain.entity.FinanceBaseProduct;
 import com.link.bi.domain.mapper.FinanceBaseProductMapper;
@@ -44,35 +42,6 @@ public class FinanceBaseProductServiceImpl extends ServiceImpl<FinanceBaseProduc
         return map;
     }
 
-    @Override
-    public boolean saveProduct(FinanceBaseProduct product) {
-        return this.save(product);
-    }
-
-
-    @Override
-    public boolean removeProductById(Integer id) {
-        return this.removeById(id);
-    }
-
-
-    @Override
-    public boolean updateProduct(FinanceBaseProduct product) {
-        return this.updateById(product);
-    }
-
-
-    @Override
-    public FinanceBaseProduct getProductById(Integer id) {
-        return this.getById(id);
-    }
-
-
-    @Override
-    public IPage<FinanceBaseProduct> pageProduct(IPage<FinanceBaseProduct> page, Wrapper<FinanceBaseProduct> wrapper) {
-        return this.page(page, wrapper);
-    }
-
     @Override
     public List<FinanceBaseProductListDto> flavorList(FinanceSelectCommonVo commonVo) {
         LambdaQueryWrapper<FinanceBaseProduct> queryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/link/bi/service/impl/FinanceOrderDetailServiceImpl.java

@@ -87,9 +87,7 @@ public class FinanceOrderDetailServiceImpl extends ServiceImpl<FinanceOrderDetai
 
     @Override
     public PageInfo<FinanceOrderDetailListDto> selectBiFinanceCostDetailPage(FinanceCostVo financeCostVo) {
-        FinanceCostWq qw = new FinanceCostWq();
-
-        BeanUtils.copyProperties(financeCostVo, qw);
+        FinanceCostWq qw =  covertFinanceCostWq(financeCostVo);
         PageInfo<FinanceOrderDetail> financeOrderDetailPageInfo = detailDao.selectBiFinanceCostDetailList(qw);
 
         PageInfo<FinanceOrderDetailListDto> pageInfo = new PageInfo<>();

src/main/resources/mapper/bi/FinanceOrderDetailMapper.xml

@@ -114,6 +114,9 @@
         <include refid="Base_Column_List"/>
         from finance_order_detail fod
         <where>
+            <if test="wq.startDate!= null ">
+                and fod.consign_time between #{wq.startDate} and #{wq.endDate}
+            </if>
             <if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty()  ">
                 and fod.zbj_qd_type in
                 <foreach collection="wq.zbjQdType" item="item" index="index" open="(" separator="," close=")">
@@ -146,6 +149,7 @@
                     #{item}
                 </foreach>
             </if>
+
         </where>
     </select>