Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/RemoteMealTypeService.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.api;
+
+import org.dromara.backstage.api.domain.bo.RemotePtAreaBo;
+
+/**
+ * 餐类服务
+ *
+ * @author bing
+ */
+public interface RemoteMealTypeService {
+
+    String selectMealTypeNameByIds(String ids);
+
+
+}

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -47,4 +47,12 @@ public interface TransConstant {
      * 账户发卡情况
      */
     String USER_ID_TO_CARD_INFO = "user_id_to_card_info";
+
+    /**
+     * 餐类
+     */
+    String MEAL_TYPE_TO_NAME =  "meal_type_to_name";
+
+
+
 }

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/MealTypeNameTranslationImpl.java

@@ -0,0 +1,26 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.backstage.api.RemoteCardTypeService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * 餐类翻译实现
+ *
+ * @author Lion Li
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.MEAL_TYPE_TO_NAME)
+public class MealTypeNameTranslationImpl implements TranslationInterface<String> {
+
+    @DubboReference
+    private RemoteCardTypeService remoteCardTypeService;
+
+    @Override
+    public String translation(Object key, String other) {
+        return remoteCardTypeService.selectCardTypeNameByIds(key.toString());
+    }
+}

ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -7,3 +7,4 @@ org.dromara.common.translation.core.impl.NicknameTranslationImpl
 org.dromara.common.translation.core.impl.CardTypeNameTranslationImpl
 org.dromara.common.translation.core.impl.BagBalanceTranslationImpl
 org.dromara.common.translation.core.impl.CardInfoTranslationImpl
+org.dromara.common.translation.core.impl.MealTypeNameTranslationImpl

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtMealtypeController.java

@@ -46,6 +46,12 @@ public class PtMealtypeController extends BaseController {
         return ptMealtypeService.queryPageList(bo, pageQuery);
     }
 
+    @SaCheckPermission("basicParameter:ptMealtype:list")
+    @GetMapping("/getAll")
+    public R<List<PtMealtypeVo>> getAll(PtMealtypeBo bo) {
+        return R.ok(ptMealtypeService.queryList(bo));
+    }
+
     /**
      * 导出营业时段列表
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/dubbo/RemotePtAreaServiceImpl.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/dubbo/RemotePtAreaServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.backstage.dubbo;
+package org.dromara.backstage.basics.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/dubbo/RemotePtSchoolServiceImpl.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/dubbo/RemotePtSchoolServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.backstage.dubbo;
+package org.dromara.backstage.basics.dubbo;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/dubbo/RemoteCardServiceImpl.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/dubbo/RemoteCardServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.backstage.dubbo;
+package org.dromara.backstage.cardCenter.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscountController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfDiscountVo;
+import org.dromara.backstage.consumption.domain.bo.XfDiscountBo;
+import org.dromara.backstage.consumption.service.IXfDiscountService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 折扣管理
+ * 前端访问路由地址为:/consumption/xfDiscount
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfDiscount")
+public class XfDiscountController extends BaseController {
+
+    private final IXfDiscountService xfDiscountService;
+
+    /**
+     * 查询折扣管理列表
+     */
+    @SaCheckPermission("consumption:xfDiscount:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfDiscountVo> list(XfDiscountBo bo, PageQuery pageQuery) {
+        return xfDiscountService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出折扣管理列表
+     */
+    @SaCheckPermission("consumption:xfDiscount:export")
+    @Log(title = "折扣管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfDiscountBo bo, HttpServletResponse response) {
+        List<XfDiscountVo> list = xfDiscountService.queryList(bo);
+        ExcelUtil.exportExcel(list, "折扣管理", XfDiscountVo.class, response);
+    }
+
+    /**
+     * 获取折扣管理详细信息
+     *
+     * @param discountId 主键
+     */
+    @SaCheckPermission("consumption:xfDiscount:query")
+    @GetMapping("/{discountId}")
+    public R<XfDiscountVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long discountId) {
+        return R.ok(xfDiscountService.queryById(discountId));
+    }
+
+    /**
+     * 新增折扣管理
+     */
+    @SaCheckPermission("consumption:xfDiscount:add")
+    @Log(title = "折扣管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfDiscountBo bo) {
+        return toAjax(xfDiscountService.insertByBo(bo));
+    }
+
+    /**
+     * 修改折扣管理
+     */
+    @SaCheckPermission("consumption:xfDiscount:edit")
+    @Log(title = "折扣管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfDiscountBo bo) {
+        return toAjax(xfDiscountService.updateByBo(bo));
+    }
+
+    /**
+     * 删除折扣管理
+     *
+     * @param discountIds 主键串
+     */
+    @SaCheckPermission("consumption:xfDiscount:remove")
+    @Log(title = "折扣管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{discountIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] discountIds) {
+        return toAjax(xfDiscountService.deleteWithValidByIds(List.of(discountIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscounttermController.java

@@ -0,0 +1,117 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfDiscounttermVo;
+import org.dromara.backstage.consumption.domain.bo.XfDiscounttermBo;
+import org.dromara.backstage.consumption.service.IXfDiscounttermService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 折扣设备
+ * 前端访问路由地址为:/consumption/xfDiscountterm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfDiscountterm")
+public class XfDiscounttermController extends BaseController {
+
+    private final IXfDiscounttermService xfDiscounttermService;
+
+    /**
+     * 查询折扣设备列表
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfDiscounttermVo> list(XfDiscounttermBo bo, PageQuery pageQuery) {
+        return xfDiscounttermService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出折扣设备列表
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:export")
+    @Log(title = "折扣设备", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfDiscounttermBo bo, HttpServletResponse response) {
+        List<XfDiscounttermVo> list = xfDiscounttermService.queryList(bo);
+        ExcelUtil.exportExcel(list, "折扣设备", XfDiscounttermVo.class, response);
+    }
+
+    /**
+     * 获取折扣设备详细信息
+     *
+     * @param discountTermId 主键
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:query")
+    @GetMapping("/{discountTermId}")
+    public R<XfDiscounttermVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long discountTermId) {
+        return R.ok(xfDiscounttermService.queryById(discountTermId));
+    }
+
+    /**
+     * 新增折扣设备
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:add")
+    @Log(title = "折扣设备", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfDiscounttermBo bo) {
+        return toAjax(xfDiscounttermService.insertByBo(bo));
+    }
+
+    /**
+     * 新增折扣设备
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:add")
+    @Log(title = "批量添加折扣设备", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/batchAdd")
+    public R<Void> batchAdd(@RequestBody List<Long> ids) {
+        return toAjax(xfDiscounttermService.insertByTermIds(ids));
+    }
+
+    /**
+     * 修改折扣设备
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:edit")
+    @Log(title = "折扣设备", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfDiscounttermBo bo) {
+        return toAjax(xfDiscounttermService.updateByBo(bo));
+    }
+
+    /**
+     * 删除折扣设备
+     *
+     * @param discountTermIds 主键串
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:remove")
+    @Log(title = "折扣设备", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{discountTermIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] discountTermIds) {
+        return toAjax(xfDiscounttermService.deleteWithValidByIds(List.of(discountTermIds), true));
+    }
+}

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

@@ -0,0 +1,82 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 折扣管理对象 t_xf_discount
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_discount")
+public class XfDiscount extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 折扣Id,主键
+     */
+    @TableId(value = "discount_id")
+    private Long discountId;
+
+    /**
+     * 卡类Id
+     */
+    private Long cardType;
+
+    /**
+     * 餐类Id
+     */
+    private Long mealType;
+
+    /**
+     * 折扣类型，默认为0
+     */
+    private String rateType;
+
+    /**
+     * 折扣率1
+     */
+    private Long oneRate;
+
+    /**
+     * 折扣率2
+     */
+    private Long twoRate;
+
+    /**
+     * 折扣率3
+     */
+    private Long threeRate;
+
+    /**
+     * 折扣率4
+     */
+    private Long fourRate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    private String status;
+
+
+}

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

@@ -0,0 +1,42 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 折扣设备对象 t_xf_discountTerm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_discountTerm")
+public class XfDiscountterm extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 折扣Id,主键
+     */
+    @TableId(value = "discount_term_id")
+    private Long discountTermId;
+
+    /**
+     * 设备Id
+     */
+    private Long termId;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -0,0 +1,78 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import org.dromara.backstage.consumption.domain.XfDiscount;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 折扣管理业务对象 t_xf_discount
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfDiscount.class, reverseConvertGenerate = false)
+public class XfDiscountBo extends BaseEntity {
+
+    /**
+     * 折扣Id,主键
+     */
+    @NotNull(message = "折扣Id,主键不能为空", groups = { EditGroup.class })
+    private Long discountId;
+
+    /**
+     * 卡类Id
+     */
+    @NotNull(message = "卡类Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long cardType;
+
+    /**
+     * 餐类Id
+     */
+    @NotNull(message = "餐类Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long mealType;
+
+    /**
+     * 折扣类型，默认为0
+     */
+    private String rateType;
+
+    /**
+     * 折扣率1
+     */
+    private Long oneRate;
+
+    /**
+     * 折扣率2
+     */
+    private Long twoRate;
+
+    /**
+     * 折扣率3
+     */
+    private Long threeRate;
+
+    /**
+     * 折扣率4
+     */
+    private Long fourRate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    @NotBlank(message = "启用状态，0-未启用 1-启用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+
+}

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

@@ -0,0 +1,36 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 折扣设备业务对象 t_xf_discountTerm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfDiscountterm.class, reverseConvertGenerate = false)
+public class XfDiscounttermBo extends BaseEntity {
+
+    /**
+     * 折扣Id,主键
+     */
+    @NotNull(message = "折扣Id,主键不能为空", groups = { EditGroup.class })
+    private Long discountTermId;
+
+    /**
+     * 设备Id
+     */
+    @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long termId;
+
+
+}

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

@@ -0,0 +1,104 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import org.dromara.backstage.consumption.domain.XfDiscount;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 折扣管理视图对象 t_xf_discount
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfDiscount.class)
+public class XfDiscountVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 折扣Id,主键
+     */
+    @ExcelProperty(value = "折扣Id,主键")
+    private Long discountId;
+
+    /**
+     * 卡类Id
+     */
+//    @ExcelProperty(value = "卡类Id")
+    private Long cardType;
+
+    @Translation(type = TransConstant.CARD_TYPE_ID_TO_NAME, mapper = "cardType")
+    @ExcelProperty(value = "卡类")
+    private String cardTypeName;
+
+    /**
+     * 餐类Id
+     */
+//    @ExcelProperty(value = "餐类Id")
+    private Long mealType;
+
+    @ExcelProperty(value = "餐类")
+    @Translation(type = TransConstant.MEAL_TYPE_TO_NAME, mapper = "mealType")
+    private String mealTypeName;
+
+    /**
+     * 折扣类型，默认为0
+     */
+    @ExcelProperty(value = "折扣类型，默认为0")
+    private String rateType;
+
+    /**
+     * 折扣率1
+     */
+    @ExcelProperty(value = "折扣率1")
+    private Long oneRate;
+
+    /**
+     * 折扣率2
+     */
+    @ExcelProperty(value = "折扣率2")
+    private Long twoRate;
+
+    /**
+     * 折扣率3
+     */
+    @ExcelProperty(value = "折扣率3")
+    private Long threeRate;
+
+    /**
+     * 折扣率4
+     */
+    @ExcelProperty(value = "折扣率4")
+    private Long fourRate;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    @ExcelProperty(value = "启用状态，0-未启用 1-启用")
+    private String status;
+
+
+
+
+}

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

@@ -0,0 +1,60 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 折扣设备视图对象 t_xf_discountTerm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfDiscountterm.class)
+public class XfDiscounttermVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 折扣Id,主键
+     */
+    @ExcelProperty(value = "折扣Id,主键")
+    private Long discountTermId;
+
+    /**
+     * 设备Id
+     */
+//    @ExcelProperty(value = "设备Id")
+    private Long termId;
+
+    /**
+     * 设备名称
+     */
+    private String termName;
+
+    /**
+     * 设备机号
+     */
+    private Long termNo;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfDiscountMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfDiscount;
+import org.dromara.backstage.consumption.domain.vo.XfDiscountVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 折扣管理Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+public interface XfDiscountMapper extends BaseMapperPlus<XfDiscount, XfDiscountVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfDiscounttermMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import org.dromara.backstage.consumption.domain.vo.XfDiscounttermVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 折扣设备Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+public interface XfDiscounttermMapper extends BaseMapperPlus<XfDiscountterm, XfDiscounttermVo> {
+
+}

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

@@ -0,0 +1,69 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.XfDiscount;
+import org.dromara.backstage.consumption.domain.vo.XfDiscountVo;
+import org.dromara.backstage.consumption.domain.bo.XfDiscountBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 折扣管理Service接口
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+public interface IXfDiscountService {
+
+    /**
+     * 查询折扣管理
+     *
+     * @param discountId 主键
+     * @return 折扣管理
+     */
+    XfDiscountVo queryById(Long discountId);
+
+    /**
+     * 分页查询折扣管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 折扣管理分页列表
+     */
+    TableDataInfo<XfDiscountVo> queryPageList(XfDiscountBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的折扣管理列表
+     *
+     * @param bo 查询条件
+     * @return 折扣管理列表
+     */
+    List<XfDiscountVo> queryList(XfDiscountBo bo);
+
+    /**
+     * 新增折扣管理
+     *
+     * @param bo 折扣管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfDiscountBo bo);
+
+    /**
+     * 修改折扣管理
+     *
+     * @param bo 折扣管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfDiscountBo bo);
+
+    /**
+     * 校验并批量删除折扣管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,76 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import org.dromara.backstage.consumption.domain.vo.XfDiscounttermVo;
+import org.dromara.backstage.consumption.domain.bo.XfDiscounttermBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 折扣设备Service接口
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+public interface IXfDiscounttermService {
+
+    /**
+     * 查询折扣设备
+     *
+     * @param discountTermId 主键
+     * @return 折扣设备
+     */
+    XfDiscounttermVo queryById(Long discountTermId);
+
+    /**
+     * 分页查询折扣设备列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 折扣设备分页列表
+     */
+    TableDataInfo<XfDiscounttermVo> queryPageList(XfDiscounttermBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的折扣设备列表
+     *
+     * @param bo 查询条件
+     * @return 折扣设备列表
+     */
+    List<XfDiscounttermVo> queryList(XfDiscounttermBo bo);
+
+    /**
+     * 新增折扣设备
+     *
+     * @param bo 折扣设备
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfDiscounttermBo bo);
+
+    /**
+     * 根据设备id批量新增折扣设备
+     * @param ids
+     * @return
+     */
+    Boolean insertByTermIds(List<Long> ids);
+
+    /**
+     * 修改折扣设备
+     *
+     * @param bo 折扣设备
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfDiscounttermBo bo);
+
+    /**
+     * 校验并批量删除折扣设备信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,138 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfDiscountBo;
+import org.dromara.backstage.consumption.domain.vo.XfDiscountVo;
+import org.dromara.backstage.consumption.domain.XfDiscount;
+import org.dromara.backstage.consumption.mapper.XfDiscountMapper;
+import org.dromara.backstage.consumption.service.IXfDiscountService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 折扣管理Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-13
+ */
+@RequiredArgsConstructor
+@Service
+public class XfDiscountServiceImpl implements IXfDiscountService {
+
+    private final XfDiscountMapper baseMapper;
+
+    /**
+     * 查询折扣管理
+     *
+     * @param discountId 主键
+     * @return 折扣管理
+     */
+    @Override
+    public XfDiscountVo queryById(Long discountId){
+        return baseMapper.selectVoById(discountId);
+    }
+
+    /**
+     * 分页查询折扣管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 折扣管理分页列表
+     */
+    @Override
+    public TableDataInfo<XfDiscountVo> queryPageList(XfDiscountBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfDiscount> lqw = buildQueryWrapper(bo);
+        Page<XfDiscountVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的折扣管理列表
+     *
+     * @param bo 查询条件
+     * @return 折扣管理列表
+     */
+    @Override
+    public List<XfDiscountVo> queryList(XfDiscountBo bo) {
+        LambdaQueryWrapper<XfDiscount> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfDiscount> buildQueryWrapper(XfDiscountBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfDiscount> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCardType() != null, XfDiscount::getCardType, bo.getCardType());
+        lqw.eq(bo.getMealType() != null, XfDiscount::getMealType, bo.getMealType());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XfDiscount::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增折扣管理
+     *
+     * @param bo 折扣管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfDiscountBo bo) {
+        XfDiscount add = MapstructUtils.convert(bo, XfDiscount.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setDiscountId(add.getDiscountId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改折扣管理
+     *
+     * @param bo 折扣管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfDiscountBo bo) {
+        XfDiscount update = MapstructUtils.convert(bo, XfDiscount.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfDiscount entity){
+        LambdaQueryWrapper<XfDiscount> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(XfDiscount::getCardType, entity.getCardType())
+            .eq(XfDiscount::getMealType, entity.getMealType())
+            .ne(entity.getDiscountId() != null,XfDiscount::getDiscountId, entity.getDiscountId());
+        if (baseMapper.selectCount(lambdaQueryWrapper) > 0) {
+            throw new ServiceException("数据已经存在");
+        }
+    }
+
+    /**
+     * 校验并批量删除折扣管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //可以删除
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,160 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfDiscounttermBo;
+import org.dromara.backstage.consumption.domain.vo.XfDiscounttermVo;
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import org.dromara.backstage.consumption.mapper.XfDiscounttermMapper;
+import org.dromara.backstage.consumption.service.IXfDiscounttermService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 折扣设备Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@RequiredArgsConstructor
+@Service
+public class XfDiscounttermServiceImpl implements IXfDiscounttermService {
+
+    private final XfDiscounttermMapper baseMapper;
+
+    /**
+     * 查询折扣设备
+     *
+     * @param discountTermId 主键
+     * @return 折扣设备
+     */
+    @Override
+    public XfDiscounttermVo queryById(Long discountTermId){
+        return baseMapper.selectVoById(discountTermId);
+    }
+
+    /**
+     * 分页查询折扣设备列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 折扣设备分页列表
+     */
+    @Override
+    public TableDataInfo<XfDiscounttermVo> queryPageList(XfDiscounttermBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfDiscountterm> lqw = buildQueryWrapper(bo);
+        Page<XfDiscounttermVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的折扣设备列表
+     *
+     * @param bo 查询条件
+     * @return 折扣设备列表
+     */
+    @Override
+    public List<XfDiscounttermVo> queryList(XfDiscounttermBo bo) {
+        LambdaQueryWrapper<XfDiscountterm> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfDiscountterm> buildQueryWrapper(XfDiscounttermBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfDiscountterm> lqw = Wrappers.lambdaQuery();
+        return lqw;
+    }
+
+    /**
+     * 新增折扣设备
+     *
+     * @param bo 折扣设备
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfDiscounttermBo bo) {
+        XfDiscountterm add = MapstructUtils.convert(bo, XfDiscountterm.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setDiscountTermId(add.getDiscountTermId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean insertByTermIds(List<Long> ids) {
+        LambdaQueryWrapper<XfDiscountterm> w = Wrappers.lambdaQuery();
+        w.in(XfDiscountterm::getTermId, ids);
+        List<XfDiscountterm> exists = baseMapper.selectList(w);
+        List<Long> existIds = exists.stream().map(XfDiscountterm::getTermId).toList();
+        if(CollectionUtil.isNotEmpty(existIds)){
+            List<Long> adds = ids.stream().filter(id -> !existIds.contains(id)).toList();
+            if(CollectionUtil.isNotEmpty(adds)){
+                return baseMapper.insertBatch(adds.stream().map(id -> {
+                    XfDiscountterm discountterm = new XfDiscountterm();
+                    discountterm.setTermId(id);
+                    return discountterm;
+                }).collect(Collectors.toList()));
+            }
+            return true;
+        }
+        return baseMapper.insertBatch(ids.stream().map(id -> {
+            XfDiscountterm discountterm = new XfDiscountterm();
+            discountterm.setTermId(id);
+            return discountterm;
+        }).collect(Collectors.toList()));
+    }
+
+    /**
+     * 修改折扣设备
+     *
+     * @param bo 折扣设备
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfDiscounttermBo bo) {
+        XfDiscountterm update = MapstructUtils.convert(bo, XfDiscountterm.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfDiscountterm entity){
+        LambdaQueryWrapper<XfDiscountterm> wrapper = Wrappers.<XfDiscountterm>lambdaQuery();
+        wrapper.eq(XfDiscountterm::getDiscountTermId, entity.getDiscountTermId())
+            .ne(entity.getDiscountTermId()!=null,XfDiscountterm::getDiscountTermId, entity.getDiscountTermId());
+        if (baseMapper.selectCount(wrapper) > 0) {
+            throw new ServiceException("设备已经存在");
+        }
+    }
+
+    /**
+     * 校验并批量删除折扣设备信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //可以删除
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/dubbo/RemoteBagServiceImpl.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/dubbo/RemoteBagServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dromara.backstage.dubbo;
+package org.dromara.backstage.payment.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfDiscountMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfDiscountMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfDiscount" id="XfDiscountResult">
+            <result property="discountId"    column="discount_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="cardType"    column="card_type"    />
+            <result property="mealType"    column="meal_type"    />
+            <result property="rateType"    column="rate_type"    />
+            <result property="oneRate"    column="one_rate"    />
+            <result property="twoRate"    column="two_rate"    />
+            <result property="threeRate"    column="three_rate"    />
+            <result property="fourRate"    column="four_rate"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+            <result property="status"    column="status"    />
+    </resultMap>
+</mapper>

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfDiscounttermMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfDiscounttermMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfDiscountterm" id="XfDiscounttermResult">
+            <result property="discountTermId"    column="discount_term_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="termId"    column="term_id"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>