From b1c2310c16dfd393cd07f3c175e61f0b2ff63b31 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 12 Jun 2025 15:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/account/domain/vo/AccOperationListVO.java | 9 +++++++++ .../account/service/impl/AccTradeServiceImpl.java | 3 --- .../canteen/core/pay/constants/PayStateEnum.java | 12 ++++++++++++ .../main/resources/mapper/account/AccTradeMapper.xml | 10 ++++------ 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccOperationListVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccOperationListVO.java index 35ed53e..cf794c6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccOperationListVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccOperationListVO.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.account.domain.vo; import cn.hutool.core.util.ObjectUtil; import com.bonus.canteen.core.account.constants.AccTradeStateEnum; +import com.bonus.canteen.core.pay.constants.PayStateEnum; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,10 +35,14 @@ public class AccOperationListVO { private Integer tradeState; @ApiModelProperty("结果名称") private String tradeStateName; + @ApiModelProperty("支付状态") + private Integer payState; + private Integer payStateName; @ApiModelProperty("操作员") private String createBy; @ApiModelProperty("交易单号") private Long tradeId; + private String failReason; public String getTradeStateName() { if (ObjectUtil.isNotNull(this.tradeState)) { @@ -46,4 +51,8 @@ public class AccOperationListVO { return this.tradeStateName; } } + + public String getPayStateName() { + return PayStateEnum.getDesc(this.payState); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java index 2a7c006..283a99f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java @@ -152,9 +152,6 @@ public class AccTradeServiceImpl implements IAccTradeService { @Override public List queryAccOperationList(AccWalletOperationQueryParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); - if(Objects.isNull(param.getPayState())) { - param.setPayState(PayStateEnum.PAY_SUCC.getKey()); - } List list = accTradeMapper.queryAccOperationList(param, encryptedSearchValue); if(CollUtil.isNotEmpty(list)) { for(AccOperationListVO vo : list) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayStateEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayStateEnum.java index 350b0c8..70bba95 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayStateEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayStateEnum.java @@ -1,5 +1,7 @@ package com.bonus.canteen.core.pay.constants; +import com.bonus.canteen.core.account.constants.AccTradeStateEnum; + public enum PayStateEnum { UN_PAY(1, "未支付"), PAY_INPROCESS(2, "支付中"), @@ -28,4 +30,14 @@ public enum PayStateEnum { return !UN_PAY.getKey().equals(key); } + public static String getDesc(Integer key) { + PayStateEnum[] payStateEnums = values(); + for (PayStateEnum temp : payStateEnums) { + if (temp.getKey().equals(key)) { + return temp.getDesc(); + } + } + return ""; + } + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml index 1a66029..bb96287 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml @@ -234,13 +234,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ate.create_by, ate.trade_id, ate.trade_state, + ate.pay_state, ate.amount, - atwd.wallet_bal + ate.wallet_bal_total as walletBal, + ate.fail_reason FROM account_trade ate LEFT JOIN sys_user su ON su.user_id = ate.user_id LEFT JOIN sys_dept sd ON sd.dept_id = su.dept_id - LEFT JOIN account_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id ate.trade_type = #{param.tradeType} @@ -248,9 +249,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ate.pay_state = #{param.payState} - - and atwd.wallet_type = #{param.walletType} - and ate.trade_time = ]]> #{param.startDateTime} @@ -276,7 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ate.user_id = #{param.userId} - order by atwd.id desc + order by ate.trade_id desc