fix(app):

1.bug修复
2.订单回显增加字段

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/OrderController.java

@@ -129,7 +129,7 @@ public class OrderController {
 
     /**
      * 支付回调
-     * @param notifyRequestForm
+     * @param request
      * @return
      */
     @Operation(summary = "支付回调")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/PageOrdersVO.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.app.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -44,7 +46,13 @@ public class PageOrdersVO implements Serializable {
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Data createTime;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Schema(description = "过期时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date epxTime;
 
     @Schema(description = "子订单")
     private List<AppOrderProInfo>  orderProInfoList;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/job/OrTeachingJobService.java

@@ -116,6 +116,7 @@ public class OrTeachingJobService {
                                     .setStartTime(DateUtils.str2Date(startTime, new SimpleDateFormat("HH:mm")))
                                     .setEndTime(DateUtils.str2Date(endTime, new SimpleDateFormat("HH:mm")))
                                     .setDayOfWeek(HolidayUtil.getWeekOfDate(localDate))
+                                    .setTicketNum(Integer.valueOf(item.getTicketNum()))
                                     .setIsTeaching(appTeachingTime.getIsTeaching())
                                     .setCategoryId(site.getCategoryId())
                                     .setCreateBy("admin")
@@ -140,6 +141,7 @@ public class OrTeachingJobService {
                                     .setStartTime(DateUtils.str2Date(startTime, new SimpleDateFormat("HH:mm")))
                                     .setEndTime(DateUtils.str2Date(endTime, new SimpleDateFormat("HH:mm")))
                                     .setDayOfWeek(HolidayUtil.getWeekOfDate(localDate))
+                                    .setTicketNum(Integer.valueOf(item.getTicketNum()))
                                     .setIsTeaching(appTeachingTime.getIsTeaching())
                                     .setCategoryId(site.getCategoryId())
                                     .setCreateBy("admin")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSitePriceRules.java

@@ -70,6 +70,12 @@ public class AppSitePriceRules implements Serializable {
     @Excel(name = "星期几", width = 15)
     @Schema(description = "星期几")
     private String dayOfWeek;
+    /**
+     * 票数
+     */
+    @Excel(name = "票数", width = 15)
+    @Schema(description = "票数")
+    private Integer ticketNum;
     /**原价*/
     @Excel(name = "原价", width = 15)
     @Schema(description = "原价")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppOrderMapper.xml

@@ -90,6 +90,7 @@
             o.original_price,
             o.price,
             o.amount,
+            o.create_time,
             o.address_site_id
         FROM
             nm_order o

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -326,6 +326,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
                                         .setStartTime(DateUtils.str2Date(startTime, new SimpleDateFormat("HH:mm")))
                                         .setEndTime(DateUtils.str2Date(endTime, new SimpleDateFormat("HH:mm")))
                                         .setDayOfWeek(HolidayUtil.getWeekOfDate(localDate))
+                                        .setTicketNum(Integer.valueOf(item.getTicketNum()))
                                         .setIsTeaching(appTeachingTime.getIsTeaching())
                                         .setCategoryId(site.getCategoryId())
                                         .setCreateBy("admin")
@@ -353,6 +354,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
                                         .setStartTime(DateUtils.str2Date(startTime, new SimpleDateFormat("HH:mm")))
                                         .setEndTime(DateUtils.str2Date(endTime, new SimpleDateFormat("HH:mm")))
                                         .setDayOfWeek(HolidayUtil.getWeekOfDate(localDate))
+                                        .setTicketNum(Integer.valueOf(item.getTicketNum()))
                                         .setIsTeaching(appTeachingTime.getIsTeaching())
                                         .setCategoryId(site.getCategoryId())
                                         .setCreateBy("admin")