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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
pan.wl.2 2024-11-15 21:57:32 +08:00
parent dece7d4f7e 92d262daf6
commit bfd39255c1
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,11 +141,13 @@ public class PayServiceImpl implements IPayService {
if (StringUtils.isNotNull(rechargeOrder)) { if (StringUtils.isNotNull(rechargeOrder)) {
orderExist = true; orderExist = true;
vo.setPayStatus(rechargeOrder.getPayStatus()); vo.setPayStatus(rechargeOrder.getPayStatus());
vo.setPayWay(PaymentEnum.getPayWayMsg(rechargeOrder.getPayWay()));
vo.setOrderId(rechargeOrder.getId()); vo.setOrderId(rechargeOrder.getId());
vo.setOrderSn(rechargeOrder.getSn()); JSONObject order = new JSONObject();
vo.setOrderAmount(rechargeOrder.getOrderAmount()); order.put("order_amount", rechargeOrder.getOrderAmount());
vo.setPayTime(StringUtils.isNotEmpty(vo.getPayTime()) ? TimeUtils.timestampToDate(vo.getPayTime()) : ""); 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; break;
case "order": case "order":

19
server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java
View File

@ -1,5 +1,6 @@
package com.mdd.front.vo.pay; package com.mdd.front.vo.pay;
import com.alibaba.fastjson2.JSONObject;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
@ -14,22 +15,24 @@ public class PayStatusVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "订单信息")
private JSONObject order;
@ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]") @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]")
private Integer payStatus; private Integer payStatus;
@ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]") // @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]")
private String payWay; // private String payWay;
@ApiModelProperty(value = "支付时间") // @ApiModelProperty(value = "支付时间")
private String payTime; // private String payTime;
@ApiModelProperty(value = "订单ID") @ApiModelProperty(value = "订单ID")
private Integer orderId; private Integer orderId;
@ApiModelProperty(value = "订单编号") // @ApiModelProperty(value = "订单编号")
private String orderSn; // private String orderSn;
@ApiModelProperty(value = "订单金额") // @ApiModelProperty(value = "订单金额")
private BigDecimal orderAmount; // private BigDecimal orderAmount;
} }

3
sql/install_v1.9.0.sql
View File

@ -242,7 +242,8 @@ INSERT INTO `la_dev_pay_way` (`id`, `pay_config_id`, `scene`, `is_default`, `sta
(4, 2, 2, 1, 1), (4, 2, 2, 1, 1),
(5, 1, 3, 0, 1), (5, 1, 3, 0, 1),
(6, 2, 3, 1, 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`; DROP TABLE IF EXISTS `la_dict_data`;
CREATE TABLE `la_dict_data` ( CREATE TABLE `la_dict_data` (