diff --git a/deploy.sh b/deploy.sh index b9606a8..18e97ba 100644 --- a/deploy.sh +++ b/deploy.sh @@ -2,7 +2,7 @@ # 发包脚本 set -e echo "发布开始，当前时间是：$current_time" -mvn clean install +#mvn clean install scp ./play-admin/target/play-admin-1.0.jar root@122.51.20.105:/www/wwwroot/july.hucs.top ssh root@122.51.20.105 "source /etc/profile;cd /www/wwwroot/july.hucs.top;sh start.sh restart" # 获取当前时间并格式化为指定格式 diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java index b021695..1286d0d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkLevelInfoEntity.java @@ -67,6 +67,7 @@ public class PlayClerkLevelInfoEntity extends BaseEntity { + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java new file mode 100644 index 0000000..7b67627 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/entity/ShopUiSettingEntity.java @@ -0,0 +1,66 @@ +package com.starry.admin.modules.shop.module.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import cn.hutool.core.util.StrUtil; + +import java.util.Date; + +import com.starry.common.domain.BaseEntity; + +/** + * 店铺设置对象 shop_ui_setting + * + * @author admin + * @since 2025-06-11 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("shop_ui_setting") +public class ShopUiSettingEntity extends BaseEntity { + + + /** + * UUID + */ + private String id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 创建人的id + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 修改人的id + */ + private String updatedBy; + + /** + * 修改时间 + */ + private Date updatedTime; + + /** + * 数据版本 + */ + private Long version; + + /** + * 配置内容 + */ + private String settingConfig; + + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IShopUiSettingService.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IShopUiSettingService.java new file mode 100644 index 0000000..9c59df8 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IShopUiSettingService.java @@ -0,0 +1,29 @@ +package com.starry.admin.modules.shop.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.starry.admin.modules.shop.module.entity.ShopUiSettingEntity; + +/** + * 店铺设置Service接口 + * + * @author admin + * @since 2025-06-11 + */ +public interface IShopUiSettingService extends IService { + /** + * 查询店铺设置 + * + * @return 店铺设置 + */ + ShopUiSettingEntity selectShopUiSettingInfo(); + + /** + * 修改店铺设置 + * + * @param shopUiSetting 店铺设置 + * @return 结果 + */ + boolean update(ShopUiSettingEntity shopUiSetting); + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/ShopUiSettingServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/ShopUiSettingServiceImpl.java new file mode 100644 index 0000000..065014a --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/ShopUiSettingServiceImpl.java @@ -0,0 +1,62 @@ +package com.starry.admin.modules.shop.service.impl; + +import java.util.Arrays; +import java.util.Objects; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.starry.admin.modules.shop.mapper.ShopUiSettingMapper; +import com.starry.admin.modules.shop.module.entity.ShopUiSettingEntity; +import com.starry.admin.modules.shop.service.IShopUiSettingService; +import com.starry.common.utils.IdUtils; +import cn.hutool.core.util.StrUtil; + +import javax.annotation.Resource; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.stereotype.Service; + +/** + * 店铺设置Service业务层处理 + * + * @author admin + * @since 2025-06-11 + */ +@Service +public class ShopUiSettingServiceImpl extends ServiceImpl implements IShopUiSettingService { + @Resource + private ShopUiSettingMapper shopUiSettingMapper; + + /** + * 查询店铺设置 + * @return 店铺设置 + */ + @Override + public ShopUiSettingEntity selectShopUiSettingInfo() { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(ShopUiSettingEntity.class); + ShopUiSettingEntity setting = this.baseMapper.selectOne(wrapper, false); + if (Objects.nonNull(setting)) { + return setting; + } else { + setting = new ShopUiSettingEntity(); + setting.setSettingConfig(null); + this.baseMapper.insert(setting); + } + return setting; + } + + + /** + * 修改店铺设置 + * + * @param shopUiSetting 店铺设置 + * @return 结果 + */ + @Override + public boolean update(ShopUiSettingEntity shopUiSetting) { + return updateById(shopUiSetting); + } +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java index c8051d9..0e0f963 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCommonController.java @@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.starry.admin.common.exception.CustomException; import com.starry.admin.common.oss.service.IOssFileService; +import com.starry.admin.modules.shop.service.IShopUiSettingService; import com.starry.admin.modules.system.service.ISysAdministrativeAreaDictInfoService; import com.starry.admin.modules.weichat.service.WxAccessTokenService; import com.starry.admin.modules.weichat.utils.WxFileUtils; @@ -40,6 +41,8 @@ public class WxCommonController { @Resource WxAccessTokenService wxAccessTokenService; + @Resource + private IShopUiSettingService shopUiSettingService; @GetMapping("area/tree") @@ -47,6 +50,11 @@ public class WxCommonController { return R.ok(areaDictInfoService.selectTree("2")); } + @GetMapping("setting/info") + public R selectShopUiSettingInfo() { + return R.ok(shopUiSettingService.selectShopUiSettingInfo()); + } + @PostMapping("file/upload") public R fileUpload(@RequestParam("file") MultipartFile file) throws IOException { String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename()); diff --git a/play-admin/src/main/resources/db/migration/V1.2025.0609.10.11__change_tables.sql b/play-admin/src/main/resources/db/migration/V1.2025.0609.10.11__change_tables.sql new file mode 100644 index 0000000..c8b0aa2 --- /dev/null +++ b/play-admin/src/main/resources/db/migration/V1.2025.0609.10.11__change_tables.sql @@ -0,0 +1,19 @@ +ALTER TABLE `play_clerk_level_info` + ADD COLUMN `style_type` int(10) NULL COMMENT '等级样式' AFTER `version`, +ADD COLUMN `style_image_url` varchar(255) NULL COMMENT '等级图片' AFTER `style_type`; + + +update `play_clerk_level_info` set `style_type` = `level`; +CREATE TABLE `shop_ui_setting` ( + `id` varchar(32) NOT NULL COMMENT 'UUID', + `tenant_id` varchar(32) NOT NULL COMMENT '租户ID', + `created_by` varchar(32) DEFAULT NULL COMMENT '创建人的id', + `created_time` datetime DEFAULT NULL COMMENT '创建时间', + `updated_by` varchar(32) DEFAULT NULL COMMENT '修改人的id', + `updated_time` datetime DEFAULT NULL COMMENT '修改时间', + `deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '逻辑删除 1已删除 0未删除', + `version` int(11) NOT NULL DEFAULT '1' COMMENT '数据版本', + `setting_config` text COMMENT '配置内容', + PRIMARY KEY (`id`) USING BTREE, + KEY `key_tenant_id` (`tenant_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='店员等级'; \ No newline at end of file