Accept Merge Request #97: (dev-xwt -> dev-test)

Merge Request: jiami

Created By: @夏文涛
Accepted By: @夏文涛
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/97?initial=true

src/main/java/com/sqx/modules/errand/dao/TransferRecordDao.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sqx.modules.errand.entity.TransferRecordEntity;
-import com.sqx.modules.errand.entity.TransferRecordVo;
-import com.sqx.modules.errand.vo.queryOrderInfoVo;
+import com.sqx.modules.errand.vo.TransferRecordVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,5 +21,7 @@ import java.util.List;
 @Mapper
 public interface TransferRecordDao extends BaseMapper<TransferRecordEntity> {
 
-    IPage<TransferRecordVo> queryTransferRecordPages(Page<TransferRecordVo> pages, Integer orderId);
+    IPage<TransferRecordVo> queryTransferRecordPages(@Param("pages") Page<TransferRecordVo> pages, Integer orderId);
+
+    List<TransferRecordVo> queryTransferRecordPages( Integer orderId);
 }

src/main/java/com/sqx/modules/errand/service/impl/TransferRecordServiceImpl.java

@@ -4,18 +4,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.errand.dao.TbIndentDao;
 import com.sqx.modules.errand.dao.TransferRecordDao;
 import com.sqx.modules.errand.entity.*;
 import com.sqx.modules.errand.service.TransferRecordService;
-import com.sqx.modules.errand.vo.queryOrderInfoVo;
-import com.sqx.modules.printInfo.entity.PrintInfo;
-import lombok.extern.slf4j.Slf4j;
+import com.sqx.modules.errand.vo.TransferRecordVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 @Service

src/main/java/com/sqx/modules/errand/entity/TransferRecordVo.java

@@ -1,4 +1,4 @@
-package com.sqx.modules.errand.entity;
+package com.sqx.modules.errand.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -15,7 +15,7 @@ import java.io.Serializable;
  */
 @Data
 @ApiModel("转单记录")
-public class TransferRecordVo implements Serializable {
+public class TransferRecordVo {
     @ApiModelProperty("主键id")
     private Integer id;
 

src/main/resources/application-dev.yml

@@ -48,7 +48,7 @@ spring:
                 max-wait: -1
 secure-api:
     # 开启SecureApi功能，如果为false则其余配置项均不生效
-    enabled: false
+    enabled: true
     # 开启加解密日志打印，会打印出接口名、加密模式、算法、明文和密文等信息
     show-log: true
     url-safe: true

src/main/resources/mapper/errand/TransferRecordDao.xml

@@ -1,13 +1,13 @@
 <?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.sqx.modules.errand.dao.TransferRecordDao">
 
-    <select id="queryTransferRecordPages" resultType="com.sqx.modules.errand.entity.TransferRecordVo">
+    <select id="queryTransferRecordPages" resultType="com.sqx.modules.errand.vo.TransferRecordVo">
         select tr.id,tr.user_id,tr.order_id,tr.user_name,tr.user_phone,tr.receve_time,tr.station_name,tor.pay_time
         from transfer_record tr
         left join tb_order tor on tr.order_id = tor.order_id
         where tr.order_id = #{orderId}
         order by tr.receve_time desc
     </select>
-
 </mapper>