支付提交

nbjk-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -212,6 +212,7 @@ public class WxController extends BaseController {
         order.setGoodsId(wxOrderDTO.getExamId());
         order.setGoodsName(examInfo.getName());
         order.setOutTradeNo(orderCode);
+        order.setUserId(userInfo.getId());
         order.setXcxOpenid(userInfo.getXcxOpenid());
         order.setAppOpenid(userInfo.getAppOpenid());
         order.setGzhOpenid(userInfo.getGzhOpenid());

nbjk-service/src/main/java/com/miaxis/wx/domain/WxOrder.java

@@ -1,26 +1,29 @@
 package com.miaxis.wx.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
+import com.miaxis.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
-
-import java.util.Date;
-
 /**
- * 微信支付预生成订单表
+ * 微信订单对象 wx_order
+ *
  * @author miaxis
- * @date 2021-05-07
+ * @date 2023-03-22
  */
 @Data
 @TableName("wx_order")
 @ApiModel(value = "WxOrder", description = "微信订单对象 wx_order")
-public class WxOrder extends BaseBusinessEntity {
+public class WxOrder extends BaseBusinessEntity{
     private static final long serialVersionUID = 1L;
 
     /** id */
@@ -28,11 +31,10 @@ public class WxOrder extends BaseBusinessEntity {
     @ApiModelProperty(value = "id")
     private Long id;
 
-
-    /** 商品ID */
-    @Excel(name = "商品ID")
+    /** 商品ID（考场ID） */
+    @Excel(name = "商品ID（考场ID）", readConverterExp = "考=场ID")
     @TableField("goods_id")
-    @ApiModelProperty(value = "商品ID(考场ID)")
+    @ApiModelProperty(value = "商品ID（考场ID）")
     private Long goodsId;
 
     /** 商品名称 */
@@ -41,37 +43,36 @@ public class WxOrder extends BaseBusinessEntity {
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
 
-    /** 用户ID */
-    @Excel(name = "用户ID")
+    /** 用户id */
+    @Excel(name = "用户id")
     @TableField("user_id")
-    @ApiModelProperty(value = "用户ID")
+    @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    /** 用户union_id */
-    @Excel(name = "union_id")
+    /** unionid */
+    @Excel(name = "unionid")
     @TableField("union_id")
-    @ApiModelProperty(value = "union_id")
+    @ApiModelProperty(value = "unionid")
     private String unionId;
 
-    /** app_openid */
-    @Excel(name = "app_openid")
+    /** appid */
+    @Excel(name = "appid")
     @TableField("app_openid")
-    @ApiModelProperty(value = "app_openid")
+    @ApiModelProperty(value = "appid")
     private String appOpenid;
 
-    /** xcx_openid */
-    @Excel(name = "小程序openid")
+    /** 小程序端openid */
+    @Excel(name = "小程序端openid")
     @TableField("xcx_openid")
-    @ApiModelProperty(value = "用户ID")
+    @ApiModelProperty(value = "小程序端openid")
     private String xcxOpenid;
 
-    /** gzh_openid */
-    @Excel(name = "公众号openid")
+    /** 公众号端openid */
+    @Excel(name = "公众号端openid")
     @TableField("gzh_openid")
-    @ApiModelProperty(value = "用户ID")
+    @ApiModelProperty(value = "公众号端openid")
     private String gzhOpenid;
 
-
     /** 商户订单号 */
     @Excel(name = "商户订单号")
     @TableField("out_trade_no")
@@ -103,19 +104,20 @@ public class WxOrder extends BaseBusinessEntity {
     private String tradeType;
 
     /** 交易状态，枚举值：
-        SUCCESS：支付成功
-        REFUND：转入退款
-        NOTPAY：未支付
-        CLOSED：已关闭
-        REVOKED：已撤销（付款码支付）
-        USERPAYING：用户支付中（付款码支付）
-        PAYERROR：支付失败(其他原因，如银行返回失败)
-        ACCEPT：已接收，等待扣款 */
+     SUCCESS：支付成功
+     REFUND：转入退款
+     NOTPAY：未支付
+     CLOSED：已关闭
+     REVOKED：已撤销（付款码支付）
+     USERPAYING：用户支付中（付款码支付）
+     PAYERROR：支付失败(其他原因，如银行返回失败)
+     ACCEPT：已接收，等待扣款 */
+
+    @Excel(name = "交易状态")
     @TableField("trade_state")
-    @ApiModelProperty(value = "交易状态，枚举值： SUCCESS：支付成功 REFUND：转入退款 NOTPAY：" +
-            "未支付 CLOSED：已关闭 REVOKED：已撤销（付款码支付） " +
-            "USERPAYING：用户支付中（付款码支付） PAYERROR：支付失败(其他原因，如银行返回失败) ACCEPT：已接收，等待扣款")
+    @ApiModelProperty(value = "交易状态")
     private String tradeState;
+
     /** 交易状态描述 */
     @Excel(name = "交易状态描述")
     @TableField("trade_state_desc")
@@ -141,7 +143,6 @@ public class WxOrder extends BaseBusinessEntity {
     @ApiModelProperty(value = "支付完成时间")
     private Date successTime;
 
-
     /** 订单总金额，单位为分。 */
     @Excel(name = "订单总金额，单位为分。")
     @TableField("total")
@@ -166,24 +167,22 @@ public class WxOrder extends BaseBusinessEntity {
     @ApiModelProperty(value = "用户支付币种")
     private String payerCurrency;
 
-    /** 订单状态 */
-    @Excel(name = "订单数据详情")
+    /** 订单状态: 1 -进行中 2-购买成功 3-购买失败 */
+    @Excel(name = "订单状态: 1 -进行中 2-购买成功 3-购买失败")
     @TableField("order_status")
     @ApiModelProperty(value = "订单状态: 1 -进行中 2-购买成功 3-购买失败")
     private String orderStatus;
 
     /** 手机类型 1:苹果 2:安卓 */
-    @Excel(name = "手机类型")
+    @Excel(name = "手机类型 1:苹果 2:安卓")
     @TableField("phone_type")
     @ApiModelProperty(value = "手机类型 1:苹果 2:安卓")
     private Integer phoneType;
 
 
     /** 前端类型 1:app 2:小程序 3:公众号 */
-    @Excel(name = "前端类型")
+    @Excel(name = "前端类型 1:app 2:小程序 3:公众号")
     @TableField("fore_type")
     @ApiModelProperty(value = "前端类型 1:app 2:小程序 3:公众号")
     private Integer foreType;
-
-
 }