diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java index f330eced..3feeb562 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java @@ -141,11 +141,13 @@ public class PayServiceImpl implements IPayService { if (StringUtils.isNotNull(rechargeOrder)) { orderExist = true; vo.setPayStatus(rechargeOrder.getPayStatus()); - vo.setPayWay(PaymentEnum.getPayWayMsg(rechargeOrder.getPayWay())); vo.setOrderId(rechargeOrder.getId()); - vo.setOrderSn(rechargeOrder.getSn()); - vo.setOrderAmount(rechargeOrder.getOrderAmount()); - vo.setPayTime(StringUtils.isNotEmpty(vo.getPayTime()) ? TimeUtils.timestampToDate(vo.getPayTime()) : ""); + JSONObject order = new JSONObject(); + order.put("order_amount", rechargeOrder.getOrderAmount()); + order.put("order_sn", rechargeOrder.getSn()); + order.put("pay_time", StringUtils.isNotNull(rechargeOrder.getPayTime()) ? TimeUtils.timestampToDate(rechargeOrder.getPayTime()) : ""); + order.put("pay_way", PaymentEnum.getPayWayMsg(rechargeOrder.getPayWay())); + vo.setOrder(order); } break; case "order": diff --git a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java index 39d0b23d..5fd7fcd5 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java @@ -1,5 +1,6 @@ package com.mdd.front.vo.pay; +import com.alibaba.fastjson2.JSONObject; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.models.auth.In; @@ -14,22 +15,24 @@ public class PayStatusVo implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "订单信息") + private JSONObject order; @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]") private Integer payStatus; - @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]") - private String payWay; +// @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]") +// private String payWay; - @ApiModelProperty(value = "支付时间") - private String payTime; +// @ApiModelProperty(value = "支付时间") +// private String payTime; @ApiModelProperty(value = "订单ID") private Integer orderId; - @ApiModelProperty(value = "订单编号") - private String orderSn; +// @ApiModelProperty(value = "订单编号") +// private String orderSn; - @ApiModelProperty(value = "订单金额") - private BigDecimal orderAmount; +// @ApiModelProperty(value = "订单金额") +// private BigDecimal orderAmount; } diff --git a/sql/install_v1.9.0.sql b/sql/install_v1.9.0.sql index cfb30f88..d027d1c0 100644 --- a/sql/install_v1.9.0.sql +++ b/sql/install_v1.9.0.sql @@ -242,7 +242,8 @@ INSERT INTO `la_dev_pay_way` (`id`, `pay_config_id`, `scene`, `is_default`, `sta (4, 2, 2, 1, 1), (5, 1, 3, 0, 1), (6, 2, 3, 1, 1), -(7, 3, 3, 0, 1); +(7, 3, 3, 0, 1), +(8, 3, 2, 0, 1); DROP TABLE IF EXISTS `la_dict_data`; CREATE TABLE `la_dict_data` (