mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-22 12:05:05 +08:00
后管运营商vip会员页面新增导出功能
This commit is contained in:
@@ -37,6 +37,8 @@ public class UniAppQueryMemberBalanceDTO extends BaseMemberDTO{
|
||||
*/
|
||||
private String walletCode;
|
||||
|
||||
private String memberId;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.jsowell.pile.vo.uniapp.customer;
|
||||
|
||||
import com.jsowell.common.annotation.Excel;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
@@ -18,6 +19,7 @@ public class MemberWalletLogVO {
|
||||
/**
|
||||
* 会员id
|
||||
*/
|
||||
@Excel(name = "会员id")
|
||||
private String memberId;
|
||||
|
||||
/**
|
||||
@@ -28,6 +30,7 @@ public class MemberWalletLogVO {
|
||||
/**
|
||||
* 子类型 10-充值, 11-赠送, 12-订单结算退款,20-后管扣款, 21-订单付款, 22-用户退款
|
||||
*/
|
||||
@Excel(name = "操作类型(10-充值, 11-赠送, 12-订单结算退款,20-后管扣款, 21-订单付款, 22-用户退款)")
|
||||
private String subType;
|
||||
|
||||
/**
|
||||
@@ -38,6 +41,7 @@ public class MemberWalletLogVO {
|
||||
/**
|
||||
* 交易时间
|
||||
*/
|
||||
@Excel(name = "交易时间")
|
||||
private String transactionTime;
|
||||
|
||||
/**
|
||||
@@ -53,16 +57,19 @@ public class MemberWalletLogVO {
|
||||
/**
|
||||
* 支付金额
|
||||
*/
|
||||
@Excel(name = "支付金额")
|
||||
private BigDecimal payAmount;
|
||||
|
||||
/**
|
||||
* 订单金额
|
||||
*/
|
||||
@Excel(name = "订单金额")
|
||||
private BigDecimal orderAmount;
|
||||
|
||||
/**
|
||||
* 退款金额
|
||||
*/
|
||||
@Excel(name = "退款金额")
|
||||
private BigDecimal refundAmount;
|
||||
|
||||
/**
|
||||
|
||||
@@ -490,11 +490,23 @@
|
||||
t1.create_time as transactionTime
|
||||
from member_wallet_log t1
|
||||
left join order_basic_info t2 on t1.related_order_code = t2.order_code
|
||||
where t1.member_id = #{dto.memberId,jdbcType=VARCHAR}
|
||||
and t1.wallet_code = #{dto.walletCode,jdbcType=VARCHAR}
|
||||
and t1.create_time <![CDATA[ >= ]]> #{dto.tradeDate,jdbcType=VARCHAR}
|
||||
and t1.create_time <![CDATA[ < ]]> #{dto.endDate,jdbcType=VARCHAR}
|
||||
and t1.sub_type != '12'
|
||||
where t1.sub_type != '12'
|
||||
<if test="dto.memberId != null and dto.memberId != ''">
|
||||
and t1.member_id = #{dto.memberId,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="dto.walletCode != null and dto.walletCode != ''">
|
||||
and t1.wallet_code = #{dto.walletCode,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="dto.tradeDate != null and dto.tradeDate != ''">
|
||||
and t1.create_time <![CDATA[ >= ]]> #{dto.tradeDate,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="dto.endDate != null and dto.endDate != ''">
|
||||
and t1.create_time <![CDATA[ < ]]> #{dto.endDate,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<!-- where t1.member_id = #{dto.memberId,jdbcType=VARCHAR}-->
|
||||
<!-- and t1.wallet_code = #{dto.walletCode,jdbcType=VARCHAR}-->
|
||||
<!-- and t1.create_time <![CDATA[ >= ]]> #{dto.tradeDate,jdbcType=VARCHAR}-->
|
||||
<!-- and t1.create_time <![CDATA[ < ]]> #{dto.endDate,jdbcType=VARCHAR}-->
|
||||
order by t1.create_time desc
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user