Browse Source

refactor(national-motion-system):优化价格规则查询和订单相关功能

- 修改 AppSitePriceRulesMapper.xml 中的价格规则查询 SQL,增加价格字段并优化时间格式
- 在 OrderServiceImpl 中添加空操作以
SheepHy 1 week ago
parent
commit
d8a30d6ce9

+ 1 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -248,6 +248,7 @@ public class OrderServiceImpl implements IOrderService {
             case 1:
                 break;
             case 2:
+
                 break;
         }
         return appOrder;

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

@@ -176,8 +176,8 @@ public class OrderVO {
     @EqualsAndHashCode(callSuper = false)
     @Schema(description="学校包场-预览时间选择")
     public static class PreviewOrderPlaceSchoolTime{
-        @JsonFormat(timezone = "GMT+8", pattern = "MM-dd")
-        @DateTimeFormat(pattern = "MM-dd")
+        @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+        @DateTimeFormat(pattern = "yyyy-MM-dd")
         @Schema(description = "日期")
         private Date day;
         @Schema(description = "当前剩余库存")

+ 2 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSitePriceRulesMapper.xml

@@ -61,7 +61,8 @@
         SELECT
             id,
             inventory,
-            CONCAT(start_time, '-', end_time) AS NAME
+            selling_price AS price,
+            CONCAT( DATE_FORMAT( start_time, '%H:%i' ), '-', DATE_FORMAT( end_time, '%H:%i' ) ) AS NAME
         FROM
             `nm_site_price_rules`
         WHERE