From 817dc632a056e43d5a4639ef145ec6ddd2505240 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 26 May 2025 13:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/canteen/core/basic/domain/BasicCarouselImage.java | 4 ++--
 .../com/bonus/canteen/core/basic/domain/BasicSetting.java   | 5 ++++-
 .../core/basic/service/impl/BasicSettingServiceImpl.java    | 3 +++
 .../src/main/resources/mapper/basic/BasicSettingMapper.xml  | 6 +++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java
index 23c4d6c..169cf98 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java
@@ -42,9 +42,9 @@ public class BasicCarouselImage extends BaseEntity {
     @ApiModelProperty(value = "是否启用(1是;2否)")
     private String ifEnabled;
 
-    /** 用途类型(1-后台;2-APP) */
+    /** 用途类型(1-后台;2-APP;3-双屏消费机) */
     @Excel(name = "用途类型(1-后台;2-APP)")
-    @ApiModelProperty(value = "用途类型(1-后台;2-APP)")
+    @ApiModelProperty(value = "用途类型(1-后台;2-APP;3-双屏消费机)")
     private String usageType;
 
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java
index 442092a..2fe6023 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java
@@ -32,5 +32,8 @@ public class BasicSetting extends BaseEntity {
     @ApiModelProperty(value = "参数主键")
     private String itemValue;
 
-
+    /** 用途类型(1-后台;2-APP;3-双屏消费机) */
+    @Excel(name = "用途类型(1-后台;2-APP)")
+    @ApiModelProperty(value = "用途类型(1-后台;2-APP;3-双屏消费机)")
+    private String usageType;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java
index c67b3e7..6b81e96 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.canteen.core.basic.service.impl;
 import java.util.List;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.canteen.core.basic.mapper.BasicSettingMapper;
@@ -51,6 +52,7 @@ public class BasicSettingServiceImpl implements IBasicSettingService {
     @Override
     public int insertBasicSetting(BasicSetting basicSetting) {
         basicSetting.setCreateTime(DateUtils.getNowDate());
+        basicSetting.setCreateBy(SecurityUtils.getUsername());
         try {
             return basicSettingMapper.insertBasicSetting(basicSetting);
         } catch (Exception e) {
@@ -67,6 +69,7 @@ public class BasicSettingServiceImpl implements IBasicSettingService {
     @Override
     public int updateBasicSetting(BasicSetting basicSetting) {
         basicSetting.setUpdateTime(DateUtils.getNowDate());
+        basicSetting.setUpdateBy(SecurityUtils.getUsername());
         try {
             return basicSettingMapper.updateBasicSetting(basicSetting);
         } catch (Exception e) {
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml
index de2330a..bf5bd0d 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="itemName"    column="item_name"    />
         <result property="itemValue"    column="item_value"    />
+        <result property="usageType"    column="usage_type"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -14,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBasicSettingVo">
-        select id, item_name, item_value, create_by, create_time, update_by, update_time from basic_setting
+        select id, item_name, item_value, usage_type, create_by, create_time, update_by, update_time from basic_setting
     </sql>
 
     <select id="selectBasicSettingList" parameterType="com.bonus.canteen.core.basic.domain.BasicSetting" resultMap="BasicSettingResult">
@@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="itemName != null">item_name,</if>
             <if test="itemValue != null">item_value,</if>
+            <if test="usageType != null">usage_type,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="itemName != null">#{itemName},</if>
             <if test="itemValue != null">#{itemValue},</if>
+            <if test="usageType != null">#{usageType},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -55,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="itemValue != null">item_value = #{itemValue},</if>
+            <if test="usageType != null">usage_type = #{usageType},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>