mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat 增加返回充值选择支付列表

This commit is contained in:
damonyuan 2024-10-21 00:27:57 +08:00
parent aaa922990a
commit d44dc4e799
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/like-common/src/main/java/com/mdd/common/entity/RechargeOrder.java
View File

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.math.BigInteger;
@Data
@ApiModel("充值订单实体类")
@ -48,7 +49,7 @@ public class RechargeOrder {
@ApiModelProperty("退款状态: [0=未退款 , 1=已退款]")
private Integer refundStatus;
@ApiModelProperty("退款交易流水号")
private Integer refundTransactionId;
private BigInteger refundTransactionId;
@ApiModelProperty("创建时间")
private Long createTime;

15
server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.mdd.common.entity.user.UserAuth;
import com.mdd.common.enums.ClientEnum;
import com.mdd.common.enums.LogMoneyEnum;
import com.mdd.common.enums.PaymentEnum;
import com.mdd.common.enums.YesNoEnum;
import com.mdd.common.exception.OperateException;
import com.mdd.common.exception.PaymentException;
import com.mdd.common.mapper.log.UserAccountLogMapper;
@ -69,7 +70,7 @@ public class PayServiceImpl implements IPayService {
List<DevPayWay> devPayWays = devPayWayMapper.selectList(
new QueryWrapper<DevPayWay>()
.eq("scene", terminal)
.eq("status", 1));
.eq("status", YesNoEnum.YES.getCode()).orderByDesc("is_default").orderByAsc("id"));
PayWayListVo vo = new PayWayListVo();
if (from.equals("recharge")) {
@ -90,10 +91,20 @@ public class PayServiceImpl implements IPayService {
infoVo.setName(devPayConfig.getName());
infoVo.setIcon(UrlUtils.toAbsoluteUrl(devPayConfig.getIcon()));
infoVo.setIsDefault(way.getIsDefault());
infoVo.setSort(devPayConfig.getSort());
infoVo.setRemark(devPayConfig.getRemark());
infoVo.setPayWay(devPayConfig.getPayWay());
if (devPayConfig.getPayWay().equals(PaymentEnum.WX_PAY.getCode())) {
infoVo.setExtra("微信快捷支付");
}
if (devPayConfig.getPayWay().equals(PaymentEnum.ALI_PAY.getCode())) {
infoVo.setExtra("支付宝快捷支付");
}
list.add(infoVo);
}
vo.setList(list);
vo.setLists(list);
return vo;
}

5
server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayInfoVo.java
View File

@ -24,4 +24,9 @@ public class PayWayInfoVo implements Serializable {
@ApiModelProperty(value = "是否默认: [0=否, 1=是]")
private Integer isDefault;
private String extra;
private Integer payWay;
private String remark;
private Integer sort;
}

2
server/like-front/src/main/java/com/mdd/front/vo/pay/PayWayListVo.java
View File

@ -16,6 +16,6 @@ public class PayWayListVo implements Serializable {
private BigDecimal orderAmount;
@ApiModelProperty(value = "方式列表")
private List<PayWayInfoVo> list;
private List<PayWayInfoVo> lists;
}