From eb6b6dbb35a9f029e0b7d269773685c19fd40976 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 11 七月 2024 10:47:51 +0800
Subject: [PATCH] 玩湃微信商户认证代码

---
 cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
index 9bed267..3e695f7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
@@ -3,7 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import javax.naming.PartialResultException;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 购课记录列表VO
@@ -11,23 +13,22 @@
 @Data
 public class CoursePackagePaymentVO {
     /**
-     *
-     {title: 'ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
-     {title: '所在省市', field: 'provinceAndCity', visible: role==1?true:false, align: 'center', valign: 'middle'},
-     {title:  '门店名称', field: 'storeName', visible: true, align: 'center', valign: 'middle'},
-     {title:  '课包类型', field: 'coursePackageType', visible: true, align: 'center', valign: 'middle'},
-     {title:  '课包名称', field: 'coursePackage', visible: true, align: 'center', valign: 'middle'},
-     {title:  '购买用户', field: 'payUser', visible: true, align: 'center', valign: 'middle'},
-     {title:  '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
-     {title:  '购课学员', field: 'payStudent', visible: true, align: 'center', valign: 'middle'},
-     {title:  '购买方式', field: 'buyType', visible: true, align: 'center', valign: 'middle'},
-     {title:  '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
-     formatter:function (data) {return{1:"微信",2:"支付宝",3:"玩湃币",4:"积分",5:"积分+微信",6:"积分+支付宝"}[data]}},
-     {title:  '总金额', field: 'originalPrice'+'元', visible: true, align: 'center', valign: 'middle'},
-     {title:  '优惠金额', field: 'discountAmount'+'元', visible: true, align: 'center', valign: 'middle'},
-     {title:  '支付价格', field: 'cashPayment'+'元', visible: true, align: 'center', valign: 'middle'},
-     {title:  '支付状态', field: 'payStatus', visible: true, align: 'center', valign: 'middle'},
-     {title:  '赠送课时', field: 'giftClassHours', visible: true, align: 'center', valign: 'middle'},
+     * {title: 'ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+     * {title: '所在省市', field: 'provinceAndCity', visible: role==1?true:false, align: 'center', valign: 'middle'},
+     * {title:  '门店名称', field: 'storeName', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '课包类型', field: 'coursePackageType', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '课包名称', field: 'coursePackage', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '购买用户', field: 'payUser', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '购课学员', field: 'payStudent', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '购买方式', field: 'buyType', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
+     * formatter:function (data) {return{1:"微信",2:"支付宝",3:"玩湃币",4:"积分",5:"积分+微信",6:"积分+支付宝"}[data]}},
+     * {title:  '总金额', field: 'originalPrice'+'元', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '优惠金额', field: 'discountAmount'+'元', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '支付价格', field: 'cashPayment'+'元', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '支付状态', field: 'payStatus', visible: true, align: 'center', valign: 'middle'},
+     * {title:  '赠送课时', field: 'giftClassHours', visible: true, align: 'center', valign: 'middle'},
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
@@ -44,7 +45,7 @@
     private String payUser;
     private String phone;
     // 学员id
-    private Integer studentId;
+    private String studentId;
     private String payStudent;
     private Integer payType;
     private BigDecimal originalPrice;
@@ -69,4 +70,7 @@
     private Integer buyType;
     // 当状态为手动支付时使用 用于显示手动支付时显示操作人
     private String buyTypeName;
+    private Integer classHours;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date insertTime;
 }

--
Gitblit v1.7.1