diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java index 379baf52..95f364fe 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java @@ -1,5 +1,7 @@ package com.hzs.common.domain.third.pay.ext; +import com.hzs.common.core.annotation.Transaction; +import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.domain.third.pay.TOnlinePayment; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,4 +29,8 @@ public class TOnlinePaymentExt extends TOnlinePayment { */ private String memberName; + + private Integer orderType; + private String orderTypeVal; + } diff --git a/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java b/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java index a1dc4ccc..60ff31a1 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java +++ b/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java @@ -65,4 +65,10 @@ public class OnlinePaymentParam { */ private String payNumber; + /** + * 订单类型 EOrderType + * -1为充值 + */ + private Integer orderType; + } diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java index b2c9491a..8be0c6a0 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java @@ -3,6 +3,7 @@ package com.hzs.third.pay.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.common.core.enums.EOrderType; import com.hzs.common.domain.third.pay.TOnlinePayment; import com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt; import com.hzs.third.pay.mapper.TOnlinePaymentMapper; @@ -51,7 +52,15 @@ public class TOnlinePaymentServiceImpl extends ServiceImpl queryList(OnlinePaymentParam param, Integer pkCountry) { - return baseMapper.queryList(param, pkCountry); + List result = baseMapper.queryList(param, pkCountry); + for (TOnlinePaymentExt tOnlinePaymentExt : result) { + if(ObjectUtil.isNotEmpty(tOnlinePaymentExt.getOrderType())){ + tOnlinePaymentExt.setOrderTypeVal(EOrderType.getLabelByValue(tOnlinePaymentExt.getOrderType())); + }else{ + tOnlinePaymentExt.setOrderTypeVal("充值订单"); + } + } + return result; } } diff --git a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java index 474e39d4..e6d65712 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java +++ b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java @@ -146,4 +146,9 @@ public class OnlinePaymentVO { @BigDecimalFormat private BigDecimal subAccountMoney; + + private Integer orderType; + + @Excel(name = "订单类型") + private String orderTypeVal; } diff --git a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml index cf8783d4..58121ba7 100644 --- a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml +++ b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml @@ -30,10 +30,12 @@