后端代码提交

2026-04-25 20:28:34 +08:00 · 2025-06-24 16:23:52 +08:00
parent 7352086bc9
commit 5c28965604
1281 changed files with 8023 additions and 17640 deletions
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/annotation/StringContains.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/annotation/StringContains.java
@@ -11,7 +11,7 @@ import java.lang.annotation.*;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/config/CrmebConfig.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/config/CrmebConfig.java
@@ -4,12 +4,14 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

+import java.util.List;
+
 /**
 * Crmeb 基础配置
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -35,6 +37,15 @@ public class CrmebConfig {
    private boolean asyncWeChatProgramTempList;
    // 本地图片路径配置
    private String imagePath;
+    // 是否演示站点 所有手机号码都会掩码
+    private Boolean demoSite;
+    // 活动边框缓存周期
+    private Integer activityStyleCachedTime;
+    // 活动边框参加 指定商品参加上限
+    private Integer selectProductLimit;
+
+    // 不过滤任何数据的url配置
+    private List<String> ignored;

    public String getVersion() {
        return version;
@@ -99,4 +110,51 @@ public class CrmebConfig {
    public void setImagePath(String imagePath) {
        this.imagePath = imagePath;
    }
+
+
+    public Boolean getDemoSite() {
+        return demoSite;
+    }
+
+    public void setDemoSite(Boolean demoSite) {
+        this.demoSite = demoSite;
+    }
+
+    public List<String> getIgnored() {
+        return ignored;
+    }
+
+    public void setIgnored(List<String> ignored) {
+        this.ignored = ignored;
+    }
+
+    public Integer getActivityStyleCachedTime() {
+        return activityStyleCachedTime;
+    }
+
+    public void setActivityStyleCachedTime(Integer activityStyleCachedTime) {
+        this.activityStyleCachedTime = activityStyleCachedTime;
+    }
+
+    public Integer getSelectProductLimit() {
+        return selectProductLimit;
+    }
+
+    public void setSelectProductLimit(Integer selectProductLimit) {
+        this.selectProductLimit = selectProductLimit;
+    }
+
+    @Override
+    public String toString() {
+        return "CrmebConfig{" +
+                "version='" + version + '\'' +
+                ", domain='" + domain + '\'' +
+                ", wechatApiUrl='" + wechatApiUrl + '\'' +
+                ", asyncConfig=" + asyncConfig +
+                ", imagePath='" + imagePath + '\'' +
+                ", activityStyleCachedTime=" + activityStyleCachedTime +
+                ", selectProductLimit=" + selectProductLimit +
+                ", ignored=" + ignored +
+                '}';
+    }
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/config/RedisConfig.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/config/RedisConfig.java
@@ -1,21 +1,14 @@
 package com.zbkj.common.config;

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 import redis.clients.jedis.JedisPoolConfig;

 import java.time.Duration;
@@ -25,7 +18,7 @@ import java.time.Duration;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -33,7 +26,6 @@ import java.time.Duration;
 * +----------------------------------------------------------------------
 */
@Configuration
-@EnableCaching
 public class RedisConfig {

    @Value("${spring.redis.host}")
@@ -66,24 +58,18 @@ public class RedisConfig {
    @Value("${spring.redis.jedis.pool.time-between-eviction-runs}")
    private String timeBetweenEvictionRunsMillis;

-    @Bean
-    public JedisPoolConfig jedisPoolConfig() {
-        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-        jedisPoolConfig.setMaxIdle(maxIdle);
-        jedisPoolConfig.setMaxTotal(maxTotal);
-        jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);
-        jedisPoolConfig.setMinIdle(minIdle);
-        jedisPoolConfig.setTimeBetweenEvictionRunsMillis(Integer.parseInt(timeBetweenEvictionRunsMillis));
-        return jedisPoolConfig;
-    }
+    @Value("${spring.redis.second.database}")
+    private int redisSecondDatabase;

-    @Bean
-    public RedisConnectionFactory taskConnectionFactory() {
-        RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration();
-        redisStandaloneConfiguration.setPort(redisPort);
-        redisStandaloneConfiguration.setHostName(redisHost);
-        redisStandaloneConfiguration.setDatabase(redisDb);
-        redisStandaloneConfiguration.setPassword(redisPass);
+    @Bean(name = "redisConnectionFactory")
+    @Primary  //默认选择这个数据源进行执行
+    @Qualifier("redisConnectionFactory")
+    public RedisConnectionFactory redisConnectionFactory() {
+        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
+        config.setPort(redisPort);
+        config.setHostName(redisHost);
+        config.setDatabase(redisDb);
+        config.setPassword(redisPass);
        //获得默认的连接池构造
        //这里需要注意的是，RedisConnectionFactoryJ对于Standalone模式的没有（RedisStandaloneConfiguration，jedisPoolConfig）的构造函数，对此
        //我们用JedisClientConfiguration接口的builder方法实例化一个构造器，还得类型转换
@@ -96,48 +82,41 @@ public class RedisConfig {
        //通过构造器来构造jedis客户端配置
        JedisClientConfiguration jedisClientConfiguration = jpConfigBuilder.build();
        //配置连接池属性
-//        jedisConnectionFactory.setTimeout(Integer.parseInt(timeout));
-        return new JedisConnectionFactory(redisStandaloneConfiguration, jedisClientConfiguration);
+        return new JedisConnectionFactory(config, jedisClientConfiguration);
+    }
+
+    @Bean(name = "secondRedisConnectionFactory")
+    @Qualifier("secondRedisConnectionFactory")
+    public RedisConnectionFactory secondRedisConnectionFactory() {
+        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
+        config.setPort(redisPort);
+        config.setHostName(redisHost);
+        config.setDatabase(redisSecondDatabase);
+        config.setPassword(redisPass);
+        //获得默认的连接池构造
+        //这里需要注意的是，RedisConnectionFactoryJ对于Standalone模式的没有（RedisStandaloneConfiguration，jedisPoolConfig）的构造函数，对此
+        //我们用JedisClientConfiguration接口的builder方法实例化一个构造器，还得类型转换
+        JedisClientConfiguration.DefaultJedisClientConfigurationBuilder jpConfigBuilder = (JedisClientConfiguration.DefaultJedisClientConfigurationBuilder) JedisClientConfiguration.builder();
+        //修改我们的连接池配置
+        jpConfigBuilder.usePooling();
+        jpConfigBuilder.poolConfig(jedisPoolConfig());
+        jpConfigBuilder.readTimeout(Duration.ofMillis(Integer.parseInt(timeout)));
+        jpConfigBuilder.connectTimeout(Duration.ofMillis(Integer.parseInt(timeout)));
+        //通过构造器来构造jedis客户端配置
+        JedisClientConfiguration jedisClientConfiguration = jpConfigBuilder.build();
+        //配置连接池属性
+        return new JedisConnectionFactory(config, jedisClientConfiguration);
    }

-    /**
-     * redisTemplate相关配置
-     * @param redisConnectionFactory redis链接工厂
-     *
-     */
    @Bean
-    public RedisTemplate<String,Object> redisTemplate(RedisConnectionFactory redisConnectionFactory){
-        //配置redisTemplate
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(redisConnectionFactory);
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
-        StringRedisSerializer stringSerializer = new StringRedisSerializer();
-        // 用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值
-        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = serializer();
-
-        redisTemplate.setKeySerializer(stringSerializer);//key序列化
-        redisTemplate.setValueSerializer(jackson2JsonRedisSerializer);//value序列化
-        redisTemplate.setHashKeySerializer(stringSerializer);//Hash key序列化
-        redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer);//Hash value序列化
-        redisTemplate.afterPropertiesSet();
-        return redisTemplate;
-    }
-
-    /**
-     * 配置Jackson2JsonRedisSerializer序列化策略
-     */
-    private Jackson2JsonRedisSerializer<Object> serializer() {
-        //设置序列化
-        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
-        ObjectMapper om = new ObjectMapper();
-        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
-        om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
-        // 不存在的字段,不被序列化
-        om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-        return jackson2JsonRedisSerializer;
+    public JedisPoolConfig jedisPoolConfig() {
+        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
+        jedisPoolConfig.setMaxIdle(maxIdle);
+        jedisPoolConfig.setMaxTotal(maxTotal);
+        jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);
+        jedisPoolConfig.setMinIdle(minIdle);
+        jedisPoolConfig.setTimeBetweenEvictionRunsMillis(Integer.parseInt(timeBetweenEvictionRunsMillis));
+        return jedisPoolConfig;
    }

 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/AlipayConfig.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/AlipayConfig.java
@@ -1,51 +0,0 @@
-package com.zbkj.common.constants;
-
-/**
- * 支付宝配置
- *  +----------------------------------------------------------------------
- *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
- *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
- *  +----------------------------------------------------------------------
- *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
- *  +----------------------------------------------------------------------
- *  | Author: CRMEB Team <admin@crmeb.com>
- *  +----------------------------------------------------------------------
- */
-public class AlipayConfig {
-
-    // 商户appid
-    public static String APPID = "ali_pay_appid";
-
-    // 私钥 pkcs8格式的
-    public static String RSA_PRIVATE_KEY = "ali_pay_private_key";
-
-    // 服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
-    public static String notify_url = "ali_pay_notifu_url";
-
-    // 页面跳转同步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 商户可以自定义同步跳转地址
-    public static String return_url = "ali_pay_return_url";
-
-    // 用户付款中途退出返回商户网站的地址
-    public static String quit_url = "ali_pay_quit_url";
-
-    // 请求网关地址
-    public static String URL = "https://openapi.alipay.com/gateway.do";
-
-    // 编码
-    public static String CHARSET = "UTF-8";
-
-    // 返回格式
-    public static String FORMAT = "json";
-
-    // 支付宝公钥
-    public static String ALIPAY_PUBLIC_KEY_2 = "ali_pay_public_key2";
-    public static String ALIPAY_PUBLIC_KEY = "ali_pay_public_key";
-    // 日志记录目录
-    public static String LOG_PATH = "/log";
-    // RSA2
-    public static String SIGNTYPE = "RSA2";
-
-    // 是否开启支付宝支付
-    public static String ALIPAY_IS_OPEN = "ali_pay_is_open";
-}
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/BargainConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/BargainConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/BrokerageRecordConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/BrokerageRecordConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/CategoryConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/CategoryConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/Constants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/Constants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -49,6 +49,7 @@ public class Constants {
    public static final String DATE_FORMAT_START_PEREND = "00:00:00";
    public static final String DATE_FORMAT_END_PEREND = "23:59:59";
    public static final String DATE_FORMAT_HHMM = "yyyy-MM-dd HH:mm";
+    public static final String DATE_FORMAT_RFC_3339 = "yyyy-MM-dd'T'HH:mm:ssXXX";

    //后台管理员操作资金mark
    public static final String USER_BILL_OPERATE_LOG_TITLE = "{$title}{$operate}了{$value}{$founds}";
@@ -106,11 +107,8 @@ public class Constants {
    //商品最多选择的分类数量
    public static final Integer PRODUCT_SELECT_CATEGORY_NUM_MAX = 10;

-    //上传类型
-    public static final String UPLOAD_TYPE_IMAGE = "crmebimage";

    //上传类型
-    public static final String UPLOAD_TYPE_FILE = "file";
    public static final String UPLOAD_MODEL_PATH_EXCEL = "excel";// excel

    //图片上传
@@ -122,6 +120,8 @@ public class Constants {
    //最大上传文件
    public static final String UPLOAD_FILE_MAX_SIZE_CONFIG_KEY = "file_max_size";

+    public static final int UPLOAD_TYPE_USER = 7; //用户上传
+
    // 移动端文章顶部的banner图最大数量 配置数据最小3最大10
    public static final String ARTICLE_BANNER_LIMIT = "news_slides_limit";

@@ -144,6 +144,11 @@ public class Constants {
    public static final String PRODUCT_STOCK_LIST = "product_stock_list";


+    //sku库存变动队列key
+//    public static final String SKU_STOCK_UPDATE = "product_stock_update";
+    //sku库存redis key
+//    public static final String SKU_STOCK_LIST = "product_stock_list";
+
    //消息模板队列key
    public static final String WE_CHAT_MESSAGE_KEY_PUBLIC = "we_chat_public_message_list";
    public static final String WE_CHAT_MESSAGE_KEY_PROGRAM = "we_chat_program_message_list";
@@ -163,7 +168,7 @@ public class Constants {
    public static final String CONFIG_KEY_SITE_LOGO = "mobile_top_logo"; //logo地址
    public static final String CONFIG_KEY_MOBILE_LOGIN_LOGO = "mobile_login_logo"; // 移动端登录 logo
    public static final String CONFIG_KEY_SITE_NAME = "site_name"; //网站名称
-    public static final String CONFIG_SITE_TENG_XUN_MAP_KEY = "tengxun_map_key"; //腾讯地图key
+//    public static final String CONFIG_SITE_TENG_XUN_MAP_KEY = "tengxun_map_key"; //腾讯地图key
    public static final String CONFIG_BANK_LIST = "user_extract_bank"; //可提现银行
    public static final String CONFIG_EXTRACT_FREEZING_TIME = "extract_time"; //提现冻结时间
    public static final String CONFIG_EXTRACT_MIN_PRICE = "user_extract_min_price"; //提现最低金额
@@ -183,6 +188,8 @@ public class Constants {
    public static final String CONFIG_KEY_PAY_WE_CHAT_APP_APP_KEY = "pay_weixin_app_key"; //公众号支付key

    public static final String CONFIG_KEY_RECHARGE_MIN_AMOUNT = "store_user_min_recharge"; //最小充值金额
+    /** 底部导航—是否自定义 */
+    public static final String CONFIG_BOTTOM_NAVIGATION_IS_CUSTOM = "bottom_navigation_is_custom";
 //    public static final String CONFIG_KEY_PROGRAM_LOGO = "routine_logo"; //小程序logo
 //    public static final String CONFIG_KEY_PUBLIC_LOGO = "wechat_avatar"; //公众号logo

@@ -194,6 +201,8 @@ public class Constants {
    public static final String CONFIG_KEY_CONSUMER_HOTLINE = "consumer_hotline";
    // 客服电话服务开关
    public static final String CONFIG_KEY_TELEPHONE_SERVICE_SWITCH = "telephone_service_switch";
+    // 微信客服额外开关
+    public static final String CONFIG_KEY_WX_CHAT_INDEPENDENT = "wx_chat_independent";
    //商品分类页配置
    public static final String CONFIG_CATEGORY_CONFIG = "category_page_config"; //商品分类页配置
    public static final String CONFIG_IS_SHOW_CATEGORY = "is_show_category"; //是否隐藏一级分类
@@ -285,6 +294,7 @@ public class Constants {
    public static final Integer GROUP_DATA_ID_INDEX_KEYWORDS = 71; //热门搜索
    public static final Integer GROUP_DATA_ID_ADMIN_LOGIN_BANNER_IMAGE_LIST = 72; //后台登录页面轮播图
    public static final Integer GROUP_DATA_ID_COMBINATION_LIST_BANNNER = 73; //拼团列表banner
+    public static final Integer GROUP_DATA_ID_BOTTOM_NAVIGATION = 74; //首页自定义导航



@@ -442,6 +452,7 @@ public class Constants {
    public static final String ORDER_STATUS_STR_SPIKE_KEY = "send"; //待收货 KEY
    public static final String ORDER_LOG_REFUND_PRICE = "refund_price"; //退款
    public static final String ORDER_LOG_EXPRESS = "express"; //快递
+    public static final String ORDER_LOG_SHIPMENT = "shipment"; //一号通商家发货
    public static final String ORDER_LOG_DELIVERY = "delivery"; //送货
    public static final String ORDER_LOG_DELIVERY_GOODS = "delivery_goods"; //送货
    public static final String ORDER_LOG_REFUND_REFUSE = "refund_refuse"; //不退款
@@ -560,7 +571,24 @@ public class Constants {
    /** 公共开关：1开启 */
    public static final String COMMON_SWITCH_OPEN = "1";

+    /** 自定义表单开关：关闭 */
+    public static final String CONFIG_FORM_SWITCH_CLOSE = "'0'";
+    /** 自定义表单开关：开启 */
+    public static final String CONFIG_FORM_SWITCH_OPEN = "'1'";
+
    /** 公共JS配置 */
    // CRMEB chat 统计
-    public  static final String JS_CONFIG_CRMEB_CHAT_TONGJI="crmeb_tongji_js";
+    public  static final String JS_CONFIG_CRMEB_CHAT_TONGJI = "crmeb_tongji_js";
+
+    /** 小程序源码包文件名 */
+    public static final String WECHAT_SOURCE_CODE_FILE_NAME = "/mp-weixin-target.zip";
+
+    /** 小程序手机号授权验证类型 */
+    public static final String WECHAT_ROUTINE_PHONE_VERIFICATION = "routine_phone_verification";
+
+    /** 公众号登录方式 */
+    public static final String WECHAT_PUBLIC_LOGIN_TYPE = "wechat_public_login_type";
+
+    /** 管理后台账号登录错误数量keu **/
+    public static final String ADMIN_ACCOUNT_LOGIN_ERROR_NUM_KEY = "admin:account:login:error:{}";
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/CouponConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/CouponConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/ExperienceRecordConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/ExperienceRecordConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/IntegralRecordConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/IntegralRecordConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/NotifyConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/NotifyConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/OnePassConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/OnePassConstants.java
@@ -2,10 +2,16 @@ package com.zbkj.common.constants;

 /**
 * 一号通常量类
+ * 202308 添加最新一号通 https://api.crmeb.com/docs/%E5%BF%AB%E9%80%9F%E5%85%A5%E9%97%A8/
+ * 一号通更新逻辑
+ * 1. 用户登录嵌入的一号通页面后创建或者查看应用配置信息
+ * 2. 将配置信息保存到本地
+ * 3. 调用login接口，获取的token在调用的业务api中使用即可，产生的记录等都会在嵌入的页面中查看
+ * 4. 商家寄件功能，在订单表创建三个字段用来存储商家寄件的数据，用来区分当前订单是否商家寄件的订单(此字段前端不用展示)，测试时记得在一号通的记录中取消下，要不会有快递小哥哥上门找你的哦！
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -28,16 +34,16 @@ public class OnePassConstants {
 //    public static final String ONE_PASS_API_URL = "http://plat.crmeb.net/api/";// 测试环境

    // 验证码地址
-    public static final String REGISTER_CAPTCHA_URI = "user/code";
+    public static final String REGISTER_CAPTCHA_URI = "v2/user/code";

    // 账号注册地址
    public static final String USER_REGISTER_URI = "user/register";

    // 用户登录地址
-    public static final String USER_LOGIN_URI = "user/login";
+    public static final String USER_LOGIN_URI = "v2/user/login";

    //  获取账号信息
-    public static final String USER_INFO_URI = "user/info";
+    public static final String USER_INFO_URI = "v2/user/info";

    // 修改用户密码
    public static final String USER_UPDATE_PASSWORD_URI = "user/modify";
@@ -52,46 +58,61 @@ public class OnePassConstants {
    public static final String ONE_PASS_MEAL_CODE_URI = "meal/code";

    // 开通短信服务
-    public static final String ONE_PASS_SMS_OPEN_URI = "sms_v2/open";
+    public static final String ONE_PASS_SMS_OPEN_URI = "v2/sms_v2/open";

    // 开通物流服务
-    public static final String ONE_PASS_EXPRESS_OPEN_URI = "expr/open";
+    public static final String ONE_PASS_EXPRESS_OPEN_URI = "v2/expr/open";

    // 开通产品复制服务
-    public static final String ONE_PASS_COPY_OPEN_URI = "copy/open";
+    public static final String ONE_PASS_COPY_OPEN_URI = "v2/copy/open";

    // 用量记录
-    public static final String ONE_PASS_USER_RECORD_URI = "user/record";
+    public static final String ONE_PASS_USER_RECORD_URI = "v2/user/record";

    // 修改签名
-    public static final String ONE_PASS_SMS_MODIFY_URI = "sms_v2/modify";
+    public static final String ONE_PASS_SMS_MODIFY_URI = "v2/sms_v2/modify";

    // 短信模板列表
-    public static final String ONE_PASS_TEMP_LIST_URI = "sms_v2/temps";
+    public static final String ONE_PASS_TEMP_LIST_URI = "v2/sms_v2/temps";

    // 申请模板
-    public static final String ONE_PASS_TEMP_APPLY_URI = "sms_v2/apply";
+    public static final String ONE_PASS_TEMP_APPLY_URI = "v2/sms_v2/apply";

    // 申请模板记录
-    public static final String ONE_PASS_APPLYS_LIST_URI = "sms_v2/applys";
+    public static final String ONE_PASS_APPLYS_LIST_URI = "v2/sms_v2/applys";

    // 发送短信
-    public static final String ONE_PASS_API_SEND_URI = "sms_v2/send";
+    public static final String ONE_PASS_API_SEND_URI = "v2/sms_v2/send";

    // 快递公司
-    public static final String ONE_PASS_API_EXPRESS_URI = "expr/express";
+    public static final String ONE_PASS_API_EXPRESS_URI = "v2/expr/express";

    // 快递公司面单模板
-    public static final String ONE_PASS_API_EXPRESS_TEMP_URI = "expr/temp";
+    public static final String ONE_PASS_API_EXPRESS_TEMP_URI = "v2/expr_dump/temp";
+
+    // 电子面单模版获取
+    public static final String ONE_PASS_API_EXPRESS_DUMP_RECORD_URI = "v2/expr_dump/record";

    // 复制商品
-    public static final String ONE_PASS_API_COPY_GOODS_URI = "copy/goods";
+    public static final String ONE_PASS_API_COPY_GOODS_URI = "v2/copy/goods";

    // 电子面单
-    public static final String ONE_PASS_API_EXPRESS_DUMP_URI = "expr/dump";
+    public static final String ONE_PASS_API_EXPRESS_DUMP_URI = "v2/expr/dump";

    // 物流追踪
-    public static final String ONE_PASS_API_EXPRESS_QUEARY_URI = "expr/query";
+    public static final String ONE_PASS_API_EXPRESS_QUEARY_URI = "v2/expr/query";
+
+
+    /** 商家寄件 START  文档链接 https://api.crmeb.com/docs/%E5%95%86%E5%AE%B6%E5%AF%84%E4%BB%B6/API/%E5%88%9B%E5%BB%BA%E5%95%86%E5%AE%B6%E5%AF%84%E4%BB%B6%E8%AE%A2%E5%8D%95.html */
+    public static final String ONE_PASS_API_SHIPMENT_CREATE_ORDER_URI = "v2/shipment/create_order";
+    public static final String ONE_PASS_API_SHIPMENT_CANCEL_ORDER_URI = "v2/shipment/cancel_order";
+    public static final String ONE_PASS_API_SHIPMENT_INDEX_URI = "v2/shipment/index";
+    public static final String ONE_PASS_API_SHIPMENT_GET_KUAIDI_COMS_URI = "v2/shipment/get_kuaidi_coms";
+
+    // 此处为商家寄件回调地址定义，在controller中使用，不得随意更改，在创建订单时当作配置使用
+    public static final String ONE_PASS_API_SHIPMENT_CALLBACK_URI = "/shipment/callback";
+
+    /** 商家寄件 END */

    // 套餐类型——短信
    public static final String ONE_PASS_MEAL_TYPE_SMS = "sms";
@@ -104,4 +125,9 @@ public class OnePassConstants {

    // 物流公司缓存key
    public static final String ONE_PASS_EXPRESS_CACHE_KEY = "sync_express";
+
+    // 一号通当前应用access
+    public static final String ONE_PASS_ACCESS_KEY = "access_key";
+    // 一号通通当前应用secret
+    public static final String ONE_PASS_SECRET_KEY = "secret_key";
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/PayConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/PayConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/ProductConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/ProductConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -20,21 +20,68 @@ public class ProductConstants {
    public static final String SINGLE_ATTR_VALUE = "默认";

    // 商品类型 活动类型 0=商品，1=秒杀，2=砍价，3=拼团 attrResult表用到
-    /** 商品活动类型——普通商品 */
+    /** 商品类型——普通商品 */
    public static final Integer PRODUCT_TYPE_NORMAL = 0;
-    /** 商品活动类型——普通商品文字 */
+    /** 商品类型——普通商品文字 */
    public static final String PRODUCT_TYPE_NORMAL_STR = "默认";
-    /** 商品活动类型——秒杀商品 */
+    /** 商品类型——秒杀商品 */
    public static final Integer PRODUCT_TYPE_SECKILL = 1;
-    /** 商品活动类型——秒杀商品文字 */
+    /** 商品类型——秒杀商品文字 */
    public static final String PRODUCT_TYPE_SECKILL_STR = "秒杀";
-    /** 商品活动类型——砍价商品 */
+    /** 商品类型——砍价商品 */
    public static final Integer PRODUCT_TYPE_BARGAIN = 2;
-    /** 商品活动类型——砍价商品文字 */
+    /** 商品类型——砍价商品文字 */
    public static final String PRODUCT_TYPE_BARGAIN_STR = "砍价";
-    /** 商品活动类型——拼团商品 */
+    /** 商品类型——拼团商品 */
    public static final Integer PRODUCT_TYPE_PINGTUAN= 3;
-    /** 商品活动类型——拼团商品文字 */
+    /** 商品类型——拼团商品文字 */
    public static final String PRODUCT_TYPE_PINGTUAN_STR= "拼团";
+    /** 商品类型——组件商品 */
+    public static final Integer PRODUCT_TYPE_COMPONENT= 4;
+    /** 商品类型——组件商品文字 */
+    public static final String PRODUCT_TYPE_COMPONENT_STR= "组件";
+    /** 商品类型——云盘商品 */
+    public static final Integer PRODUCT_TYPE_CLOUD= 5;
+    /** 商品类型——卡密商品 */
+    public static final Integer PRODUCT_TYPE_CDKEY= 6;

+
+    /** 商品删除类型-回收站 */
+    public static final String PRODUCT_DELETE_TYPE_RECYCLE = "recycle";
+    /** 商品删除类型-删除 */
+    public static final String PRODUCT_DELETE_TYPE_DELETE = "delete";
+
+    /** 商品评论类型-所有 */
+    public static final String PRODUCT_REPLY_TYPE_ALL = "all";
+    /** 商品评论类型-好评 */
+    public static final String PRODUCT_REPLY_TYPE_GOOD = "good";
+    /** 商品评论类型-中评 */
+    public static final String PRODUCT_REPLY_TYPE_MEDIUM = "medium";
+    /** 商品评论类型-差评 */
+    public static final String PRODUCT_REPLY_TYPE_POOR = "poor";
+
+    /** 商品关系类型-收藏 */
+    public static final String PRODUCT_RELATION_TYPE_COLLECT = "collect";
+    /** 商品关系商品类型-普通商品 */
+    public static final Integer PRODUCT_RELATION_CATEGORY_NORMAL = 0;
+    /** 商品关系商品类型-秒杀商品 */
+    public static final Integer PRODUCT_RELATION_CATEGORY_SECKILL = 1;
+    /** 商品关系商品类型-砍价商品 */
+    public static final Integer PRODUCT_RELATION_CATEGORY_BRANGAIN = 2;
+    /** 商品关系商品类型-拼团商品 */
+    public static final Integer PRODUCT_RELATION_CATEGORY_COMBINATION = 3;
+
+    /** 商品审核状态-无需审核 */
+    public static final Integer AUDIT_STATUS_EXEMPTION = 0;
+    /** 商品审核状态-待审核 */
+    public static final Integer AUDIT_STATUS_WAIT = 1;
+    /** 商品审核状态-审核成功 */
+    public static final Integer AUDIT_STATUS_SUCCESS = 2;
+    /** 商品审核状态-审核拒绝 */
+    public static final Integer AUDIT_STATUS_FAIL = 3;
+
+    /** 活动边框 */
+    public static final String PRODUCT_ACTIVITY_STYLE_BORDER = "activity_style_border";
+    /** 活动背景 */
+    public static final String PRODUCT_ACTIVITY_STYLE_BACKGROUND = "activity_style_background";
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/RedisConstatns.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/RedisConstatns.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -24,4 +24,7 @@ public class RedisConstatns {
    /** 商品加购量（每日） */
    public static final String PRO_ADD_CART_KEY = "statistics:product:add_cart:";
    public static final String PRO_PRO_ADD_CART_KEY = "statistics:product:pro_add_cart:{}:{}";
+
+    /** 微信小程序运力缓存Key **/
+    public static final String WECHAT_MINI_DELIVERY_KEY = "wechat_delivery";
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/RegularConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/RegularConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SmsConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SmsConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -22,6 +22,7 @@ public class SmsConstants {

    /** 手机验证码redis key */
    public static final String SMS_VALIDATE_PHONE = "sms:validate:code:";
+    public static final String SMS_VALIDATE_PHONE_NUM = "sms:validate:phone:";

    /**
     * ---------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -18,6 +18,8 @@ public class SysConfigConstants {
    /** 登录页LOGO */
    public static final String CONFIG_KEY_ADMIN_LOGIN_LOGO_LEFT_TOP = "site_logo_lefttop";
    public static final String CONFIG_KEY_ADMIN_LOGIN_LOGO_LOGIN = "site_logo_login";
+    public static final String CONFIG_KEY_ADMIN_LOGO_SQUARE = "site_logo_square";
+    public static final String CONFIG_KEY_SITE_NAME = "site_name";
    /** 登录页背景图 */
    public static final String CONFIG_KEY_ADMIN_LOGIN_BACKGROUND_IMAGE = "admin_login_bg_pic";

@@ -52,7 +54,7 @@ public class SysConfigConstants {
    public static final String CONFIG_KEY_RECHARGE_SWITCH = "recharge_switch";
    /** 是否开启门店自提 */
    public static final String CONFIG_KEY_STORE_SELF_MENTION = "store_self_mention";
-    /** 腾讯地图key */
+//    /** 腾讯地图key */
    public static final String CONFIG_SITE_TENG_XUN_MAP_KEY = "tengxun_map_key";
    /** 退款理由 */
    public static final String CONFIG_KEY_STOR_REASON = "stor_reason";
@@ -76,4 +78,109 @@ public class SysConfigConstants {
    public static final String CONFIG_YUE_PAY_STATUS  = "yue_pay_status";
    /** 支付宝支付状态 */
    public static final String CONFIG_ALI_PAY_STATUS = "ali_pay_status";
+
+    /** 版权-授权标签 */
+    public static final String CONFIG_COPYRIGHT_LABEL = "copyright_label";
+    /** 版权-公司信息 */
+    public static final String CONFIG_COPYRIGHT_COMPANY_INFO = "copyright_company_name";
+    /** 版权-公司图片 */
+    public static final String CONFIG_COPYRIGHT_COMPANY_IMAGE = "copyright_company_image";
+    /** 版权-授权地址 */
+    public static final String CONFIG_COPYRIGHT_AUTH_HOST = "authHost";
+
+    /** 主题测配置 */
+    public static final String CONFIG_CHANGE_COLOR = "change_color_config";
+
+    /** 电子面单-快递公司ID */
+    public static final String ELECTRONIC_FACE_SHEET_EXPORT_ID = "config_export_id";
+    /** 电子面单-快递公司模板id */
+    public static final String ELECTRONIC_FACE_SHEET_EXPORT_TEMP_ID = "config_export_temp_id";
+    /** 电子面单-快递公司编码 */
+    public static final String ELECTRONIC_FACE_SHEET_EXPORT_COM = "config_export_com";
+    /** 电子面单-发货人姓名 */
+    public static final String ELECTRONIC_FACE_SHEET_TO_NAME = "config_export_to_name";
+    /** 电子面单-发货人电话 */
+    public static final String ELECTRONIC_FACE_SHEET_TO_TEL = "config_export_to_tel";
+    /** 电子面单-发货人详细地址 */
+    public static final String ELECTRONIC_FACE_SHEET_ADDRESS = "config_export_to_address";
+    /** 电子面单-电子面单打印机编号 */
+    public static final String ELECTRONIC_FACE_SHEET_PRINTER_NUM = "config_export_siid";
+    /** 电子面单-开关 */
+    public static final String ELECTRONIC_FACE_SHEET_OPEN = "config_export_open";
+
+
+    /** 系统配置列表 */
+    public static final String CONFIG_LIST = "config_list";
+    /** 移动端域名 */
+    public static final String CONFIG_KEY_SITE_URL = "site_url";
+    /** 后台api地址(回调地址) */
+    public static final String CONFIG_KEY_API_URL = "api_url";
+    /** 移动商城api接口地址 */
+    public static final String CONFIG_KEY_FRONT_API_URL = "front_api_url";
+
+    /** 充值注意事项 */
+    public static final String CONFIG_RECHARGE_ATTENTION = "recharge_attention";
+
+
+    /** 图片上传类型 1本地 2七牛云 3OSS 4COS 5京东, 默认本地 */
+    public static final String CONFIG_UPLOAD_TYPE = "uploadType";
+    /** 文件上传是否保存本地 */
+    public static final String CONFIG_FILE_IS_SAVE = "file_is_save";
+    /** 全局本地图片域名 */
+    public static final String CONFIG_LOCAL_UPLOAD_URL = "localUploadUrl";
+    /** 图片上传,拓展名 */
+    public static final String UPLOAD_IMAGE_EXT_STR_CONFIG_KEY = "image_ext_str";
+    /** 图片上传,最大尺寸 */
+    public static final String UPLOAD_IMAGE_MAX_SIZE_CONFIG_KEY = "image_max_size";
+    /** 文件上传,拓展名 */
+    public static final String UPLOAD_FILE_EXT_STR_CONFIG_KEY = "file_ext_str";
+    /** 文件上传,最大尺寸 */
+    public static final String UPLOAD_FILE_MAX_SIZE_CONFIG_KEY = "file_max_size";
+
+    /** 七牛云上传URL */
+    public static final String CONFIG_QN_UPLOAD_URL = "qnUploadUrl";
+    /** 七牛云Access Key */
+    public static final String CONFIG_QN_ACCESS_KEY = "qnAccessKey";
+    /** 七牛云Secret Key */
+    public static final String CONFIG_QN_SECRET_KEY = "qnSecretKey";
+    /** 七牛云存储名称 */
+    public static final String CONFIG_QN_STORAGE_NAME = "qnStorageName";
+    /** 七牛云存储区域 */
+    public static final String CONFIG_QN_STORAGE_REGION = "qnStorageRegion";
+
+    /** 阿里云上传URL */
+    public static final String CONFIG_AL_UPLOAD_URL = "alUploadUrl";
+    /** 阿里云Access Key */
+    public static final String CONFIG_AL_ACCESS_KEY = "alAccessKey";
+    /** 阿里云Secret Key */
+    public static final String CONFIG_AL_SECRET_KEY = "alSecretKey";
+    /** 阿里云存储名称 */
+    public static final String CONFIG_AL_STORAGE_NAME = "alStorageName";
+    /** 阿里云存储区域 */
+    public static final String CONFIG_AL_STORAGE_REGION = "alStorageRegion";
+
+    /** 腾讯云上传URL */
+    public static final String CONFIG_TX_UPLOAD_URL = "txUploadUrl";
+    /** 腾讯云Access Key */
+    public static final String CONFIG_TX_ACCESS_KEY = "txAccessKey";
+    /** 腾讯云Secret Key */
+    public static final String CONFIG_TX_SECRET_KEY = "txSecretKey";
+    /** 腾讯云存储名称 */
+    public static final String CONFIG_TX_STORAGE_NAME = "txStorageName";
+    /** 腾讯云存储区域 */
+    public static final String CONFIG_TX_STORAGE_REGION = "txStorageRegion";
+
+    /** 京东云上传URL */
+    public static final String CONFIG_JD_UPLOAD_URL = "jdUploadUrl";
+    /** 京东云Access Key */
+    public static final String CONFIG_JD_ACCESS_KEY = "jdAccessKey";
+    /** 京东云Secret Key */
+    public static final String CONFIG_JD_SECRET_KEY = "jdSecretKey";
+    /** 京东云存储桶名称 */
+    public static final String CONFIG_JD_BUCKET_NAME = "jdBucketName";
+    /** 京东云存储区域 */
+    public static final String CONFIG_JD_CLOUD_SIGNING_REGION = "jdSigningRegion";
+    /** 京东云存储端点 */
+    public static final String CONFIG_JD_CLOUD_ENDPOINT = "jdEndpoint";
+
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SysGroupDataConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SysGroupDataConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/TaskConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/TaskConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/UserConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/UserConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/WeChatConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/WeChatConstants.java
@@ -4,7 +4,7 @@ package com.zbkj.common.constants;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -250,8 +250,8 @@ public class WeChatConstants {
    public static final String WECHAT_PUBLIC_MENU_CREATE_URL = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token={}";
    /** 公众号删除自定义菜单的url */
    public static final String WECHAT_PUBLIC_MENU_DELETE_URL = "https://api.weixin.qq.com/cgi-bin/menu/delete?access_token={}";
-    /** 企业号上传其他类型永久素材的url */
-    public static final String WECHAT_PUBLIC_QYAPI_ADD_MATERIAL_URL = "https://qyapi.weixin.qq.com/cgi-bin/material/add_material?type={}&access_token={}";
+    /** 公众号上传其他类型永久素材的url */
+    public static final String WECHAT_PUBLIC_QYAPI_ADD_MATERIAL_URL = "https://api.weixin.qq.com/cgi-bin/material/add_material?type={}&access_token={}";
    /** 公众号获取模板列表（自己的） */
    public static final String WECHAT_PUBLIC_GET_ALL_PRIVATE_TEMPLATE_URL = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token={}";
    /** 公众号删除模板（自己的） */
@@ -283,105 +283,5 @@ public class WeChatConstants {
    public static final String REDIS_PUBLIC_JS_API_TICKET = "wechat_js_api_ticket";
    public static final Long REDIS_PUBLIC_JS_API_TICKET_EXPRESS = 7100L;

-    /**
-     * --------------------------------------------------------------------------------------------------------
-     * 以下为视频号相关部分
-     * --------------------------------------------------------------------------------------------------------
-     */

-    /*------------------------------------------ 申请接入接口 START ---------------------------------------*/
-
-    /* 申请接入申请 */
-    public static final String WECHAT_SHOP_REGISTER_APPLY = "https://api.weixin.qq.com/shop/register/apply?access_token={}";
-    /* 获取接入状态 */
-    public static final String WECHAT_SHOP_REGISTER_CHECK = "https://api.weixin.qq.com/shop/register/check?access_token={}";
-
-    /*------------------------------------------ 申请接入接口 END ---------------------------------------*/
-
-
-    /*------------------------------------------ 接入商品前必须接口 START ---------------------------------------*/
-    /** 获取商品类目(自定义交易组件) */
-    public static final String WECHAT_SHOP_CAT_GET_URL = "https://api.weixin.qq.com/shop/cat/get?access_token={}";
-    /** 上传图片 **/
-    public static final String WECHAT_SHOP_IMG_UPLOAD = "https://api.weixin.qq.com/shop/img/upload?&access_token={}";
-    /** 上传品牌信息 */
-    public static final String WECHAT_SHOP_AUDIT_AUDIT_BRAND = "https://api.weixin.qq.com/shop/audit/audit_brand?&access_token={}";
-    /** 上传类目资质 */
-    public static final String WECHAT_SHOP_AUDIT_AUDIT_CATEGORY = "https://api.weixin.qq.com/shop/audit/audit_category?&access_token={}";
-    /** 查询类目审核结果 */
-    public static final String WECHAT_SHOP_AUDIT_RESULT= "https://api.weixin.qq.com/shop/audit/result?access_token={}";
-    /** 获取小程序提交过的入驻资质信息 */
-    public static final String WECHAT_SHOP_AUDIT_GET_MINIAPP_CERTIFICATE= "https://api.weixin.qq.com/shop/audit/get_miniapp_certificate?access_token={}";
-    /*------------------------------------------ 接入商品前必须接口 END ---------------------------------------*/
-
-
-    /*------------------------------------------ 商家入驻接口 START ---------------------------------------*/
-    /** 获取类目列表 */
-    public static final String WECHAT_SHOP_ACCOUNT_GET_CATEGORY_LIST = "https://api.weixin.qq.com/shop/account/get_category_list?access_token={}";
-    /** 获取品牌列表 */
-    public static final String WECHAT_SHOP_ACCOUNT_GET_BRAND_LIST = "https://api.weixin.qq.com/shop/account/get_brand_list?access_token={}";
-    /** 更新商家信息 */
-    public static final String WECHAT_SHOP_ACCOUNT_UPDATE_INFO = "https://api.weixin.qq.com/shop/account/update_info?access_token={}";
-    /** 获取商家信息 */
-    public static final String WECHAT_SHOP_ACCOUNT_GET_INFO = "https://api.weixin.qq.com/shop/account/get_info?access_token={}";
-    /*------------------------------------------ 商家入驻接口 END ---------------------------------------*/
-
-    /*------------------------------------------ SPU 接口 START ---------------------------------------*/
-//    /** 获取品牌列表(自定义交易组件) */
-//    public static final String WECHAT_SHOP_BRAND_GET_URL = "https://api.weixin.qq.com/shop/account/get_brand_list?access_token={}";
-    /** 添加商品(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_ADD_URL = "https://api.weixin.qq.com/shop/spu/add?access_token={}";
-    /** 删除商品(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_DEL_URL = "https://api.weixin.qq.com/shop/spu/del?access_token={}";
-    /** 撤回商品审核(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_DEL_AUDIT_URL = "https://api.weixin.qq.com/shop/spu/del_audit?access_token={}";
-    /** 获取商品(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_GET_URL = "https://api.weixin.qq.com/shop/spu/get?access_token={}";
-    /** 获取商品列表(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_GET_LIST_URL = "https://api.weixin.qq.com/shop/spu/get_list?access_token={}";
-    /** 更新商品(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_UPDATE_URL = "https://api.weixin.qq.com/shop/spu/update?access_token={}";
-    /** 上架商品(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_LISTING_URL = "https://api.weixin.qq.com/shop/spu/listing?access_token={}";
-    /** 下架商品(自定义交易组件) */
-    public static final String WECHAT_SHOP_SPU_DELISTING_URL = "https://api.weixin.qq.com/shop/spu/delisting?access_token={}";
-    /** 检查场景值是否在支付校验范围内(自定义交易组件) */
-    public static final String WECHAT_SHOP_SCENE_CHECK_URL = "https://api.weixin.qq.com/shop/scene/check?access_token={}";
-    /*------------------------------------------ SPU 接口 END ---------------------------------------*/
-
-    /*------------------------------------------ 订单 接口 START ---------------------------------------*/
-    /** 生成订单并获取ticket(自定义交易组件) */
-    public static final String WECHAT_SHOP_ORDER_ADD_URL = "https://api.weixin.qq.com/shop/order/add?access_token={}";
-    /** 同步订单支付结果(自定义交易组件) */
-    public static final String WECHAT_SHOP_ORDER_PAY_URL = "https://api.weixin.qq.com/shop/order/pay?access_token={}";
-    /** 获取订单(自定义交易组件) */
-    public static final String WECHAT_SHOP_ORDER_GET_URL = "https://api.weixin.qq.com/shop/order/get?access_token={}";
-    /*------------------------------------------ 订单 接口 END ---------------------------------------*/
-
-    /*------------------------------------------ 物流 接口 START ---------------------------------------*/
-    /** 获取快递公司列表(自定义交易组件) */
-    public static final String WECHAT_SHOP_DELIVERY_GET_COMPANY_LIST_URL = "https://api.weixin.qq.com/shop/delivery/get_company_list?access_token={}";
-    /** 订单发货(自定义交易组件) */
-    public static final String WECHAT_SHOP_DELIVERY_SEND_URL = "https://api.weixin.qq.com/shop/delivery/send?access_token={}";
-    /** 订单确认收货(自定义交易组件) */
-    public static final String WECHAT_SHOP_DELIVERY_RECIEVE_URL = "https://api.weixin.qq.com/shop/delivery/recieve?access_token={}";
-    /*------------------------------------------ 物流 接口 END ---------------------------------------*/
-
-    /*------------------------------------------ 售后 接口 START ---------------------------------------*/
-    /** 创建售后(自定义交易组件) */
-    public static final String WECHAT_SHOP_AFTERSALE_ADD_URL = "https://api.weixin.qq.com/shop/aftersale/add?access_token={}";
-    /** 获取售后(自定义交易组件) */
-    public static final String WECHAT_SHOP_AFTERSALE_GET_URL = "https://api.weixin.qq.com/shop/aftersale/get?access_token={}";
-    /** 更新售后(自定义交易组件) */
-    public static final String WECHAT_SHOP_AFTERSALE_UPDATE_URL = "https://api.weixin.qq.com/shop/aftersale/update?access_token={}";
-    /*------------------------------------------ 售后 接口 END ---------------------------------------*/
-
-
-    /** 自定义组件，商品类型 redis key */
-    public static final String REDIS_WECHAT_SHOP_CAT_KEY = "wechat_shop_cat";
-
-    /** 微信小程序回调，商品审核回调事件 */
-    public static final String WECAHT_CALLBACK_EVENT_SPU_AUDIT = "open_product_spu_audit";
-    /** 微信小程序回调，品牌审核回调事件 */
-    public static final String WECAHT_CALLBACK_EVENT_BRAND_AUDIT = "open_product_brand_audit";
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/YlyConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/YlyConstants.java
@@ -5,7 +5,7 @@ package com.zbkj.common.constants;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/CrmebException.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/CrmebException.java
@@ -1,5 +1,7 @@
 package com.zbkj.common.exception;

+import com.zbkj.common.result.CommonResultCode;
+import com.zbkj.common.result.IResultEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

@@ -8,7 +10,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -19,11 +21,51 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
@RestControllerAdvice
 public class CrmebException extends RuntimeException {

-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 6397082987802748517L;

-    public CrmebException() {}
+    /**
+     * 错误码
+     */
+    private Integer code;
+
+    /**
+     * 错误信息
+     */
+    private String message;
+
+    public CrmebException() {
+        super();
+    }

    public CrmebException(String message) {
-        super(message);
+        super(CommonResultCode.ERROR.getCode() + "-" + message);
+        this.code = CommonResultCode.ERROR.getCode();
+        this.message = message;
+    }
+
+    public CrmebException(IResultEnum iResultEnum) {
+        super(iResultEnum.getCode() + "-" + iResultEnum.getMessage());
+        this.code = iResultEnum.getCode();
+        this.message = iResultEnum.getMessage();
+    }
+
+    public CrmebException(IResultEnum iResultEnum, String message) {
+        super(iResultEnum.getCode() + "-" + message);
+        this.code = iResultEnum.getCode();
+        this.message = message;
+    }
+
+    public CrmebException(IResultEnum iResultEnum, Throwable throwable) {
+        super(iResultEnum.getCode() + "-" + iResultEnum.getMessage() + ", " + throwable.getMessage(), throwable);
+        this.code = iResultEnum.getCode();
+        this.message = iResultEnum.getMessage();
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
    }
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/ExceptionCodeEnum.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/ExceptionCodeEnum.java
@@ -5,7 +5,7 @@ package com.zbkj.common.exception;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/ExceptionHandler.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/ExceptionHandler.java
@@ -5,7 +5,7 @@ package com.zbkj.common.exception;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/GlobalExceptionHandler.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/exception/GlobalExceptionHandler.java
@@ -1,82 +0,0 @@
-package com.zbkj.common.exception;
-
-import com.zbkj.common.response.CommonResult;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.validation.BindException;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import java.util.Objects;
-
-/**
- * 全局参数、异常拦截
- * +----------------------------------------------------------------------
- * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
- * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
- * +----------------------------------------------------------------------
- * | Author: CRMEB Team <admin@crmeb.com>
- * +----------------------------------------------------------------------
- */
-@Slf4j
-@RestControllerAdvice
-public class GlobalExceptionHandler {
-//    private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-
-    /**
-     * 拦截表单参数校验
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @ExceptionHandler({BindException.class})
-    public CommonResult bindException(BindException e) {
-        BindingResult bindingResult = e.getBindingResult();
-        return CommonResult.failed(ExceptionCodeEnum.VALIDATE_FAILED, Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-    }
-
-    /**
-     * 拦截JSON参数校验
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public CommonResult bindException(MethodArgumentNotValidException e) {
-        BindingResult bindingResult = e.getBindingResult();
-        return CommonResult.failed(ExceptionCodeEnum.VALIDATE_FAILED,Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
-    }
-
-    /**
-     * 拦截参数类型不正确
-     * @param e
-     * @return
-     */
-    @ResponseStatus(HttpStatus.OK)
-    @ExceptionHandler(HttpMediaTypeNotSupportedException.class)
-    public CommonResult bindException(HttpMediaTypeNotSupportedException e){
-        return CommonResult.failed(ExceptionCodeEnum.PRAM_NOT_MATCH,Objects.requireNonNull(e.getMessage()));
-    }
-
-
-    //声明要捕获的异常
-    @ResponseStatus(HttpStatus.OK)
-    @ExceptionHandler(Exception.class)
-    @ResponseBody
-    public <T> CommonResult<?> defaultExceptionHandler(Exception e) {
-        e.printStackTrace();
-        if(e instanceof CrmebException) {
-            return CommonResult.failed(ExceptionCodeEnum.FAILED,Objects.requireNonNull(e.getMessage()));
-        }
-        if(e instanceof MissingServletRequestParameterException){
-            return CommonResult.failed(ExceptionCodeEnum.PRAM_NOT_MATCH, Objects.requireNonNull(e.getMessage()));
-        }
-        //未知错误
-        return CommonResult.failed(ExceptionCodeEnum.ERROR,e.getMessage());
-    }
-}
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/interceptor/SwaggerInterceptor.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/interceptor/SwaggerInterceptor.java
@@ -1,12 +1,12 @@
 package com.zbkj.common.interceptor;

-import cn.hutool.core.codec.Base64;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import sun.misc.BASE64Decoder;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -18,7 +18,7 @@ import java.io.PrintWriter;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class SwaggerInterceptor extends HandlerInterceptorAdapter {
    public boolean httpBasicAuth(String authorization) throws IOException {
        if(check){
            if (authorization != null && authorization.split(" ").length == 2) {
-                String userAndPass = Base64.decodeStr(authorization.split(" ")[1]);
+                String userAndPass = new String(new BASE64Decoder().decodeBuffer(authorization.split(" ")[1]));
                String username = userAndPass.split(":").length == 2 ? userAndPass.split(":")[0] : null;
                String password = userAndPass.split(":").length == 2 ? userAndPass.split(":")[1] : null;
                return this.username.equals(username) && this.password.equals(password);
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/article/Article.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/article/Article.java
@@ -17,7 +17,7 @@ import java.util.Date;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/bargain/StoreBargain.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/bargain/StoreBargain.java
@@ -1,23 +1,23 @@
 package com.zbkj.common.model.bargain;

-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
 * 砍价表
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -94,7 +94,7 @@ public class StoreBargain implements Serializable {
    private Integer giveIntegral;

    @ApiModelProperty(value = "砍价活动简介")
-    private String info;
+    private String info = "";

    @ApiModelProperty(value = "成本价")
    private BigDecimal cost;
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/bargain/StoreBargainUser.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/bargain/StoreBargainUser.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/bargain/StoreBargainUserHelp.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/bargain/StoreBargainUserHelp.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/cat/StoreCart.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/cat/StoreCart.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/category/Category.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/category/Category.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +17,7 @@ import lombok.experimental.Accessors;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -58,5 +60,11 @@ public class Category implements Serializable {
    @ApiModelProperty(value = "排序")
    private Integer sort;

+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+

 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/combination/StoreCombination.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/combination/StoreCombination.java
@@ -1,25 +1,24 @@
 package com.zbkj.common.model.combination;

-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
 * 拼团商品表
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -61,7 +60,7 @@ public class StoreCombination implements Serializable {
    private Integer people;

    @ApiModelProperty(value = "简介")
-    private String info;
+    private String info = "";

    @ApiModelProperty(value = "价格")
    private BigDecimal price;
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/combination/StorePink.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/combination/StorePink.java
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/coupon/StoreCoupon.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/coupon/StoreCoupon.java
@@ -19,7 +19,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/coupon/StoreCouponUser.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/coupon/StoreCouponUser.java
@@ -18,7 +18,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/Express.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/Express.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/ShippingTemplates.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/ShippingTemplates.java
@@ -1,23 +1,23 @@
 package com.zbkj.common.model.express;

-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+import java.io.Serializable;
+import java.util.Date;
+
 /**
 *  运费模版对象
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
@@ -40,11 +40,11 @@ public class ShippingTemplates implements Serializable {
    @ApiModelProperty(value = "模板名称")
    private String name;

-    @ApiModelProperty(value = "计费方式")
+    @ApiModelProperty(value = "计费方式 0（未选择），1(按件数), 2(按重量)，3(按体积)")
    private Integer type;

-    @ApiModelProperty(value = "指定包邮")
-    private Boolean appoint;
+    @ApiModelProperty(value = "包邮类型：0-全国包邮，1-部分包邮，2-自定义")
+    private Integer appoint;

    @ApiModelProperty(value = "排序")
    private Integer sort;
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/ShippingTemplatesFree.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/ShippingTemplatesFree.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/ShippingTemplatesRegion.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/express/ShippingTemplatesRegion.java
@@ -18,7 +18,7 @@ import java.util.Date;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/finance/UserExtract.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/finance/UserExtract.java
@@ -21,7 +21,7 @@ import org.springframework.data.annotation.Transient;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/finance/UserRecharge.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/finance/UserRecharge.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -64,5 +64,9 @@ public class UserRecharge implements Serializable {
    @ApiModelProperty(value = "退款金额")
    private BigDecimal refundPrice;

+    @ApiModelProperty(value = "是否上传微信发货管理")
+    private Boolean isWechatShipping;

+    @ApiModelProperty(value = "支付服务方订单号")
+    private String outTradeNo;
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/gencode/mysql/ColumnEntity.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/gencode/mysql/ColumnEntity.java
@@ -1,69 +0,0 @@
-package com.zbkj.common.model.gencode.mysql;
-
-/**
- * 列的属性
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年12月20日 上午12:01:45
- */
-public class ColumnEntity {
-	//列名
-    private String columnName;
-    //列名类型
-    private String dataType;
-    //列名备注
-    private String comments;
-
-    //属性名称(第一个字母大写)，如：user_name => UserName
-    private String attrName;
-    //属性名称(第一个字母小写)，如：user_name => userName
-    private String attrname;
-    //属性类型
-    private String attrType;
-    //auto_increment
-    private String extra;
-
-	public String getColumnName() {
-		return columnName;
-	}
-	public void setColumnName(String columnName) {
-		this.columnName = columnName;
-	}
-	public String getDataType() {
-		return dataType;
-	}
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-	public String getComments() {
-		return comments;
-	}
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
-	public String getAttrname() {
-		return attrname;
-	}
-	public void setAttrname(String attrname) {
-		this.attrname = attrname;
-	}
-	public String getAttrName() {
-		return attrName;
-	}
-	public void setAttrName(String attrName) {
-		this.attrName = attrName;
-	}
-	public String getAttrType() {
-		return attrType;
-	}
-	public void setAttrType(String attrType) {
-		this.attrType = attrType;
-	}
-	public String getExtra() {
-		return extra;
-	}
-	public void setExtra(String extra) {
-		this.extra = extra;
-	}
-}
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/gencode/mysql/TableEntity.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/gencode/mysql/TableEntity.java
@@ -1,63 +0,0 @@
-package com.zbkj.common.model.gencode.mysql;
-
-import java.util.List;
-
-/**
- * 表数据
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年12月20日 上午12:02:55
- */
-public class TableEntity {
-	//表的名称
-	private String tableName;
-	//表的备注
-	private String comments;
-	//表的主键
-	private ColumnEntity pk;
-	//表的列名(不包含主键)
-	private List<ColumnEntity> columns;
-
-	//类名(第一个字母大写)，如：sys_user => SysUser
-	private String className;
-	//类名(第一个字母小写)，如：sys_user => sysUser
-	private String classname;
-
-	public String getTableName() {
-		return tableName;
-	}
-	public void setTableName(String tableName) {
-		this.tableName = tableName;
-	}
-	public String getComments() {
-		return comments;
-	}
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
-	public ColumnEntity getPk() {
-		return pk;
-	}
-	public void setPk(ColumnEntity pk) {
-		this.pk = pk;
-	}
-	public List<ColumnEntity> getColumns() {
-		return columns;
-	}
-	public void setColumns(List<ColumnEntity> columns) {
-		this.columns = columns;
-	}
-	public String getClassName() {
-		return className;
-	}
-	public void setClassName(String className) {
-		this.className = className;
-	}
-	public String getClassname() {
-		return classname;
-	}
-	public void setClassname(String classname) {
-		this.classname = classname;
-	}
-}
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/log/StoreProductLog.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/log/StoreProductLog.java
@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/order/StoreOrder.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/order/StoreOrder.java
@@ -19,7 +19,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -120,7 +120,7 @@ public class StoreOrder implements Serializable {
    @ApiModelProperty(value = "快递名称/送货人姓名")
    private String deliveryName;

-    @ApiModelProperty(value = "发货类型")
+    @ApiModelProperty(value = "发货类型 express 发货，send 送货，fictitious虚拟")
    private String deliveryType;

    @ApiModelProperty(value = "快递单号/手机号")
@@ -208,4 +208,19 @@ public class StoreOrder implements Serializable {

    @ApiModelProperty(value = "商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号")
    private String outTradeNo;
+
+    @ApiModelProperty(value = "商家寄件单号图片")
+    private String shipmentPic;
+
+    @ApiModelProperty(value = "商家寄件订单任务id")
+    private String shipmentTaskId;
+
+    @ApiModelProperty(value = "商家寄件订单单号")
+    private String shipmentOrderId;
+
+    @ApiModelProperty(value = "商家寄件快递单号")
+    private String shipmentNum;
+
+    @ApiModelProperty(value = "发货记录类型，1快递、2送货, 3虚拟发货")
+    private String expressRecordType;
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/order/StoreOrderInfo.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/order/StoreOrderInfo.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;

 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -92,4 +93,10 @@ public class StoreOrderInfo implements Serializable {

    @ApiModelProperty(value = "商品类型:0-普通，1-秒杀，2-砍价，3-拼团，4-视频号")
    private Integer productType;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/order/StoreOrderStatus.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/order/StoreOrderStatus.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java
@@ -1,23 +1,24 @@
 package com.zbkj.common.model.product;

-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
 * 商品表
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -28,13 +29,10 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("eb_store_product")
-@ApiModel(value="StoreProduct对象", description="商品表")
+@ApiModel(value = "StoreProduct对象", description = "商品表")
 public class StoreProduct implements Serializable {

-    private static final long serialVersionUID=1L;
-
-    public StoreProduct() {
-    }
+    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "商品id")
    @TableId(value = "id", type = IdType.AUTO)
@@ -53,7 +51,7 @@ public class StoreProduct implements Serializable {
    private String storeName;

    @ApiModelProperty(value = "商品简介")
-    private String storeInfo;
+    private String storeInfo = "";

    @ApiModelProperty(value = "关键字")
    private String keyword;
@@ -166,4 +164,11 @@ public class StoreProduct implements Serializable {
    @ApiModelProperty(value = "商品详情")
    @TableField(exist = false)
    private String content;
+
+    @ApiModelProperty(value = "并发版本控制")
+    private Integer version;
+
+    @ApiModelProperty(value = "活动边框 列表中是边框 详情中是背景图")
+    @TableField(exist = false)
+    private String activityStyle;
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductAttr.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductAttr.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductAttrResult.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductAttrResult.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductAttrValue.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductAttrValue.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -95,4 +95,7 @@ public class StoreProductAttrValue implements Serializable {

    @ApiModelProperty(value = "是否删除,0-否，1-是")
    private Boolean isDel;
+
+    @ApiModelProperty(value = "并发版本控制")
+    private Integer version;
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductCate.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductCate.java
@@ -1,47 +0,0 @@
-package com.zbkj.common.model.product;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 商品分类辅助表
- * +----------------------------------------------------------------------
- * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
- * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
- * +----------------------------------------------------------------------
- * | Author: CRMEB Team <admin@crmeb.com>
- * +----------------------------------------------------------------------
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_store_product_cate")
-@ApiModel(value="StoreProductCate对象", description="商品分类辅助表")
-public class StoreProductCate implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "商品id")
-    private Integer productId;
-
-    @ApiModelProperty(value = "分类id")
-    private Integer cateId;
-
-    @ApiModelProperty(value = "添加时间")
-    private Integer addTime;
-
-
-}
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductCoupon.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductCoupon.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductDescription.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductDescription.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductRelation.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductRelation.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductReply.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductReply.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductRule.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProductRule.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/record/UserVisitRecord.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/record/UserVisitRecord.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/seckill/StoreSeckill.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/seckill/StoreSeckill.java
@@ -1,24 +1,24 @@
 package com.zbkj.common.model.seckill;

-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
 * 商品秒杀产品表
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -51,7 +51,7 @@ public class StoreSeckill implements Serializable {
    private String title;

    @ApiModelProperty(value = "简介")
-    private String info;
+    private String info = "";

    @ApiModelProperty(value = "价格")
    private BigDecimal price;
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/seckill/StoreSeckillManger.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/seckill/StoreSeckillManger.java
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -53,8 +53,8 @@ public class StoreSeckillManger implements Serializable {
    @ApiModelProperty(value = "排序")
    private Integer sort;

-    @ApiModelProperty(value = "状态 0=关闭 1=开启")
-    private Integer status;
+    @ApiModelProperty(value = "状态 '0'=关闭 '1'=开启")
+    private String status;

    @ApiModelProperty(value = "创建时间")
    private Date createTime;
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/sms/SmsRecord.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/sms/SmsRecord.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/sms/SmsTemplate.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/sms/SmsTemplate.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemAdmin.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemAdmin.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemAttachment.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemAttachment.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemCity.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemCity.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemConfig.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemConfig.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemFormTemp.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemFormTemp.java
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemGroup.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemGroup.java
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemGroupData.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemGroupData.java
@@ -1,23 +1,22 @@
 package com.zbkj.common.model.system;

-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

-import java.io.Serializable;
-import java.util.Date;
-
 /**
 * 组合数据详情表
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemMenu.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemMenu.java
@@ -18,7 +18,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemNotification.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemNotification.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemRole.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemRole.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemRoleMenu.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemRoleMenu.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemStore.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemStore.java
@@ -18,7 +18,7 @@ import org.apache.ibatis.type.JdbcType;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemStoreStaff.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemStoreStaff.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemUserLevel.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/system/SystemUserLevel.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/User.java
@@ -19,7 +19,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
@@ -156,4 +156,6 @@ public class User implements Serializable {

    @ApiModelProperty(value = "成为分销员时间")
    private Date promoterTime;
+
+
 }
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserAddress.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserAddress.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserBill.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserBill.java
@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserBrokerageRecord.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserBrokerageRecord.java
@@ -19,7 +19,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserExperienceRecord.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserExperienceRecord.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserGroup.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserGroup.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserIntegralRecord.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserIntegralRecord.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserLevel.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserLevel.java
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserSign.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserSign.java
@@ -17,7 +17,7 @@ import java.util.Date;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserTag.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserTag.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserToken.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/user/UserToken.java
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/TemplateMessage.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/TemplateMessage.java
@@ -19,7 +19,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatExceptions.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatExceptions.java
@@ -17,7 +17,7 @@ import java.util.Date;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatPayInfo.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatPayInfo.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatQrcode.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatQrcode.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatReply.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/model/wechat/WechatReply.java
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/page/CommonPage.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/page/CommonPage.java
@@ -14,7 +14,7 @@ import java.util.List;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/AdminIntegralSearchRequest.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/AdminIntegralSearchRequest.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 * +----------------------------------------------------------------------
 * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 * +----------------------------------------------------------------------
 * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 * +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ArticleRequest.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ArticleRequest.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ArticleSearchRequest.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/request/ArticleSearchRequest.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 *  +----------------------------------------------------------------------
 *  | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 *  +----------------------------------------------------------------------
- *  | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
+ *  | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
 *  +----------------------------------------------------------------------
 *  | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 *  +----------------------------------------------------------------------
--- a/Show More
+++ b/Show More