ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfDiscount.java

@@ -35,7 +35,7 @@ public class XfDiscount extends TenantEntity {
     /**
      * 餐类Id
      */
-    private Long mealType;
+    private String mealType;
 
     /**
      * 折扣类型，默认为0

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfDiscountBo.java

@@ -35,8 +35,8 @@ public class XfDiscountBo extends BaseEntity {
     /**
      * 餐类Id
      */
-    @NotNull(message = "餐类Id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long mealType;
+    @NotBlank(message = "餐类Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mealType;
 
     /**
      * 折扣类型，默认为0

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfDiscountVo.java

@@ -40,7 +40,7 @@ public class XfDiscountVo implements Serializable {
      * 卡类Id
      */
 //    @ExcelProperty(value = "卡类Id")
-    private Long cardType;
+    private String cardType;
 
     @Translation(type = TransConstant.CARD_TYPE_ID_TO_NAME, mapper = "cardType")
     @ExcelProperty(value = "卡类")
@@ -52,9 +52,9 @@ public class XfDiscountVo implements Serializable {
 //    @ExcelProperty(value = "餐类Id")
     private Long mealType;
 
-    @ExcelProperty(value = "餐类")
+    /*@ExcelProperty(value = "餐类")
     @Translation(type = TransConstant.MEAL_TYPE_TO_NAME, mapper = "mealType")
-    private String mealTypeName;
+    private String mealTypeName;*/
 
     /**
      * 折扣类型，默认为0

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -94,6 +94,7 @@ public class XfTermServiceImpl implements IXfTermService {
         }
         lqw.in(CollectionUtil.isNotEmpty(roomIds),"t.room_id", roomIds);
         lqw.eq("t.del_flag", 0);
+        lqw.orderByDesc("t.create_time");
         Page<XfTermVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }