平台收入/老师在账户记录导出

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/PlatformCashAccountRecordController.java

@@ -1,11 +1,18 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.biz.dal.dto.excel.PlatformCashAccountRecordExport;
+import com.yonge.cooleshow.biz.dal.dto.excel.UserAccountRecordExport;
+import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.vo.PlatformCashAccountPageVo;
+import com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo;
+import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import javax.validation.Valid;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
@@ -22,6 +29,10 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
 @RestController
 @RequestMapping("/platformCashAccountRecord")
 @Api(value = "平台账户记录", tags = "平台账户记录")
@@ -33,7 +44,7 @@ public class PlatformCashAccountRecordController extends BaseController {
 	@ApiOperation(value = "平台账户记录-列表", httpMethod = "POST", consumes = "application/json", produces = "application/json")
 	@PostMapping(value = "/list", consumes = "application/json", produces = "application/json")
 	@PreAuthorize("@pcs.hasPermissions('platformCashAccountRecord/list')")
-	public HttpResponseResult<PlatformCashAccountPageVo> list(@Valid @RequestBody PlatformCashAccountRecordSearch query) {
+	public HttpResponseResult<PlatformCashAccountPageVo> list(@RequestBody PlatformCashAccountRecordSearch query) {
 		PlatformCashAccountPageVo model = new PlatformCashAccountPageVo();
 		PageInfo<PlatformCashAccountRecord> pageInfo = PageUtil.pageInfo(platformCashAccountRecordService.queryPage(PageUtil.getPage(query),query));
 		model.setPageInfo(pageInfo);
@@ -41,4 +52,26 @@ public class PlatformCashAccountRecordController extends BaseController {
 		return succeed(model);
 	}
 
+	/**
+	 * 查询导出
+	 */
+	@PostMapping("/export")
+	@ApiOperation(value = "查询导出", notes = "传入orderSearch")
+	@PreAuthorize("@pcs.hasPermissions('platformCashAccountRecord/export')")
+	public void export(@RequestBody PlatformCashAccountRecordSearch query) {
+		List<PlatformCashAccountRecord> platformCashAccountRecords = platformCashAccountRecordService.queryAll(query);
+
+		List<PlatformCashAccountRecordExport> list = new ArrayList<>();
+		platformCashAccountRecords.forEach(o -> {
+			PlatformCashAccountRecordExport export = new PlatformCashAccountRecordExport();
+			BeanUtils.copyProperties(o, export);
+			if (null == export.getTransAmount()) {
+				export.setTransAmount(BigDecimal.ZERO);
+			}
+			list.add(export);
+		});
+		ExcelUtils.exportExcel(list, "老师收入列表数据" + System.currentTimeMillis(),
+				"老师收入列表数据");
+	}
+
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountRecordController.java

@@ -3,15 +3,21 @@ package com.yonge.cooleshow.admin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.excel.UserAccountRecordExport;
+import com.yonge.cooleshow.biz.dal.dto.excel.UserOrderExport;
 import com.yonge.cooleshow.biz.dal.dto.req.TotalReq;
+import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.vo.UserAccountVo;
+import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
 import com.yonge.cooleshow.biz.dal.vo.res.AccountTotal;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,6 +28,9 @@ import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
 import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 @RequestMapping("/userAccountRecord")
@@ -31,16 +40,16 @@ public class UserAccountRecordController extends BaseController {
     @Autowired
     private UserAccountRecordService userAccountRecordService;
 
-	/**
+    /**
      * 查询单条
      */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @PreAuthorize("@pcs.hasPermissions('userAccountRecord/detail')")
     public HttpResponseResult<UserAccountRecordVo> detail(@PathVariable("id") Long id) {
-    	return succeed(userAccountRecordService.detail(id));
-	}
-    
+        return succeed(userAccountRecordService.detail(id));
+    }
+
     /**
      * 查询分页
      */
@@ -49,9 +58,32 @@ public class UserAccountRecordController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('userAccountRecord/page')")
     public HttpResponseResult<PageInfo<UserAccountRecordVo>> page(@RequestBody UserAccountRecordSearch query) {
         query.setInOrOut(InOrOutEnum.IN);
-		IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
+        IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
-	}
+    }
+
+    /**
+     * 查询导出
+     */
+    @PostMapping("/export")
+    @ApiOperation(value = "查询导出", notes = "传入orderSearch")
+    @PreAuthorize("@pcs.hasPermissions('userAccountRecord/export')")
+    public void export(@RequestBody UserAccountRecordSearch query) {
+        query.setInOrOut(InOrOutEnum.IN);
+        List<UserAccountRecordVo> userAccountRecordVos = userAccountRecordService.selectAll(query);
+
+        List<UserAccountRecordExport> list = new ArrayList<>();
+        userAccountRecordVos.forEach(o -> {
+            UserAccountRecordExport export = new UserAccountRecordExport();
+            BeanUtils.copyProperties(o, export);
+            if (null == export.getTransAmount()) {
+                export.setTransAmount(BigDecimal.ZERO);
+            }
+            list.add(export);
+        });
+        ExcelUtils.exportExcel(list, "老师收入列表数据" + System.currentTimeMillis(),
+                "老师收入列表数据");
+    }
 
     @ApiOperation(value = "收入数据统计")
     @PostMapping("/accountTotal")
@@ -61,4 +93,5 @@ public class UserAccountRecordController extends BaseController {
         return userAccountRecordService.accountTotal(query);
     }
 
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/convert/AccountBizTypeEnumConvert.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.convert;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/4/15 15:36
+ */
+public class AccountBizTypeEnumConvert implements Converter<AccountBizTypeEnum> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return CellDataTypeEnum.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public AccountBizTypeEnum convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            return AccountBizTypeEnum.valueOf(cellData.getStringValue());
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @Override
+    public CellData convertToExcelData(AccountBizTypeEnum statusEnum, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if(null != statusEnum){
+            return new CellData(statusEnum.getMsg());
+        }
+        return new CellData("异常数据");
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/convert/InOrOutEnumConvert.java

@@ -0,0 +1,43 @@
+package com.yonge.cooleshow.biz.dal.convert;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import com.yonge.cooleshow.common.enums.PostStatusEnum;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/4/15 15:36
+ */
+public class InOrOutEnumConvert implements Converter<InOrOutEnum> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return CellDataTypeEnum.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public InOrOutEnum convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            return InOrOutEnum.valueOf(cellData.getStringValue());
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @Override
+    public CellData convertToExcelData(InOrOutEnum statusEnum, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if(null != statusEnum){
+            return new CellData(statusEnum.getMsg());
+        }
+        return new CellData("异常数据");
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/convert/PostStatusConvert.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.convert;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.yonge.cooleshow.common.enums.PostStatusEnum;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/4/15 15:36
+ */
+public class PostStatusConvert implements Converter<PostStatusEnum> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return CellDataTypeEnum.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public PostStatusEnum convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        try {
+            return PostStatusEnum.valueOf(cellData.getStringValue());
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @Override
+    public CellData convertToExcelData(PostStatusEnum statusEnum, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if(null != statusEnum){
+            return new CellData(statusEnum.getMsg());
+        }
+        return new CellData("异常数据");
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/PlatformCashAccountRecordDao.java

@@ -25,6 +25,8 @@ public interface PlatformCashAccountRecordDao extends BaseMapper<PlatformCashAcc
 
     IPage<PlatformCashAccountRecord> queryPage(@Param("page") IPage<PlatformCashAccountRecord> page, @Param("param") PlatformCashAccountRecordSearch query);
 
+    List<PlatformCashAccountRecord> queryAll(@Param("param")PlatformCashAccountRecordSearch query);
+
     PlatformCashAccountRecordSummaryVo querySummary(@Param("param") PlatformCashAccountRecordSearch query);
 
     List<PlatformCashAccountRecord> queryCanAccountByBizType(@Param("bizTypes")List<String> bizTypes);
@@ -34,5 +36,6 @@ public interface PlatformCashAccountRecordDao extends BaseMapper<PlatformCashAcc
     Integer cancelRecord(@Param("orderNo")String orderNo,@Param("bizType") String bizType, @Param("bizId") Long bizId);
 
     Integer mallRecordedRecord(@Param("orderNo")String orderNo,@Param("bizType") String bizType, @Param("bizId") Long bizId);
+
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/UserAccountRecordDao.java

@@ -40,7 +40,7 @@ public interface UserAccountRecordDao extends BaseMapper<UserAccountRecord> {
      */
     List<UserAccountRecordVo> selectPage(@Param("page") IPage page, @Param("param") UserAccountRecordSearch userAccountRecord);
 
-    List<UserAccountRecordVo> selectAllPage(@Param("param") UserAccountRecordSearch userAccountRecord);
+    List<UserAccountRecordVo> selectAll(@Param("param") UserAccountRecordSearch userAccountRecord);
 
     List<UserAccountRecordVo> sharePage(@Param("page") IPage page, @Param("param") UserAccountRecordSearch userAccountRecord);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/excel/PlatformCashAccountRecordExport.java

@@ -0,0 +1,89 @@
+package com.yonge.cooleshow.biz.dal.dto.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yonge.cooleshow.biz.dal.convert.AccountBizTypeEnumConvert;
+import com.yonge.cooleshow.biz.dal.convert.InOrOutEnumConvert;
+import com.yonge.cooleshow.biz.dal.convert.PostStatusConvert;
+import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import com.yonge.cooleshow.common.enums.PostStatusEnum;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/4/15 17:32
+ */
+public class PlatformCashAccountRecordExport {
+    @ExcelProperty(value = "关联订单", index = 0)
+    private String orderNo;
+    @ExcelProperty(value = "金额", index = 1)
+    private BigDecimal transAmount;
+    @ExcelProperty(value = "产品编号", index = 2)
+    private Long bizId;
+    @ExcelProperty(value = "收支类型", index = 3, converter = InOrOutEnumConvert.class)
+    private InOrOutEnum inOrOut;
+    @ExcelProperty(value = "内容", index = 4, converter = AccountBizTypeEnumConvert.class)
+    private AccountBizTypeEnum bizType;
+    @ExcelProperty(value = "入账状态", index = 5, converter = PostStatusConvert.class)
+    private PostStatusEnum postStatus;
+    @ExcelProperty(value = "更新时间", index = 6)
+    private Date updateTime;
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public BigDecimal getTransAmount() {
+        return transAmount;
+    }
+
+    public void setTransAmount(BigDecimal transAmount) {
+        this.transAmount = transAmount;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public InOrOutEnum getInOrOut() {
+        return inOrOut;
+    }
+
+    public void setInOrOut(InOrOutEnum inOrOut) {
+        this.inOrOut = inOrOut;
+    }
+
+    public AccountBizTypeEnum getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(AccountBizTypeEnum bizType) {
+        this.bizType = bizType;
+    }
+
+    public PostStatusEnum getPostStatus() {
+        return postStatus;
+    }
+
+    public void setPostStatus(PostStatusEnum postStatus) {
+        this.postStatus = postStatus;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/excel/UserAccountRecordExport.java

@@ -0,0 +1,85 @@
+package com.yonge.cooleshow.biz.dal.dto.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yonge.cooleshow.biz.dal.convert.PostStatusConvert;
+import com.yonge.cooleshow.common.enums.PostStatusEnum;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/4/15 17:32
+ */
+public class UserAccountRecordExport {
+    @ExcelProperty(value = "关联订单", index = 0)
+    private String orderNo;
+    @ExcelProperty(value = "老师编号", index = 1)
+    private Long accountId;
+    @ExcelProperty(value = "老师姓名", index = 2)
+    private String accountName;
+    @ExcelProperty(value = "金额", index = 3)
+    private BigDecimal transAmount;
+    @ExcelProperty(value = "产品编号", index = 4)
+    private Long bizId;
+    @ExcelProperty(value = "入账状态", index = 5, converter = PostStatusConvert.class)
+    private PostStatusEnum postStatus;
+    @ExcelProperty(value = "更新时间", index = 6)
+    private Date updateTime;
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public BigDecimal getTransAmount() {
+        return transAmount;
+    }
+
+    public void setTransAmount(BigDecimal transAmount) {
+        this.transAmount = transAmount;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public PostStatusEnum getPostStatus() {
+        return postStatus;
+    }
+
+    public void setPostStatus(PostStatusEnum postStatus) {
+        this.postStatus = postStatus;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/PlatformCashAccountRecordService.java

@@ -9,6 +9,8 @@ import com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.vo.PlatformCashAccountRecordSummaryVo;
 
+import java.util.List;
+
 /**
  * 平台账户流水表(PlatformCashAccountRecord)表服务接口
  *
@@ -20,7 +22,9 @@ public interface PlatformCashAccountRecordService extends IService<PlatformCashA
     PlatformCashAccountRecordDao getDao();
     
     IPage<PlatformCashAccountRecord> queryPage(IPage<PlatformCashAccountRecord> page, PlatformCashAccountRecordSearch query);
-    
+
+    List<PlatformCashAccountRecord> queryAll(PlatformCashAccountRecordSearch query);
+
     PlatformCashAccountRecordSummaryVo querySummary(PlatformCashAccountRecordSearch query);
     
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserAccountRecordService.java

@@ -40,7 +40,7 @@ public interface UserAccountRecordService extends IService<UserAccountRecord> {
      */
     IPage<UserAccountRecordVo> selectPage(IPage<UserAccountRecordVo> page, UserAccountRecordSearch query);
 
-    List<UserAccountRecordVo> selectAllPage(UserAccountRecordSearch query);
+    List<UserAccountRecordVo> selectAll(UserAccountRecordSearch query);
 
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PlatformCashAccountRecordServiceImpl.java

@@ -3,11 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
 import com.yonge.toolset.base.util.StringUtil;
 import org.slf4j.Logger;
@@ -21,12 +17,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dao.PlatformCashAccountRecordDao;
 import com.yonge.cooleshow.biz.dal.dto.search.PlatformCashAccountRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord;
-import com.yonge.cooleshow.biz.dal.entity.SysConfig;
 import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.PlatformCashAccountRecordService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.vo.PlatformCashAccountRecordSummaryVo;
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.enums.PostStatusEnum;
 import org.springframework.util.CollectionUtils;
 
@@ -57,6 +51,11 @@ public class PlatformCashAccountRecordServiceImpl extends ServiceImpl<PlatformCa
     }
 
     @Override
+    public List<PlatformCashAccountRecord> queryAll(PlatformCashAccountRecordSearch query) {
+        return getDao().queryAll(query);
+    }
+
+    @Override
     public PlatformCashAccountRecordSummaryVo querySummary(PlatformCashAccountRecordSearch query) {
         return getDao().querySummary(query);
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountRecordServiceImpl.java

@@ -66,8 +66,8 @@ public class UserAccountRecordServiceImpl extends ServiceImpl<UserAccountRecordD
     }
 
     @Override
-    public List<UserAccountRecordVo> selectAllPage(UserAccountRecordSearch query) {
-        return baseMapper.selectAllPage(query);
+    public List<UserAccountRecordVo> selectAll(UserAccountRecordSearch query) {
+        return baseMapper.selectAll(query);
     }
 
     @Override

cooleshow-user/user-biz/src/main/resources/config/mybatis/PlatformCashAccountRecordMapper.xml

@@ -69,8 +69,8 @@
         </foreach>
     </update>
 
-	<select id="queryPage" resultType="com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord">
-    	select * from platform_cash_account_record
+	<sql id="selectSql">
+		select * from platform_cash_account_record
 		<where>
 			<if test="param.orderNo">
 				and order_no_ = #{param.orderNo}
@@ -94,9 +94,16 @@
 				and update_time_ &lt;= #{param.endDate}
 			</if>
 		</where>
+	</sql>
+	<select id="queryPage" resultType="com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord">
+		<include refid="selectSql"/>
     </select>
-    
-    <select id="querySummary" resultType="com.yonge.cooleshow.biz.dal.vo.PlatformCashAccountRecordSummaryVo">
+
+	<select id="queryAll" resultType="com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord">
+		<include refid="selectSql"/>
+	</select>
+
+	<select id="querySummary" resultType="com.yonge.cooleshow.biz.dal.vo.PlatformCashAccountRecordSummaryVo">
 		select
 			sum(case when in_or_out_ = 'IN' and post_status_ = 'WAIT' then trans_amount_ else 0 end) advancesReceived,
 			sum(case when in_or_out_ = 'IN' and post_status_ = 'RECORDED' then trans_amount_ else 0 end) settledReceived,
@@ -144,7 +151,7 @@
 		</foreach>
 	</select>
 
-	<update id="cancelRecord">
+    <update id="cancelRecord">
 		update platform_cash_account_record set post_status_ = 'CANCEL'
 		where post_status_ = 'WAIT' and order_no_ = #{orderNo} and biz_id_ = #{bizId}
 		and biz_type_ = #{bizType}

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserAccountRecordMapper.xml

@@ -99,7 +99,7 @@
         <include refid="selectSql"/>
     </select>
 
-    <select id="selectAllPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo">
+    <select id="selectAll" resultType="com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo">
         <include refid="selectSql"/>
     </select>