# excel导出调整

jiaosong

2023-10-26 ef7526aa13ad39ed177b4088066bd532b0a2ac07

# excel导出调整

 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -25,7 +25,7 @@
public class Goodsorder {

    @ApiModelProperty(value = "编码")
    @ExcelColumn(name="订单编号",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="订单编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String id;

    @ApiModelProperty(value = "创建时间")
@@ -61,7 +61,7 @@
    private String memberName;

    @ApiModelProperty(value = "交易金额")
    @ExcelColumn(name="押金（元）",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="押金（元）",index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal money;

    @ApiModelProperty(value = "状态 0待支付 1已支付 2已取消 3支付失败 4已结算")
@@ -71,7 +71,7 @@
    private String preOrderid;

    @ApiModelProperty(value = "在线交易单号")
    @ExcelColumn(name="交易单号",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="交易单号",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    private String onlineOrderid;
    @ApiModelProperty(value = "支付状态 0待支付 1已支付")
    private Integer payStatus;
@@ -80,21 +80,21 @@
    private Integer payWay;

    @ApiModelProperty(value = "支付时间")
    @ExcelColumn(name="交押金时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="交押金时间",index = 5,width = 10,align = HorizontalAlignment.CENTER)
    private Date payDate;

    @ApiModelProperty(value = "交易类型 0租车押金")
    private Integer type;

    @ApiModelProperty(value = "结算金额(分）")
    @ExcelColumn(name="结算金额",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算金额(元)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal closeMoney;

    @ApiModelProperty(value = "结算退款单号(关联refund)")
    private String closeId;

    @ApiModelProperty(value = "结算时间")
//    @ExcelColumn(name="退款结算时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算时间",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Date closeDate;
    @ApiModelProperty(value = "结算备注")
    private String closeInfo;
@@ -107,7 +107,9 @@

    @ApiModelProperty(value = "用户openid" )
    @TableField(exist = false)
    @ExcelColumn(name="用户",index = 1 ,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "查询开始日期（包含）", example = "2023-10-01 15:12:01")
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -119,14 +121,15 @@
    @ApiModelProperty(value = "交易笔数", example = "0")
    @TableField(exist = false)
    private int countNum;

    @ApiModelProperty(value = "退款总额(分）")
    @TableField(exist = false)
    @ExcelColumn(name="退款总额（元）",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="退押金(元)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private BigDecimal refundMoney;

    @ApiModelProperty(value = "最后退款时间")
    @TableField(exist = false)
    @ExcelColumn(name="退款结算时间",width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="退款结算时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    private Date refundDate;

    @ApiModelProperty(value = "最近骑行状态")

 server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java

@@ -38,7 +38,7 @@


    @ApiModelProperty(value = "支付时间")
    @ExcelColumn(name="支付时间",width = 10,index = 4,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="支付时间",width = 10,index = 4,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date payDate;

    @ApiModelProperty(value = "结算金额(分）")
@@ -46,7 +46,7 @@
    private BigDecimal closeMoney;

    @ApiModelProperty(value = "结算时间")
    @ExcelColumn(name="结算时间",width = 10,index = 6,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算时间",width = 10,index = 6,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date closeDate;

    @ApiModelProperty(value = "退款金额(分）")
@@ -54,7 +54,7 @@
    private BigDecimal refundMoney;

    @ApiModelProperty(value = "退款时间")
    @ExcelColumn(name="退款时间",width = 10,index = 8,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="退款时间",width = 10,index = 8,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date refundDate;

}

 server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java

@@ -60,10 +60,10 @@
    private Date backDate;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;

    @ApiModelProperty(value = "结算状态")
    @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,width = 10,align = HorizontalAlignment.CENTER)
    private Integer closeStatus;
}

 server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java

@@ -34,7 +34,7 @@
    private Integer closeStatus;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
//    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;

    @ApiModelProperty(value = "骑行时长")
@@ -46,11 +46,11 @@
    private Integer duration;

    @ApiModelProperty(value = "租车时间")
    @ExcelColumn(name="租车时间",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="租车时间",index = 8,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date rentDate;

    @ApiModelProperty(value = "还车时间")
    @ExcelColumn(name="还车时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    @ExcelColumn(name="还车时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date backDate;

    @ApiModelProperty(value = "租车站点编码")

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -171,13 +171,27 @@
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        pageWrap.getModel().setPayStatus(Constants.ONE); //只查询支付成功的
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class,queryWrapper));
        IPage<GoodsorderExportVO> goodsorderExportVOIPage = goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
        if (!CollectionUtils.isEmpty(goodsorderExportVOIPage.getRecords())){
            goodsorderExportVOIPage.getRecords().forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
            });
        }
        return PageData.from(goodsorderExportVOIPage);
    }
    @Override
    public   List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
        model.setPayStatus(Constants.ONE); //只查询支付成功的
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
        List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(goodsorderList)){
            goodsorderList.forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
            });
        }
       /*   List<GoodsorderExportVO> list = new ArrayList<>();
        if(goodsorderList!=null){
            for(Goodsorder order : goodsorderList){
@@ -589,8 +603,12 @@
            model.setPayNum(0);
            model.setRefundNum(0);
            QueryWrapper<Goodsorder> queryWrapper = new QueryWrapper<>();
            queryWrapper.lambda().ge(param.getStartDate() !=null,Goodsorder::getPayDate, Utils.Date.getStart(param.getStartDate()));
            queryWrapper.lambda().le(param.getEndDate() !=null,Goodsorder::getPayDate, Utils.Date.getEnd(param.getEndDate()));
            if(Objects.nonNull(param.getStartDate())){
                queryWrapper.lambda().ge(param.getStartDate() !=null,Goodsorder::getPayDate, Utils.Date.getStart(param.getStartDate()));
            }
            if(Objects.nonNull(param.getEndDate())) {
                queryWrapper.lambda().le(param.getEndDate() != null, Goodsorder::getPayDate, Utils.Date.getEnd(param.getEndDate()));
            }
            queryWrapper.lambda().eq(Goodsorder::getPayStatus, Constants.ONE);//已支付
            queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO);
            queryWrapper.lambda().groupBy(Goodsorder::getStatus);