server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -60,11 +60,9 @@ private Integer objType; @ApiModelProperty(value = "交易类型 0租车押金 1套餐卡购买") private Integer type; @ApiModelProperty(value = "用户编码（关联member表）") @TableField(exist = false) private String memberName; @ApiModelProperty(value = "交易金额") @ExcelColumn(name="押金（元）",index = 4,width = 10,align = HorizontalAlignment.CENTER) private BigDecimal money; @@ -78,6 +76,7 @@ @ApiModelProperty(value = "在线交易单号") @ExcelColumn(name="交易单号",index = 3,width = 10,align = HorizontalAlignment.CENTER) private String onlineOrderid; @ApiModelProperty(value = "支付状态 0待支付 1已支付") private Integer payStatus; @@ -100,18 +99,14 @@ private Date closeDate; @ApiModelProperty(value = "结算备注") private String closeInfo; @ApiModelProperty(value = "结算操作人编码（关联system_user)") private String closeUserId; @ApiModelProperty(value = "结算类型 0用户自行结算 1平台人工强制结算 2系统自动结算") private Integer closeType; @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") @@ -123,22 +118,20 @@ @ApiModelProperty(value = "交易笔数", example = "0") @TableField(exist = false) private int countNum; @ApiModelProperty(value = "退款总额(分）") @TableField(exist = false) @ExcelColumn(name="退押金(元)",index = 6,width = 10,align = HorizontalAlignment.CENTER) private BigDecimal refundMoney; @ApiModelProperty(value = "骑行卡抵扣(分）") @TableField(exist = false) private BigDecimal discountMoney; @ApiModelProperty(value = "最后退款时间") @TableField(exist = false) @ExcelColumn(name="退款结算时间",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss") private Date refundDate; @ApiModelProperty(value = "最近骑行状态") @TableField(exist = false) private Integer memberRidesStatus; @ApiModelProperty(value = "是否结算 0 未结算 1已结算") @TableField(exist = false) private Integer closeStatus; server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -1,10 +1,12 @@ package com.doumee.dao.business.web.response; import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; import java.util.Date; /** @@ -53,6 +55,8 @@ @ExcelColumn(name="归还站点",index = 10,width = 10,align = HorizontalAlignment.CENTER) private String backSiteId; @ApiModelProperty(value = "骑行卡抵扣(分）") private BigDecimal discountPrice; @ApiModelProperty(value = "还车锁头编码") @ExcelColumn(name="归还锁具",index = 12,width = 10,align = HorizontalAlignment.CENTER) private String backLockId; @@ -64,6 +68,8 @@ @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车 3开锁失败") // @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,width = 10,align = HorizontalAlignment.CENTER) private Integer status; @ApiModelProperty(value = "车辆类型 0自行车 1电车") private Integer type; @ApiModelProperty(value = "结算状态") // @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,width = 10,align = HorizontalAlignment.CENTER) server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
@@ -6,6 +6,7 @@ import lombok.Data; import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; import java.util.Date; /** @@ -26,10 +27,13 @@ @ExcelColumn(name="车辆编号",index = 2,width = 10,align = HorizontalAlignment.CENTER) private String bikeCode; @ApiModelProperty(value = "车辆类型 0自行车 1电车") private Integer type; @ApiModelProperty(value = "车辆类型") @ExcelColumn(name="车辆类型",index = 3,width = 10,align = HorizontalAlignment.CENTER) private String bikeType; @ApiModelProperty(value = "套餐抵扣价格（分）") private BigDecimal discountPrice; @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER) private Integer closeStatus;
@@ -317,7 +317,8 @@ IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel()); queryWrapper.orderByDesc(Goodsorder::getPayDate); queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus"); queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," + "(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus"); if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){ queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey()); } @@ -330,6 +331,7 @@ s.setMoney(Constants.translateMoney(s.getMoney())); s.setCloseMoney(Constants.translateMoney(s.getCloseMoney())); s.setRefundMoney(Constants.translateMoney(s.getRefundMoney())); s.setDiscountMoney(Constants.translateMoney(s.getDiscountMoney())); }); } return PageData.from(goodsorderIPage); @@ -471,6 +473,12 @@ GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO(); goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//交易明细 goodsorderDetailDTO.setMemberRidesList(memberRides);//骑行记录 if(memberRides!=null){ for(BikeLogDTO dd: memberRides){ goodsorder.setDiscountMoney(Constants.formatDecimalNum(goodsorder.getDiscountMoney()).add(Constants.formatDecimalNum(dd.getDiscountPrice()))); } goodsorder.setDiscountMoney(Constants.translateMoney(goodsorder.getDiscountMoney())); } goodsorderDetailDTO.setModel(goodsorder);//订单对象 return goodsorderDetailDTO; } server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -244,6 +244,8 @@ Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())); queryWrapper .selectAs(MemberRides::getId,MemberRidesDTO::getId) .selectAs(MemberRides::getDiscountPrice,MemberRidesDTO::getDiscountPrice) .selectAs(MemberRides::getType,MemberRidesDTO::getType) .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid) .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode) .selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
