From 03dd384bb8b78f04eadcf619849b3687fa98c6c1 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期六, 22 七月 2023 18:19:47 +0800
Subject: [PATCH] 微信支付,支付与结果通知

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
index 59694ca..54dd9dd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
@@ -20,34 +20,37 @@
     @ApiModelProperty(value = "订单id")
     private String orderId;
 
-    @ApiModelProperty("订单编号")
+    @ApiModelProperty(value="订单编号")
     private String orderNo;
 
     @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
     private Integer orderStatus;
 
-    @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+    @ApiModelProperty(value="订单来源1.商城订单2.秒杀活动3.线下创建")
     private Integer orderFrom;
 
-    @ApiModelProperty("订单商品列表")
+    @ApiModelProperty(value="订单商品列表")
     private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
 
-    @ApiModelProperty("订单支付金额")
+    @ApiModelProperty(value="订单支付金额")
     private BigDecimal receivableMoney;
 
-    @ApiModelProperty("商品数量")
+    @ApiModelProperty(value="商品数量")
     private Integer goodsNum;
 
-    @ApiModelProperty("商户id")
+    @ApiModelProperty(value="商户id")
     private Long shopId;
 
-    @ApiModelProperty("商户名称")
+    @ApiModelProperty(value="商户名称")
     private String shopName;
 
-    @ApiModelProperty("商户服务电话")
+    @ApiModelProperty(value="商户服务电话")
     private String shopServicePhone;
 
     @ApiModelProperty(value = "是否绑定商户0否1是")
     private Integer sameShop;
 
+    @ApiModelProperty(value = "核销码")
+    private String verifyCode;
+
 }

--
Gitblit v1.7.1