angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## Feat - 在线支付明细增加订单类型

This commit is contained in:
sangelxiu1 2025-07-15 15:05:50 +08:00 committed by cabbage
parent c0e32d689a
commit 34a49ff9c5
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java
View File

@ -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;
@ -32,4 +34,8 @@ public class TOnlinePaymentExt extends TOnlinePayment {
*/
private String phone;
private Integer orderType;
private String orderTypeVal;
}

6
bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java
View File

@ -75,4 +75,10 @@ public class OnlinePaymentParam {
private Integer systemType;
/**
* 订单类型 EOrderType
* -1为充值
*/
private Integer orderType;
}

11
bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
View File

@ -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;
@ -54,7 +55,15 @@ public class TOnlinePaymentServiceImpl extends ServiceImpl<TOnlinePaymentMapper,
@Override
public List<TOnlinePaymentExt> queryList(OnlinePaymentParam param, Integer pkCountry) {
return baseMapper.queryList(param, pkCountry);
List<TOnlinePaymentExt> 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;
}
}

5
bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java
View File

@ -162,4 +162,9 @@ public class OnlinePaymentVO {
@BigDecimalFormat
private BigDecimal subAccountMoney;
private Integer orderType;
@Excel(name = "订单类型")
private String orderTypeVal;
}

10
bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml
View File

@ -30,10 +30,12 @@
<!-- 查询列表 -->
<select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt">
select top.*, cm.member_code, cm.member_name
select top.*, cm.member_code, cm.member_name,
so.order_type orderType
from T_ONLINE_PAYMENT top
left join cu_member cm
on cm.pk_id = top.pk_creator
left join sa_order so on so.ORDER_CODE = top.business_code
where top.del_flag = 0
and top.pk_country = #{pkCountry}
<if test="param.memberCode != null and param.memberCode != ''">
@ -71,6 +73,12 @@
<if test="param.payNumber != null">
and top.pay_number like #{param.payNumber} || '%'
</if>
<if test="param.orderType != null and param.orderType > 0">
and so.order_type = #{param.orderType}
</if>
<if test="param.orderType != null and param.orderType == -1">
and so.order_type is null
</if>
order by top.creation_time desc
</select>